completely rewritten action functions

now they automatically select the method based on protocol version
Wheellog · Jul 27, 2021 · 93ca9f6 · 93ca9f6
1 parent 8edb388
commit 93ca9f6
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/util/Actions.mc b/src/util/Actions.mc
@@ -8,23 +8,23 @@ module Actions {
         :responseType => Communications.HTTP_RESPONSE_CONTENT_TYPE_JSON,
     };
 
-    function triggerHorn(method) {
-        switch (method) {
-            case :ble: Communications.transmit("triggerHorn", null, new ActionConnectionListener()); break;
-            case :web: Communications.makeWebRequest("http://127.0.0.1:" + WheelData.webServerPort + "/actions/triggerHorn", null, options, null); break;
+    function triggerHorn() {
+        if (AppStorage.runtimeDb["comm_protocolVersion"] >= 3) {
+            Communications.transmit("triggerHorn", null, new ActionConnectionListener());
+        } else {
+            Communications.makeWebRequest("http://127.0.0.1:" + WheelData.webServerPort + "/actions/triggerHorn", null, options, null);
         }
+
         WatchUi.requestUpdate();
     }
 
-    function toggleFrontLight(method) {
-        switch (method) {
-            case :ble: Communications.transmit("toggleFrontLight", null, new ActionConnectionListener()); break;
-            case :web: {
-                WheelData.areLightsOn = !WheelData.areLightsOn;
-                Communications.makeWebRequest("http://127.0.0.1:" + WheelData.webServerPort + "/actions/toggleFrontLight", null, options, null);
-                break;
-            }
+    function toggleFrontLight() {
+        if (AppStorage.runtimeDb["comm_protocolVersion"] >= 3) {
+            Communications.transmit("toggleFrontLight", null, new ActionConnectionListener())
+        } else {
+            Communications.makeWebRequest("http://127.0.0.1:" + WheelData.webServerPort + "/actions/toggleFrontLight", null, options, null);
         }
+
         WatchUi.requestUpdate();
     }
 }