X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/d002e66d131c784871aa3098714489a2d22c2ff2..HEAD:/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java?ds=sidebyside diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java index 3763a65..07355c7 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,14 +228,24 @@ 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) { disableUI(); if (!module.isLoaded()) { - module.loadModule(); + try { + if (!module.loadModule()) + showDialog(22); + } catch (NotRootedException e) { + showDialog(23); + } catch (ShellException e) { + showDialog(24); + } } updateUI(); } @@ -237,7 +253,13 @@ public class MS2Debounce extends Activity 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(); } @@ -245,7 +267,14 @@ public class MS2Debounce extends Activity 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(); @@ -263,10 +292,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()); + // module.setSavedDriveInactive(drive_inactive.isChecked()); + //} + + public void toggle_active_high(View view) { + CheckBox active_high = (CheckBox)view; + + module.setSavedActiveHigh(active_high.isChecked()); } @Override @@ -290,15 +325,63 @@ public class MS2Debounce extends Activity 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 \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(); + 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, are insmod/rmmod binaries available and do you have a MS2/Droid2 with kernel 2.6.32 (or matching debounce-module for a custom kernel)?") + .setCancelable(true) + .setPositiveButton("Ok", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }); + dlg = shellexec.create(); + break; + case 42: + String version; + + try { + version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName; + } catch (Exception e) { + version = "?"; } - }); - dlg = about.create(); + + AlertDialog.Builder about = new AlertDialog.Builder(this); + about.setMessage("Milestone 2 Debounce " + version + "\n\n(C) 2011 Michael Gernoth \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; }