Merge pull request #4172 from kidneyhex/accelsender-stopOnDc

accelsender: add stop on disconnect option; fix saving config

Author: bobrippling

apps/accelsender/ChangeLog

@@ -1,2 +1,3 @@
 0.01: Initial release.
 0.02: Add widget, settings, and in-memory config.
+0.03: Add stop on disconnect option; fix saving config.

apps/accelsender/README.md

@@ -11,9 +11,14 @@ Currently this app is used to enable Sleep as Android tracking for your Banglejs
 
 [Gadgetbridge - Sleep as Android integration](https://gadgetbridge.org/basics/integrations/sleep-as-android/)
 
-## Widget
-
-Enable the widget in the app settings to show when `accelsender` is active. Because sleep tracking is the primary use, the widget shows a bed icon in the top-right.
+## Settings
+
+- **Enabled**: Turns acceleration reporting on or off.
+- **Interval**: How often the app sends the latest acceleration data to the phone. Shorter intervals use more power.
+- **Widget**:
+  - None: No widget is shown.
+  - Sleep Icon: A bed icon appears in the top-right while `accelsender` is enabled.
+- **Stop on Disconnect**: If Bluetooth disconnects, automatically disables `accelsender` so it does not keep running in the background.
 
 ## Troubleshooting
 

apps/accelsender/boot.js

@@ -17,7 +17,12 @@ setTimeout( // make other boot code run first, so we can override android.boot.j
     var max_acceleration = { x: 0, y: 0, z: 0, diff: 0, td: 0, mag: 0 };
     var hasData = false;
     var intervalId;
-    var config = storage.readJSON("accelsender.json", 1) || {};
+    var config = Object.assign({
+        enabled: false,
+        interval: 5000,
+        widget: 0,
+        stopOnDc: true
+    }, storage.readJSON("accelsender.json", 1) || {});
     var configChanged = false;
 
     /**
@@ -70,9 +75,11 @@ setTimeout( // make other boot code run first, so we can override android.boot.j
         setEnabled: (v) => setConfig("enabled", v),
         setWidget: (v) => setConfig("widget", v),
         setInterval: (v) => setConfig("interval", v),
+        setStopOnDc: (v) => setConfig("stopOnDc", v),
         isEnabled: () => config.enabled,
-        getInterval: () => config.interval || 5000,
-        getWidget: () => config.widget || 0
+        getInterval: () => config.interval,
+        getWidget: () => config.widget,
+        getStopOnDc: () => config.stopOnDc
     };
 
     // Wrap the GB handler to listen for messages from gadgetbridge
@@ -99,8 +106,13 @@ setTimeout( // make other boot code run first, so we can override android.boot.j
         Bangle.removeListener("accel", updateAcceleration);
     }
 
+    // On Bluetooth disconnect, disable if config says to
+    NRF.on('disconnect', () => {
+        if (config.enabled && config.stopOnDc) setConfig('enabled', false);
+    });
+
     // On kill, save config if changed
-    Bangle.on("kill", () => {
+    E.on("kill", () => {
         if (configChanged) storage.writeJSON("accelsender.json", config);
     });
 

apps/accelsender/boot.min.js

@@ -1,5 +1,6 @@
 {
   "enabled": false,
   "interval": 5000,
-  "widget": 0
+  "widget": 0,
+  "stopOnDc": true
 }

apps/accelsender/config.json

@@ -2,7 +2,7 @@
   "id": "accelsender",
   "name": "Acceleration Data Provider",
   "shortName": "Accel Data Provider",
-  "version": "0.02",
+  "version": "0.03",
   "description": "This app sends accelerometer and heart rate data from your Bangle.js via Bluetooth.",
   "icon": "bluetooth.png",
   "type": "bootloader",

apps/accelsender/metadata.json

@@ -9,7 +9,8 @@
   let s = {
     enabled: globalThis.accelSender.isEnabled(),
     interval: globalThis.accelSender.getInterval(),
-    widget: globalThis.accelSender.getWidget()
+    widget: globalThis.accelSender.getWidget(),
+    stopOnDc: globalThis.accelSender.getStopOnDc()
   };
 
   function save(key, value) {
@@ -25,6 +26,9 @@
       case "enabled":
         globalThis.accelSender.setEnabled(value);
         break;
+      case "stopOnDc":
+        globalThis.accelSender.setStopOnDc(value);
+        break;
     }
   }
 
@@ -48,6 +52,10 @@
       min: 1, max: 10, step: 1,
       onchange: (v) => save("interval", v * 1000)
     },
+    "Stop on Disconnect": {
+      value: s.stopOnDc,
+      onchange: (v) => save("stopOnDc", v)
+    }
   };
   E.showMenu(menu);
 })