From: Michael Gernoth <michael@gernoth.net>
Date: Wed, 7 Sep 2011 20:05:25 +0000 (+0200)
Subject: replace useless drive inactive toggle with toggle for active high
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/commitdiff_plain/1786d1916425cb53b022b5c3179c896b98a31a41?ds=inline

replace useless drive inactive toggle with toggle for active high
---

diff --git a/MS2Debounce/res/layout/main.xml b/MS2Debounce/res/layout/main.xml
index 9d3eeae..4538f8d 100644
--- a/MS2Debounce/res/layout/main.xml
+++ b/MS2Debounce/res/layout/main.xml
@@ -89,6 +89,7 @@
     android:text="0"
     android:enabled="false"
     android:background="@android:drawable/editbox_background"/>
+<!--
 <CheckBox
     android:id="@+id/drive_inactive"
     android:layout_alignBaseline="@id/poll_label"
@@ -97,6 +98,15 @@
     android:layout_height="wrap_content"
     android:onClick="toggle_drive_inactive"
     android:text="Drive inactive pins" />
+-->
+<CheckBox
+    android:id="@+id/active_high"
+    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_active_high"
+    android:text="Active High Logic" />
 <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 75be408..6234eae 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -28,7 +28,8 @@ public class DebounceModuleHelper
 		setPoll(getSavedPoll());
 		setHwDebounce(getSavedHwDebounce());
 		setHwDebounceTime(getSavedHwDebounceTime());
-		setDriveInactive(getSavedDriveInactive());
+		//setDriveInactive(getSavedDriveInactive());
+		setActiveHigh(getSavedActiveHigh());
 	}
 
 	public void loadModule() {
@@ -200,6 +201,20 @@ public class DebounceModuleHelper
 			setValue("drive_inactive_flag", 0);
 	}
 
+	public synchronized boolean getActiveHigh() {
+		if (getValue("active_high_flag") == 1)
+			return true;
+
+		return false;
+	}
+
+	public synchronized void setActiveHigh(boolean enable) {
+		if (enable)
+			setValue("active_high_flag", 1);
+		else
+			setValue("active_high_flag", 0);
+	}
+
 	public synchronized int getSavedDelay() {
 		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
@@ -284,6 +299,20 @@ public class DebounceModuleHelper
 		editor.commit();
 	}
 
+	public synchronized boolean getSavedActiveHigh() {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+		return settings.getBoolean("active_high", false);
+	}
+
+	public synchronized void setSavedActiveHigh(boolean enable) {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		SharedPreferences.Editor editor = settings.edit();
+
+		editor.putBoolean("active_high", 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);
diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
index 3763a65..27508fc 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
@@ -30,6 +30,7 @@ public class MS2Debounce extends Activity
 	private boolean hw_debounce_en;
 	private int hw_debounce_time;
 	private boolean drive_inactive_en;
+	private boolean active_high_en;
 
 	public MS2Debounce()
 	{
@@ -130,7 +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();
+		//drive_inactive_en = module.getDriveInactive();
+		active_high_en = module.getActiveHigh();
 
 		TextView text = (TextView)findViewById(R.id.text);
 		text.setText("Module loaded: " + loaded + "\n" +
@@ -138,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?"en":"dis") + "abled, " + ((hw_debounce_time+1)*31) + "us (" + hw_debounce_time + "), drive inactive: " + (drive_inactive_en?"en":"dis") + "abled");
+			"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()));
@@ -189,9 +191,13 @@ public class MS2Debounce extends Activity
 		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 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() {
@@ -222,8 +228,11 @@ 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 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) {
@@ -263,10 +272,16 @@ public class MS2Debounce extends Activity
 		module.setSavedHwDebounce(hw_debounce.isChecked());
 	}
 
-	public void toggle_drive_inactive(View view) {
-		CheckBox drive_inactive = (CheckBox)view;
+	//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.setSavedDriveInactive(drive_inactive.isChecked());
+		module.setSavedActiveHigh(active_high.isChecked());
 	}
 
 	@Override