X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/126529c5b9a099c6ce08f3557e6aa3f57a4e75dc..1786d1916425cb53b022b5c3179c896b98a31a41:/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 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