Adds reboot call to control interface

mooshim · Jun 28, 2016 · ac4ceb7 · ac4ceb7
1 parent 56b1c0c
commit ac4ceb7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/app/src/main/java/com/mooshim/mooshimeter/activities/PreferencesActivity.java b/app/src/main/java/com/mooshim/mooshimeter/activities/PreferencesActivity.java
@@ -180,6 +180,15 @@ public void run() {
         // Extra preferences
         builder.add("Autoconnect","Automatically connect to this meter when detected",makeSwitchForMeterPreference(MooshimeterDevice.mPreferenceKeys.AUTOCONNECT));
         builder.add("Skip upgrade","Suppress offering firmware upgrade",makeSwitchForMeterPreference(MooshimeterDevice.mPreferenceKeys.SKIP_UPGRADE));
+        // Shipping mode
+        builder.add("Reboot now",
+                    "Reboots the meter and drops back to scanning screen.",
+                    makeButton("Set", new Runnable() {
+                        @Override
+                        public void run() {
+                            mMeter.reboot();
+                        }
+                    }));
 	}
 
 	@Override

diff --git a/app/src/main/java/com/mooshim/mooshimeter/devices/LegacyMooshimeterDevice.java b/app/src/main/java/com/mooshim/mooshimeter/devices/LegacyMooshimeterDevice.java
@@ -1234,6 +1234,11 @@ public void stream() {
         meter_settings.send();
     }
 
+    @Override
+    public void reboot() {
+        meter_settings.target_meter_state = METER_SHUTDOWN;
+        meter_settings.send();
+    }
     @Override
     public void enterShippingMode() {
         meter_settings.target_meter_state = METER_HIBERNATE;

diff --git a/app/src/main/java/com/mooshim/mooshimeter/devices/MooshimeterDevice.java b/app/src/main/java/com/mooshim/mooshimeter/devices/MooshimeterDevice.java
@@ -37,12 +37,7 @@ private mUUID() {}
         public final static UUID
             METER_SERVICE       = fromString("1BC5FFA0-0200-62AB-E411-F254E005DBD4"),
             METER_SERIN         = fromString("1BC5FFA1-0200-62AB-E411-F254E005DBD4"),
-            METER_SEROUT        = fromString("1BC5FFA2-0200-62AB-E411-F254E005DBD4"),
-
-            OAD_SERVICE_UUID    = fromString("1BC5FFC0-0200-62AB-E411-F254E005DBD4"),
-            OAD_IMAGE_IDENTIFY  = fromString("1BC5FFC1-0200-62AB-E411-F254E005DBD4"),
-            OAD_IMAGE_BLOCK     = fromString("1BC5FFC2-0200-62AB-E411-F254E005DBD4"),
-            OAD_REBOOT          = fromString("1BC5FFC3-0200-62AB-E411-F254E005DBD4");
+            METER_SEROUT        = fromString("1BC5FFA2-0200-62AB-E411-F254E005DBD4");
     }
 
     ////////////////////////////////
@@ -567,6 +562,10 @@ public void stream() {
         tree.command("SAMPLING:TRIGGER 2");
     }
     @Override
+    public void reboot() {
+        tree.command("REBOOT 0");
+    }
+    @Override
     public void enterShippingMode() {
         tree.command("REBOOT 1");
     }

diff --git a/app/src/main/java/com/mooshim/mooshimeter/interfaces/MooshimeterControlInterface.java b/app/src/main/java/com/mooshim/mooshimeter/interfaces/MooshimeterControlInterface.java
@@ -44,6 +44,7 @@ enum Channel {
     void oneShot();
     void stream();
 
+    public void reboot();
     void enterShippingMode();
 
     int getPCBVersion();