wait for module to be loaded before trying to set parameters

[ms2-fixes] / 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 a4cd522b449a589776e2f20e00744674f8554528..5c042060383dfc19c907f39be25c35c4b5688f0a 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java
@@ -29,6 +29,8 @@ 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;
+       private boolean active_high_en;

 
        public MS2Debounce()
        {
 
        public MS2Debounce()
        {


@@ -129,6 +131,8 @@ 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();
+               active_high_en = module.getActiveHigh();

 
                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 +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" +
                        "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 + "), active high: " + (active_high_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 +190,14 @@ 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);
+
+               CheckBox active_high = (CheckBox)findViewById(R.id.active_high);
+               active_high.setChecked(module.getSavedActiveHigh());
+               active_high.setEnabled(true);

        }
 
        private void disableUI() {
        }
 
        private void disableUI() {


@@ -215,12 +227,25 @@ 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);
+
+               CheckBox active_high = (CheckBox)findViewById(R.id.active_high);
+               active_high.setEnabled(false);

        }
 
        public void loadModule(View view) {
                disableUI();
                if (!module.isLoaded()) {
        }
 
        public void loadModule(View view) {
                disableUI();
                if (!module.isLoaded()) {

-                       module.loadModule();
+                       try {
+                               if (!module.loadModule())
+                                       showDialog(22);
+                       } catch (NotRootedException e) {
+                                       showDialog(23);
+                       } catch (ShellException e) {
+                                       showDialog(24);
+                       }

                }
                updateUI();
        }
                }
                updateUI();
        }


@@ -228,7 +253,13 @@ public class MS2Debounce extends Activity
        public void unloadModule(View view) {
                disableUI();
                if (module.isLoaded()) {
        public void unloadModule(View view) {
                disableUI();
                if (module.isLoaded()) {

-                       module.unloadModule();
+                       try {
+                               module.unloadModule();
+                       } catch (NotRootedException e) {
+                                       showDialog(23);
+                       } catch (ShellException e) {
+                                       showDialog(24);
+                       }

                }
                updateUI();
        }
                }
                updateUI();
        }


@@ -236,7 +267,14 @@ public class MS2Debounce extends Activity
        public void setValues(View view) {
                disableUI();
                if (!module.isLoaded()) {
        public void setValues(View view) {
                disableUI();
                if (!module.isLoaded()) {

-                       module.loadModule();
+                       try {
+                               if (!module.loadModule())
+                                       showDialog(22);
+                       } catch (NotRootedException e) {
+                               showDialog(23);
+                       } catch (ShellException e) {
+                               showDialog(24);
+                       }

                }
                module.setAllValues();
                updateUI();
                }
                module.setAllValues();
                updateUI();


@@ -254,6 +292,18 @@ 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());
+       //}
+
+       public void toggle_active_high(View view) {
+               CheckBox active_high = (CheckBox)view;
+
+               module.setSavedActiveHigh(active_high.isChecked());
+       }
+

        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                MenuInflater inflater = getMenuInflater();
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                MenuInflater inflater = getMenuInflater();


@@ -275,15 +325,55 @@ public class MS2Debounce extends Activity
        protected Dialog onCreateDialog(int id) {
                Dialog dlg = null;
 
        protected Dialog onCreateDialog(int id) {
                Dialog dlg = null;
 

-               AlertDialog.Builder about = new AlertDialog.Builder(this);
-               about.setMessage("Milestone 2 Debounce\n\n(C) 2011 Michael Gernoth <michael@gernoth.net>\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA")
-                       .setCancelable(true)
-                       .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
-                               public void onClick(DialogInterface dialog, int id) {
-                                       dialog.cancel();
-                               }
-                       });
-               dlg = about.create();
+               switch(id) {
+                       case 22:
+                               AlertDialog.Builder noload = new AlertDialog.Builder(this);
+                               noload.setMessage("Could not load/unload the module! Do you have a MS2/Droid2 with kernel 2.6.32?")
+                                       .setCancelable(true)
+                                       .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                                               public void onClick(DialogInterface dialog, int id) {
+                                                       dialog.cancel();
+                                               }
+                                       });
+                               dlg = noload.create();
+                               break;
+                       case 23:
+                               AlertDialog.Builder noroot = new AlertDialog.Builder(this);
+                               noroot.setMessage("Could not get root access! Is this device rooted and have you granted Superuser privileges?")
+                                       .setCancelable(true)
+                                       .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                                               public void onClick(DialogInterface dialog, int id) {
+                                                       dialog.cancel();
+                                               }
+                                       });
+                               dlg = noroot.create();
+                               break;
+                       case 24:
+                               AlertDialog.Builder shellexec = new AlertDialog.Builder(this);
+                               shellexec.setMessage("Problems executing shell commands as root! Is this device rooted and are insmod/rmmod binaries available?")
+                                       .setCancelable(true)
+                                       .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                                               public void onClick(DialogInterface dialog, int id) {
+                                                       dialog.cancel();
+                                               }
+                                       });
+                               dlg = shellexec.create();
+                               break;
+                       case 42:
+                               AlertDialog.Builder about = new AlertDialog.Builder(this);
+                               about.setMessage("Milestone 2 Debounce\n\n(C) 2011 Michael Gernoth <michael@gernoth.net>\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA")
+                                       .setCancelable(true)
+                                       .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                                               public void onClick(DialogInterface dialog, int id) {
+                                                       dialog.cancel();
+                                               }
+                                       });
+                               dlg = about.create();
+                               break;
+                       default:
+                               dlg = null;
+                               break;
+               }

 
                return dlg;
        }
 
                return dlg;
        }