btadv: use `ble_advert` module

apps/btadv/ChangeLog

@@ -1,3 +1,4 @@
 0.01: New app!
 0.02: Advertise accelerometer data and sensor location
 0.03: Use the bleAdvert module
+0.04: Actually use the ble_advert module

apps/btadv/app.js

@@ -1,4 +1,3 @@
-var _a;
 {
     var __assign = Object.assign;
     var Layout_1 = require("Layout");
@@ -441,8 +440,6 @@ var _a;
         NRF.setServices(ad, {
             uart: false,
         });
-        var bangle2 = Bangle;
-        var cycle = Array.isArray(bangle2.bleAdvert) ? bangle2.bleAdvert : [];
         for (var id in ad) {
             var serv = ad[id];
             var value = void 0;
@@ -450,11 +447,7 @@ var _a;
                 value = serv[ch].value;
                 break;
             }
-            cycle.push((_a = {}, _a[id] = value || [], _a));
+            require("ble_advert").set(id, value || []);
         }
-        bangle2.bleAdvert = cycle;
-        NRF.setAdvertising(cycle, {
-            interval: 100,
-        });
     }
 }

apps/btadv/app.ts

@@ -767,16 +767,6 @@ enableSensors();
     },
   );
 
-  type BleAdvert = { [key: string]: number[] };
-  const bangle2 = Bangle as {
-    bleAdvert?: BleAdvert | BleAdvert[];
-  };
-  const cycle = Array.isArray(bangle2.bleAdvert)
-    ? bangle2.bleAdvert
-    : bangle2.bleAdvert
-    ? [bangle2.bleAdvert]
-    : [];
-
   for(const id in ad){
     const serv = ad[id as BleServ];
     let value;
@@ -787,16 +777,7 @@ enableSensors();
       break;
     }
 
-    cycle.push({ [id]: value || [] });
+    require("ble_advert").set(id, value || []);
   }
-
-  bangle2.bleAdvert = cycle;
-
-  NRF.setAdvertising(
-    cycle,
-    {
-      interval: 100,
-    }
-  );
 }
 }

apps/btadv/metadata.json

@@ -2,7 +2,7 @@
   "id": "btadv",
   "name": "btadv",
   "shortName": "btadv",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Advertise & export live heart rate, accel, pressure, GPS & mag data over bluetooth",
   "icon": "icon.png",
   "tags": "health,tool,sensors,bluetooth",