From 75c4e5b54b54181c054bbb2a68603435f02761cf Mon Sep 17 00:00:00 2001
From: Salim Blume <sblume@gmail.com>
Date: Mon, 4 Apr 2022 16:48:15 -0500
Subject: [PATCH] bthrm fixes for reading characteristics generally and
 displaying location

---
 apps/bthrm/boot.js            | 17 +++++++++--------
 apps/bthrm/bthrm.js           | 13 +++++++++++--
 typescript/types/globals.d.ts |  6 +++---
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/apps/bthrm/boot.js b/apps/bthrm/boot.js
index 227f78c1a..dd25634e5 100644
--- a/apps/bthrm/boot.js
+++ b/apps/bthrm/boot.js
@@ -168,14 +168,14 @@
         //Body sensor location
         handler: function(data){
           if (!lastReceivedData["0x180d"]) lastReceivedData["0x180d"] = {};
-          if (!lastReceivedData["0x180d"]["0x2a38"]) lastReceivedData["0x180d"]["0x2a38"] = data.target.value;
+          lastReceivedData["0x180d"]["0x2a38"] = parseInt(data.buffer, 10);
         }
       },
       "0x2a19": {
         //Battery
         handler: function (event){
-          if (!lastReceivedData["0x180f"]) lastReceivedData["0x180f"] = {};
-          if (!lastReceivedData["0x180f"]["0x2a19"]) lastReceivedData["0x180f"]["0x2a19"] = event.target.value.getUint8(0);
+          if (!lastReceivedData["0x180f"]) lastReceivedData["0x180f"] = { "0x2a19": null };
+          lastReceivedData["0x180f"]["0x2a19"] = event.target.value.getUint8(0);
         }
       }
 
@@ -295,12 +295,13 @@
           }
           return startPromise;
         });
-      } else if (newCharacteristic.read){
+      } else if (newCharacteristic.readValue){
         result = result.then(()=>{
-          // readData(newCharacteristic);
-          log("Reading data for " + newCharacteristic);
-          return newCharacteristic.read().then((data)=>{
-            supportedCharacteristics[newCharacteristic.uuid].handler(data);
+          log("Reading data for " + JSON.stringify(newCharacteristic));
+          return newCharacteristic.readValue().then((data)=>{
+            if (supportedCharacteristics[newCharacteristic.uuid] && supportedCharacteristics[newCharacteristic.uuid].handler) {
+              supportedCharacteristics[newCharacteristic.uuid].handler(data);
+            }
           });
         });
       }
diff --git a/apps/bthrm/bthrm.js b/apps/bthrm/bthrm.js
index cc533eedd..5ab3b0018 100644
--- a/apps/bthrm/bthrm.js
+++ b/apps/bthrm/bthrm.js
@@ -1,7 +1,16 @@
-var btm = g.getHeight()-1;
 var intervalInt;
 var intervalBt;
 
+var BODY_LOCS = {
+  0: 'Other',
+  1: 'Chest',
+  2: 'Wrist',
+  3: 'Finger',
+  4: 'Hand',
+  5: 'Ear Lobe',
+  6: 'Foot',
+}
+
 function clear(y){
   g.reset();
   g.clearRect(0,y,g.getWidth(),y+75);
@@ -25,7 +34,7 @@ function draw(y, type, event) {
     if (event.battery) str += " Bat: " + (event.battery ? event.battery : "");
     g.setFontVector(12).drawString(str,px,y+40);
     str= "";
-    if (event.location) str += "Loc: " + event.location.toFixed(0) + "ms";
+    if (event.location) str += "Loc: " + BODY_LOCS[event.location];
     if (event.rr && event.rr.length > 0) str += " RR: " + event.rr.join(",");
     g.setFontVector(12).drawString(str,px,y+50);
     str= "";
diff --git a/typescript/types/globals.d.ts b/typescript/types/globals.d.ts
index 2ef52dcdf..442140e70 100644
--- a/typescript/types/globals.d.ts
+++ b/typescript/types/globals.d.ts
@@ -158,9 +158,9 @@ declare type Image = {
 };
 
 declare type GraphicsApi = {
-  reset: () => void;
+  reset: () => GraphicsApi;
   flip: () => void;
-  setColor: (color: string) => void; // TODO we can most likely type color more usefully than this
+  setColor: (color: string) => GraphicsApi; // TODO we can most likely type color more usefully than this
   drawImage: (
     image: string | Image | ArrayBuffer,
     xOffset: number,
@@ -169,7 +169,7 @@ declare type GraphicsApi = {
       rotate?: number;
       scale?: number;
     }
-  ) => void;
+  ) => GraphicsApi;
   // TODO add more
 };