add option to set drive_inactive flag

diff --git a/MS2Debounce/res/layout/main.xml b/MS2Debounce/res/layout/main.xml
index b9d55b8448bf1f08fdd33fe247466f2c1919457b..9d3eeae2268d462c6a768993ceacbcfa6e419be2 100644 (file)
--- a/MS2Debounce/res/layout/main.xml
+++ b/MS2Debounce/res/layout/main.xml
@@ -89,6 +89,14 @@
     android:text="0"
     android:enabled="false"
     android:background="@android:drawable/editbox_background"/>
     android:text="0"
     android:enabled="false"
     android:background="@android:drawable/editbox_background"/>

+<CheckBox
+    android:id="@+id/drive_inactive"
+    android:layout_alignBaseline="@id/poll_label"
+    android:layout_toRightOf="@id/poll_time"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:onClick="toggle_drive_inactive"
+    android:text="Drive inactive pins" />

 <TextView
     android:id="@+id/hw_debounce_label"
     android:layout_width="wrap_content"
 <TextView
     android:id="@+id/hw_debounce_label"
     android:layout_width="wrap_content"

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index bbe972e30bcd7561ec674687f3e85fe4a1435255..75be40868906495d231b0a721f71c75950e0f0cc 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -28,6 +28,7 @@ public class DebounceModuleHelper
                setPoll(getSavedPoll());
                setHwDebounce(getSavedHwDebounce());
                setHwDebounceTime(getSavedHwDebounceTime());
                setPoll(getSavedPoll());
                setHwDebounce(getSavedHwDebounce());
                setHwDebounceTime(getSavedHwDebounceTime());

+               setDriveInactive(getSavedDriveInactive());

        }
 
        public void loadModule() {
        }
 
        public void loadModule() {


@@ -185,6 +186,20 @@ public class DebounceModuleHelper
                setValue("hw_debounce_time", time);
        }
 
                setValue("hw_debounce_time", time);
        }
 

+       public synchronized boolean getDriveInactive() {
+               if (getValue("drive_inactive_flag") == 1)
+                       return true;
+
+               return false;
+       }
+
+       public synchronized void setDriveInactive(boolean enable) {
+               if (enable)
+                       setValue("drive_inactive_flag", 1);
+               else
+                       setValue("drive_inactive_flag", 0);
+       }
+

        public synchronized int getSavedDelay() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
        public synchronized int getSavedDelay() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 


@@ -230,7 +245,7 @@ public class DebounceModuleHelper
        public synchronized boolean getSavedHwDebounce() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
        public synchronized boolean getSavedHwDebounce() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 

-               return settings.getBoolean("hw_debounce", true);
+               return settings.getBoolean("hw_debounce", false);

        }
 
        public synchronized void setSavedHwDebounce(boolean enable) {
        }
 
        public synchronized void setSavedHwDebounce(boolean enable) {


@@ -255,6 +270,20 @@ public class DebounceModuleHelper
                editor.commit();
        }
 
                editor.commit();
        }
 

+       public synchronized boolean getSavedDriveInactive() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getBoolean("drive_inactive", false);
+       }
+
+       public synchronized void setSavedDriveInactive(boolean enable) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putBoolean("drive_inactive", enable);
+               editor.commit();
+       }
+

        public synchronized boolean is_safe_to_load() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
                return settings.getBoolean("safe_to_load", false);
        public synchronized boolean is_safe_to_load() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
                return settings.getBoolean("safe_to_load", false);

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
index a4cd522b449a589776e2f20e00744674f8554528..3763a65ac32aa0ca115c1862aef85cba3eda5946 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
@@ -29,6 +29,7 @@ public class MS2Debounce extends Activity
        private int poll_time;
        private boolean hw_debounce_en;
        private int hw_debounce_time;
        private int poll_time;
        private boolean hw_debounce_en;
        private int hw_debounce_time;

+       private boolean drive_inactive_en;

 
        public MS2Debounce()
        {
 
        public MS2Debounce()
        {


@@ -129,6 +130,7 @@ public class MS2Debounce extends Activity
                poll_time = module.getPoll();
                hw_debounce_en = module.getHwDebounce();
                hw_debounce_time = module.getHwDebounceTime();
                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("Module loaded: " + loaded + "\n" +
 
                TextView text = (TextView)findViewById(R.id.text);
                text.setText("Module loaded: " + loaded + "\n" +


@@ -136,7 +138,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" +
                        "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 + "), drive inactive: " + (drive_inactive_en?"en":"dis") + "abled");

 
                EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
                textDelay.setText(Integer.toString(module.getSavedDelay()));
 
                EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
                textDelay.setText(Integer.toString(module.getSavedDelay()));


@@ -186,6 +188,10 @@ public class MS2Debounce extends Activity
                CheckBox hw_debounce = (CheckBox)findViewById(R.id.hw_debounce);
                hw_debounce.setChecked(module.getSavedHwDebounce());
                hw_debounce.setEnabled(true);
                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() {
        }
 
        private void disableUI() {


@@ -215,6 +221,9 @@ public class MS2Debounce extends Activity
 
                CheckBox hw_debounce = (CheckBox)findViewById(R.id.hw_debounce);
                hw_debounce.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) {
        }
 
        public void loadModule(View view) {


@@ -254,6 +263,12 @@ public class MS2Debounce extends Activity
                module.setSavedHwDebounce(hw_debounce.isChecked());
        }
 
                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();
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                MenuInflater inflater = getMenuInflater();