update defaults for debounce_delay and poll_time

[ms2-fixes] / MS2Debounce / src / de / rmdir / ms2debounce / DebounceModuleHelper.java

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index 5e2a47677371e281e619edc0b0b97fa034da1a68..e26379f3c965c936ee98f61f24aaa05f0f93d1b5 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -22,9 +22,15 @@ public class DebounceModuleHelper
                ctx = context;
        }
 
+       public void setAllValues() {
+               setDelay(getSavedDelay());
+               setSettle(getSavedSettle());
+               setPoll(getSavedPoll());
+       }
+
        public void loadModule() {
                _loadModule();
-               setDelay(getSavedDelay());
+               setAllValues();
        }
 
        protected void runAsRoot(String command) throws java.io.IOException,java.lang.InterruptedException {
@@ -96,45 +102,69 @@ public class DebounceModuleHelper
                return loaded;
        }
 
-       public synchronized int getDelay() {
-               int debounce_delay = -1;
+       private synchronized int getValue(String parameter) {
+               int value = -1;
 
                try {
                        String read;
 
-                       FileReader delay = new FileReader("/sys/devices/debounce/debounce_delay");
-                       BufferedReader delay_buf = new BufferedReader(delay);
+                       FileReader fr = new FileReader("/sys/devices/debounce/" + parameter);
+                       BufferedReader fbuf = new BufferedReader(fr);
 
-                       read = delay_buf.readLine();
+                       read = fbuf.readLine();
                        if (read != null) {
-                               debounce_delay = Integer.parseInt(read.trim());
+                               value = Integer.parseInt(read.trim());
                        }
 
-                       delay_buf.close();
+                       fbuf.close();
                } catch (Exception e) {}
 
-               return debounce_delay;
+               return value;
        }
 
-       public synchronized void setDelay(int debounce_delay) {
+       private synchronized void setValue(String parameter, int value) {
                if (!isLoaded()) {
                        return;
                }
 
                try {
-                       FileWriter delay = new FileWriter("/sys/devices/debounce/debounce_delay");
-                       BufferedWriter delay_buf = new BufferedWriter(delay);
+                       FileWriter fw = new FileWriter("/sys/devices/debounce/" + parameter);
+                       BufferedWriter fbuf = new BufferedWriter(fw);
 
-                       delay_buf.write((new Integer(debounce_delay)).toString());
+                       fbuf.write((new Integer(value)).toString());
 
-                       delay_buf.close();
+                       fbuf.close();
                } catch (Exception e) {}
        }
 
+       public synchronized int getDelay() {
+               return getValue("debounce_delay");
+       }
+
+       public synchronized void setDelay(int debounce_delay) {
+               setValue("debounce_delay", debounce_delay);
+       }
+
+       public synchronized int getSettle() {
+               return getValue("settle_time");
+       }
+
+       public synchronized void setSettle(int settle_time) {
+               setValue("settle_time", settle_time);
+       }
+
+       public synchronized int getPoll() {
+               return getValue("poll_time");
+       }
+
+       public synchronized void setPoll(int poll_time) {
+               setValue("poll_time", poll_time);
+       }
+
        public synchronized int getSavedDelay() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
-               return settings.getInt("debounce_delay", 8);
+               return settings.getInt("debounce_delay", 15);
        }
 
        public synchronized void setSavedDelay(int delay) {
@@ -145,6 +175,34 @@ public class DebounceModuleHelper
                editor.commit();
        }
 
+       public synchronized int getSavedSettle() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getInt("settle_time", 150);
+       }
+
+       public synchronized void setSavedSettle(int settle) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putInt("settle_time", settle);
+               editor.commit();
+       }
+
+       public synchronized int getSavedPoll() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getInt("poll_time", 2);
+       }
+
+       public synchronized void setSavedPoll(int poll) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putInt("poll_time", poll);
+               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);