project update and jellybean fix (missing permission)

[ms2-fixes] / MS2Debounce / src / de / rmdir / ms2debounce / MS2Debounce.java

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
index a4cd522b449a589776e2f20e00744674f8554528..27508fcaa31343e8140aef0a9e4f305a1a54f57f 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
@@ -29,6 +29,8 @@ public class MS2Debounce extends Activity
        private int poll_time;
        private boolean hw_debounce_en;
        private int hw_debounce_time;
+       private boolean drive_inactive_en;
+       private boolean active_high_en;
 
        public MS2Debounce()
        {
@@ -129,6 +131,8 @@ public class MS2Debounce extends Activity
                poll_time = module.getPoll();
                hw_debounce_en = module.getHwDebounce();
                hw_debounce_time = module.getHwDebounceTime();
+               //drive_inactive_en = module.getDriveInactive();
+               active_high_en = module.getActiveHigh();
 
                TextView text = (TextView)findViewById(R.id.text);
                text.setText("Module loaded: " + loaded + "\n" +
@@ -136,7 +140,7 @@ public class MS2Debounce extends Activity
                        "settle_time: " + settle_time + "us\n" + 
                        "poll_time: " + poll_time + "ms\n" + 
                        "safe_to_load: " + safe_to_load + " (module loaded by this app)\n" +
-                       "hw_debounce: " + (hw_debounce_en?"enabled":"disabled") + ", " + ((hw_debounce_time+1)*31) + "us (" + hw_debounce_time + ")");
+                       "hw_debounce: " + (hw_debounce_en?"en":"dis") + "abled, " + ((hw_debounce_time+1)*31) + "us (" + hw_debounce_time + "), active high: " + (active_high_en?"en":"dis") + "abled");
 
                EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
                textDelay.setText(Integer.toString(module.getSavedDelay()));
@@ -186,6 +190,14 @@ public class MS2Debounce extends Activity
                CheckBox hw_debounce = (CheckBox)findViewById(R.id.hw_debounce);
                hw_debounce.setChecked(module.getSavedHwDebounce());
                hw_debounce.setEnabled(true);
+
+               //CheckBox drive_inactive = (CheckBox)findViewById(R.id.drive_inactive);
+               //drive_inactive.setChecked(module.getSavedDriveInactive());
+               //drive_inactive.setEnabled(true);
+
+               CheckBox active_high = (CheckBox)findViewById(R.id.active_high);
+               active_high.setChecked(module.getSavedActiveHigh());
+               active_high.setEnabled(true);
        }
 
        private void disableUI() {
@@ -215,6 +227,12 @@ public class MS2Debounce extends Activity
 
                CheckBox hw_debounce = (CheckBox)findViewById(R.id.hw_debounce);
                hw_debounce.setEnabled(false);
+
+               //CheckBox drive_inactive = (CheckBox)findViewById(R.id.drive_inactive);
+               //drive_inactive.setEnabled(false);
+
+               CheckBox active_high = (CheckBox)findViewById(R.id.active_high);
+               active_high.setEnabled(false);
        }
 
        public void loadModule(View view) {
@@ -254,6 +272,18 @@ public class MS2Debounce extends Activity
                module.setSavedHwDebounce(hw_debounce.isChecked());
        }
 
+       //public void toggle_drive_inactive(View view) {
+       //      CheckBox drive_inactive = (CheckBox)view;
+
+       //      module.setSavedDriveInactive(drive_inactive.isChecked());
+       //}
+
+       public void toggle_active_high(View view) {
+               CheckBox active_high = (CheckBox)view;
+
+               module.setSavedActiveHigh(active_high.isChecked());
+       }
+
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                MenuInflater inflater = getMenuInflater();