add option to set drive_inactive flag

[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 1c14e2c32d7e482f136684b6f21095d64d7993eb..3763a65ac32aa0ca115c1862aef85cba3eda5946 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
@@ -25,6 +25,11 @@ public class MS2Debounce extends Activity
        private boolean loaded;
        private boolean safe_to_load;
        private int debounce_delay;
+       private int settle_time;
+       private int poll_time;
+       private boolean hw_debounce_en;
+       private int hw_debounce_time;
+       private boolean drive_inactive_en;
 
        public MS2Debounce()
        {
@@ -45,13 +50,60 @@ public class MS2Debounce extends Activity
                        public void afterTextChanged(Editable delay) {
                                if (delay.toString().length() > 0) {
                                        module.setSavedDelay(Integer.parseInt(delay.toString()));
+                               }
+                       }
+
+                       @Override
+                       public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                       }
+
+                       @Override
+                       public void onTextChanged(CharSequence s, int start, int before, int count) {
+                       }
+               });
+
+               EditText textSettle = (EditText)findViewById(R.id.settle_time);
+               textSettle.addTextChangedListener(new TextWatcher() {
+                       @Override
+                       public void afterTextChanged(Editable settle_time) {
+                               if (settle_time.toString().length() > 0) {
+                                       module.setSavedSettle(Integer.parseInt(settle_time.toString()));
+                               }
+                       }
+
+                       @Override
+                       public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                       }
+
+                       @Override
+                       public void onTextChanged(CharSequence s, int start, int before, int count) {
+                       }
+               });
+
+               EditText textPoll = (EditText)findViewById(R.id.poll_time);
+               textPoll.addTextChangedListener(new TextWatcher() {
+                       @Override
+                       public void afterTextChanged(Editable poll_time) {
+                               if (poll_time.toString().length() > 0) {
+                                       module.setSavedPoll(Integer.parseInt(poll_time.toString()));
+                               }
+                       }
+
+                       @Override
+                       public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                       }
+
+                       @Override
+                       public void onTextChanged(CharSequence s, int start, int before, int count) {
+                       }
+               });
 
-                                       Button reload = (Button)findViewById(R.id.reload);
-                                       if (loaded && module.getSavedDelay() != debounce_delay) {
-                                               reload.setEnabled(true);
-                                       } else {
-                                               reload.setEnabled(false);
-                                       }
+               EditText textHwDebounceTime = (EditText)findViewById(R.id.hw_debounce_time);
+               textHwDebounceTime.addTextChangedListener(new TextWatcher() {
+                       @Override
+                       public void afterTextChanged(Editable hw_debounce_time) {
+                               if (hw_debounce_time.toString().length() > 0) {
+                                       module.setSavedHwDebounceTime(Integer.parseInt(hw_debounce_time.toString()));
                                }
                        }
 
@@ -74,19 +126,41 @@ public class MS2Debounce extends Activity
                loaded = module.isLoaded();
                safe_to_load = module.is_safe_to_load();
                debounce_delay = module.getDelay();
+               settle_time = module.getSettle();
+               poll_time = module.getPoll();
+               hw_debounce_en = module.getHwDebounce();
+               hw_debounce_time = module.getHwDebounceTime();
+               drive_inactive_en = module.getDriveInactive();
 
                TextView text = (TextView)findViewById(R.id.text);
-               text.setText("Current status:\n\nModule loaded: " + loaded + "\ndebounce_delay: " + debounce_delay + "ms\nsafe_to_load: " + safe_to_load);
+               text.setText("Module loaded: " + loaded + "\n" +
+                       "debounce_delay: " + debounce_delay + "ms\n" + 
+                       "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?"en":"dis") + "abled, " + ((hw_debounce_time+1)*31) + "us (" + hw_debounce_time + "), drive inactive: " + (drive_inactive_en?"en":"dis") + "abled");
 
                EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
                textDelay.setText(Integer.toString(module.getSavedDelay()));
                textDelay.setEnabled(true);
 
-               Button reload = (Button)findViewById(R.id.reload);
-               if (loaded && module.getSavedDelay() != debounce_delay) {
-                       reload.setEnabled(true);
+               EditText textSettle = (EditText)findViewById(R.id.settle_time);
+               textSettle.setText(Integer.toString(module.getSavedSettle()));
+               textSettle.setEnabled(true);
+
+               EditText textPoll = (EditText)findViewById(R.id.poll_time);
+               textPoll.setText(Integer.toString(module.getSavedPoll()));
+               textPoll.setEnabled(true);
+
+               EditText textHwDebounceTime = (EditText)findViewById(R.id.hw_debounce_time);
+               textHwDebounceTime.setText(Integer.toString(module.getSavedHwDebounceTime()));
+               textHwDebounceTime.setEnabled(true);
+
+               Button set = (Button)findViewById(R.id.set);
+               if (loaded) {
+                       set.setEnabled(true);
                } else {
-                       reload.setEnabled(false);
+                       set.setEnabled(false);
                }
 
                Button load = (Button)findViewById(R.id.load);
@@ -110,14 +184,31 @@ public class MS2Debounce extends Activity
                } else {
                        on_boot.setEnabled(false);
                }
+
+               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);
        }
 
        private void disableUI() {
                EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
                textDelay.setEnabled(false);
 
-               Button reload = (Button)findViewById(R.id.reload);
-               reload.setEnabled(false);
+               EditText textSettle = (EditText)findViewById(R.id.settle_time);
+               textSettle.setEnabled(false);
+
+               EditText textPoll = (EditText)findViewById(R.id.poll_time);
+               textPoll.setEnabled(false);
+
+               EditText textHwDebounceTime = (EditText)findViewById(R.id.hw_debounce_time);
+               textHwDebounceTime.setEnabled(false);
+
+               Button set = (Button)findViewById(R.id.set);
+               set.setEnabled(false);
 
                Button load = (Button)findViewById(R.id.load);
                load.setEnabled(false);
@@ -127,6 +218,12 @@ public class MS2Debounce extends Activity
 
                CheckBox on_boot = (CheckBox)findViewById(R.id.on_boot);
                on_boot.setEnabled(false);
+
+               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);
        }
 
        public void loadModule(View view) {
@@ -145,14 +242,12 @@ public class MS2Debounce extends Activity
                updateUI();
        }
 
-       public void reloadModule(View view) {
+       public void setValues(View view) {
                disableUI();
-               if (module.isLoaded()) {
-                       module.unloadModule();
-               }
                if (!module.isLoaded()) {
                        module.loadModule();
                }
+               module.setAllValues();
                updateUI();
        }
 
@@ -162,6 +257,18 @@ public class MS2Debounce extends Activity
                module.set_on_boot(on_boot.isChecked());
        }
 
+       public void toggle_hw_debounce(View view) {
+               CheckBox hw_debounce = (CheckBox)view;
+
+               module.setSavedHwDebounce(hw_debounce.isChecked());
+       }
+
+       public void toggle_drive_inactive(View view) {
+               CheckBox drive_inactive = (CheckBox)view;
+
+               module.setSavedDriveInactive(drive_inactive.isChecked());
+       }
+
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                MenuInflater inflater = getMenuInflater();