From: Michael Gernoth <michael@gernoth.net>
Date: Sun, 21 Aug 2011 14:06:45 +0000 (+0200)
Subject: integrate hw debounce into gui
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/commitdiff_plain/2bb83a0e6c37053577c741fd25eeeeeb3364fd66

integrate hw debounce into gui
---

diff --git a/MS2Debounce/res/layout/main.xml b/MS2Debounce/res/layout/main.xml
index a1f41a8..b9d55b8 100644
--- a/MS2Debounce/res/layout/main.xml
+++ b/MS2Debounce/res/layout/main.xml
@@ -63,6 +63,14 @@
     android:text="0"
     android:enabled="false"
     android:background="@android:drawable/editbox_background"/>
+<CheckBox
+    android:id="@+id/on_boot"
+    android:layout_alignBaseline="@id/settle_label"
+    android:layout_toRightOf="@id/settle_time"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:onClick="toggle_on_boot"
+    android:text="Load module on boot" />
 <TextView
     android:id="@+id/poll_label"
     android:layout_width="wrap_content"
@@ -81,16 +89,36 @@
     android:text="0"
     android:enabled="false"
     android:background="@android:drawable/editbox_background"/>
-<CheckBox
-    android:id="@+id/on_boot"
+<TextView
+    android:id="@+id/hw_debounce_label"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dip"
     android:layout_below="@id/poll_label"
+    android:text="HW Debounce:"/>
+<EditText
+    android:id="@+id/hw_debounce_time"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignBaseline="@id/hw_debounce_label"
+    android:layout_toRightOf="@id/hw_debounce_label"
+    android:numeric="integer"
+    android:maxLength="2"
+    android:text="1"
+    android:enabled="false"
+    android:background="@android:drawable/editbox_background"/>
+<CheckBox
+    android:id="@+id/hw_debounce"
+    android:layout_alignBaseline="@id/hw_debounce_label"
+    android:layout_toRightOf="@id/hw_debounce_time"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:onClick="toggle_on_boot"
-    android:text="Load module on boot" />
+    android:onClick="toggle_hw_debounce"
+    android:text="Enabled" />
 <TextView  
     android:id="@+id/text"
-    android:layout_below="@id/on_boot"
+    android:layout_marginTop="10dip"
+    android:layout_below="@id/hw_debounce_label"
     android:layout_width="fill_parent" 
     android:layout_height="fill_parent" 
     android:text=""
diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index 4b6ad0e..bbe972e 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -26,6 +26,8 @@ public class DebounceModuleHelper
 		setDelay(getSavedDelay());
 		setSettle(getSavedSettle());
 		setPoll(getSavedPoll());
+		setHwDebounce(getSavedHwDebounce());
+		setHwDebounceTime(getSavedHwDebounceTime());
 	}
 
 	public void loadModule() {
@@ -161,6 +163,28 @@ public class DebounceModuleHelper
 		setValue("poll_time", poll_time);
 	}
 
+	public synchronized boolean getHwDebounce() {
+		if (getValue("hw_debounce") == 1)
+			return true;
+
+		return false;
+	}
+
+	public synchronized void setHwDebounce(boolean enable) {
+		if (enable)
+			setValue("hw_debounce", 1);
+		else
+			setValue("hw_debounce", 0);
+	}
+
+	public synchronized int getHwDebounceTime() {
+		return getValue("hw_debounce_time");
+	}
+
+	public synchronized void setHwDebounceTime(int time) {
+		setValue("hw_debounce_time", time);
+	}
+
 	public synchronized int getSavedDelay() {
 		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
@@ -203,6 +227,34 @@ public class DebounceModuleHelper
 		editor.commit();
 	}
 
+	public synchronized boolean getSavedHwDebounce() {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+		return settings.getBoolean("hw_debounce", true);
+	}
+
+	public synchronized void setSavedHwDebounce(boolean enable) {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		SharedPreferences.Editor editor = settings.edit();
+
+		editor.putBoolean("hw_debounce", enable);
+		editor.commit();
+	}
+
+	public synchronized int getSavedHwDebounceTime() {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+		return settings.getInt("hw_debounce_time", 1);
+	}
+
+	public synchronized void setSavedHwDebounceTime(int time) {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		SharedPreferences.Editor editor = settings.edit();
+
+		editor.putInt("hw_debounce_time", time);
+		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 08ce61d..a4cd522 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
@@ -27,6 +27,8 @@ public class MS2Debounce extends Activity
 	private int debounce_delay;
 	private int settle_time;
 	private int poll_time;
+	private boolean hw_debounce_en;
+	private int hw_debounce_time;
 
 	public MS2Debounce()
 	{
@@ -95,6 +97,24 @@ public class MS2Debounce extends Activity
 			}
 		});
 
+		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()));
+				}
+			}
+
+			@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();
 	}
 
@@ -107,13 +127,16 @@ public class MS2Debounce extends Activity
 		debounce_delay = module.getDelay();
 		settle_time = module.getSettle();
 		poll_time = module.getPoll();
+		hw_debounce_en = module.getHwDebounce();
+		hw_debounce_time = module.getHwDebounceTime();
 
 		TextView text = (TextView)findViewById(R.id.text);
 		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)");
+			"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 + ")");
 
 		EditText textDelay = (EditText)findViewById(R.id.debounce_delay);
 		textDelay.setText(Integer.toString(module.getSavedDelay()));
@@ -127,6 +150,10 @@ public class MS2Debounce extends Activity
 		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);
@@ -155,6 +182,10 @@ 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);
 	}
 
 	private void disableUI() {
@@ -167,6 +198,9 @@ public class MS2Debounce extends Activity
 		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);
 
@@ -178,6 +212,9 @@ 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);
 	}
 
 	public void loadModule(View view) {
@@ -211,6 +248,12 @@ 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());
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();