X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/01b288b5fa86b3ae488db6d7c73272f2a2fe7c3f..d002e66d131c784871aa3098714489a2d22c2ff2:/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 7cc7e1d..3763a65 100644 --- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java +++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java @@ -14,11 +14,23 @@ import android.view.View; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import android.text.TextWatcher; +import android.text.Editable; public class MS2Debounce extends Activity { private DebounceModuleHelper module; + // Calling these is expensive, so cache the result... + private boolean loaded; + private boolean safe_to_load; + private int debounce_delay; + private int settle_time; + private int poll_time; + private boolean hw_debounce_en; + private int hw_debounce_time; + private boolean drive_inactive_en; + public MS2Debounce() { super(); @@ -30,11 +42,80 @@ public class MS2Debounce extends Activity { super.onCreate(savedInstanceState); - //if (!module.isLoaded()) { - // module.loadModule(); - //} - setContentView(R.layout.main); + + EditText textDelay = (EditText)findViewById(R.id.debounce_delay); + textDelay.addTextChangedListener(new TextWatcher() { + @Override + public void afterTextChanged(Editable delay) { + if (delay.toString().length() > 0) { + module.setSavedDelay(Integer.parseInt(delay.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) { + } + }); + + EditText textSettle = (EditText)findViewById(R.id.settle_time); + textSettle.addTextChangedListener(new TextWatcher() { + @Override + public void afterTextChanged(Editable settle_time) { + if (settle_time.toString().length() > 0) { + module.setSavedSettle(Integer.parseInt(settle_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) { + } + }); + + EditText textPoll = (EditText)findViewById(R.id.poll_time); + textPoll.addTextChangedListener(new TextWatcher() { + @Override + public void afterTextChanged(Editable poll_time) { + if (poll_time.toString().length() > 0) { + module.setSavedPoll(Integer.parseInt(poll_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) { + } + }); + + 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(); } @@ -42,21 +123,44 @@ public class MS2Debounce extends Activity disableUI(); // Calling these is expensive, so cache the result... - boolean loaded = module.isLoaded(); - boolean safe_to_load = module.is_safe_to_load(); - int debounce_delay = module.getDelay(); + loaded = module.isLoaded(); + safe_to_load = module.is_safe_to_load(); + debounce_delay = module.getDelay(); + settle_time = module.getSettle(); + poll_time = module.getPoll(); + hw_debounce_en = module.getHwDebounce(); + hw_debounce_time = module.getHwDebounceTime(); + drive_inactive_en = module.getDriveInactive(); TextView text = (TextView)findViewById(R.id.text); - text.setText("Current status:\n\nModule loaded: " + loaded + "\ndebounce_delay: " + debounce_delay + "ms\nsafe_to_load: " + safe_to_load); + 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)\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"); + + EditText textDelay = (EditText)findViewById(R.id.debounce_delay); + textDelay.setText(Integer.toString(module.getSavedDelay())); + textDelay.setEnabled(true); - //EditText textDelay = (EditText)findViewById(R.id.debounce_delay); - //textDelay.setText(module.getSavedDelay()); + EditText textSettle = (EditText)findViewById(R.id.settle_time); + textSettle.setText(Integer.toString(module.getSavedSettle())); + textSettle.setEnabled(true); - Button reload = (Button)findViewById(R.id.reload); - if (loaded && module.getSavedDelay() != debounce_delay) { - reload.setEnabled(true); + EditText textPoll = (EditText)findViewById(R.id.poll_time); + 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); } else { - reload.setEnabled(false); + set.setEnabled(false); } Button load = (Button)findViewById(R.id.load); @@ -80,11 +184,31 @@ 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); + + CheckBox drive_inactive = (CheckBox)findViewById(R.id.drive_inactive); + drive_inactive.setChecked(module.getSavedDriveInactive()); + drive_inactive.setEnabled(true); } private void disableUI() { - Button reload = (Button)findViewById(R.id.reload); - reload.setEnabled(false); + EditText textDelay = (EditText)findViewById(R.id.debounce_delay); + textDelay.setEnabled(false); + + EditText textSettle = (EditText)findViewById(R.id.settle_time); + textSettle.setEnabled(false); + + 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); Button load = (Button)findViewById(R.id.load); load.setEnabled(false); @@ -94,6 +218,12 @@ 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); + + CheckBox drive_inactive = (CheckBox)findViewById(R.id.drive_inactive); + drive_inactive.setEnabled(false); } public void loadModule(View view) { @@ -112,14 +242,12 @@ public class MS2Debounce extends Activity updateUI(); } - public void reloadModule(View view) { + public void setValues(View view) { disableUI(); - if (module.isLoaded()) { - module.unloadModule(); - } if (!module.isLoaded()) { module.loadModule(); } + module.setAllValues(); updateUI(); } @@ -129,6 +257,18 @@ 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()); + } + + public void toggle_drive_inactive(View view) { + CheckBox drive_inactive = (CheckBox)view; + + module.setSavedDriveInactive(drive_inactive.isChecked()); + } + @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater();