change default settle time, fix landscape view

[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 d1ece2be16fe4a016a32cda183600b795117c649..08ce61d73bdc3daf737d5840483109492faaf3c8 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
@@ -14,11 +14,20 @@ import android.view.View;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.text.TextWatcher;
+import android.text.Editable;
 
 public class MS2Debounce extends Activity
 {
        private DebounceModuleHelper module;
 
+       // Calling these is expensive, so cache the result...
+       private boolean loaded;
+       private boolean safe_to_load;
+       private int debounce_delay;
+       private int settle_time;
+       private int poll_time;
+
        public MS2Debounce()
        {
                super();
@@ -30,31 +39,99 @@ public class MS2Debounce extends Activity
        {
                super.onCreate(savedInstanceState);
 
-               //if (!module.isLoaded()) {
-               //      module.loadModule();
-               //}
-
                setContentView(R.layout.main);
+
+               EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
+               textDelay.addTextChangedListener(new TextWatcher() {
+                       @Override
+                       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) {
+                       }
+               });
+
                updateUI();
        }
 
        private void updateUI() {
                disableUI();
 
-               boolean loaded = module.isLoaded();
-               boolean safe_to_load = module.is_safe_to_load();
+               // Calling these is expensive, so cache the result...
+               loaded = module.isLoaded();
+               safe_to_load = module.is_safe_to_load();
+               debounce_delay = module.getDelay();
+               settle_time = module.getSettle();
+               poll_time = module.getPoll();
 
                TextView text = (TextView)findViewById(R.id.text);
-               text.setText("Current status:\n\nModule loaded: " + loaded + "\ndebounce_delay: " + module.getDelay() + "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)");
+
+               EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
+               textDelay.setText(Integer.toString(module.getSavedDelay()));
+               textDelay.setEnabled(true);
 
-               //EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
-               //textDelay.setText(module.getSavedDelay());
+               EditText textSettle = (EditText)findViewById(R.id.settle_time);
+               textSettle.setText(Integer.toString(module.getSavedSettle()));
+               textSettle.setEnabled(true);
 
-               Button reload = (Button)findViewById(R.id.reload);
+               EditText textPoll = (EditText)findViewById(R.id.poll_time);
+               textPoll.setText(Integer.toString(module.getSavedPoll()));
+               textPoll.setEnabled(true);
+
+               Button set = (Button)findViewById(R.id.set);
                if (loaded) {
-                       reload.setEnabled(true);
+                       set.setEnabled(true);
                } else {
-                       reload.setEnabled(false);
+                       set.setEnabled(false);
                }
 
                Button load = (Button)findViewById(R.id.load);
@@ -72,6 +149,7 @@ public class MS2Debounce extends Activity
                }
 
                CheckBox on_boot = (CheckBox)findViewById(R.id.on_boot);
+               on_boot.setChecked(module.get_on_boot());
                if (safe_to_load) {
                        on_boot.setEnabled(true);
                } else {
@@ -80,8 +158,17 @@ public class MS2Debounce extends Activity
        }
 
        private void disableUI() {
-               Button reload = (Button)findViewById(R.id.reload);
-               reload.setEnabled(false);
+               EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
+               textDelay.setEnabled(false);
+
+               EditText textSettle = (EditText)findViewById(R.id.settle_time);
+               textSettle.setEnabled(false);
+
+               EditText textPoll = (EditText)findViewById(R.id.poll_time);
+               textPoll.setEnabled(false);
+
+               Button set = (Button)findViewById(R.id.set);
+               set.setEnabled(false);
 
                Button load = (Button)findViewById(R.id.load);
                load.setEnabled(false);
@@ -109,17 +196,21 @@ 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();
        }
 
+       public void toggle_on_boot(View view) {
+               CheckBox on_boot = (CheckBox)view;
+
+               module.set_on_boot(on_boot.isChecked());
+       }
+
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                MenuInflater inflater = getMenuInflater();