@hangtime/grip-connect 0.0.10 → 0.0.11

package/README.md

@@ -75,16 +75,16 @@ motherboardButton.addEventListener("click", () => {
     })
 
     // read battery + device info
-    await read(Motherboard, "battery", "level", 1000)
-    await read(Motherboard, "device", "manufacturer", 1000)
-    await read(Motherboard, "device", "hardware", 1000)
-    await read(Motherboard, "device", "firmware", 1000)
+    await read(Motherboard, "battery", "level", 250)
+    await read(Motherboard, "device", "manufacturer", 250)
+    await read(Motherboard, "device", "hardware", 250)
+    await read(Motherboard, "device", "firmware", 250)
 
     // read calibration (required before reading data)
-    await write(Motherboard, "uart", "tx", "C", 5000)
+    await write(Motherboard, "uart", "tx", "C", 2500)
 
-    // start stream
-    await write(Motherboard, "uart", "tx", "S30", 15000)
+    // start streaming for a minute
+    await write(Motherboard, "uart", "tx", "S30", 60000)
 
     // end stream
     await write(Motherboard, "uart", "tx", "", 0)
@@ -100,6 +100,7 @@ A special thank you to:
 
 - [@CassimLadha](https://github.com/CassimLadha) for sharing insights on reading the Motherboards data.
 - [@donaldharvey](https://github.com/donaldharvey) for a valuable example on connecting to the motherboard.
+- [@ecstrema](https://github.com/ecstrema) for providing an example on how to play games with the entralpi.
 
 ## Disclamer
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hangtime/grip-connect",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "A client that can establish connections with various Force-Sensing Hangboards/Plates used by climbers for strength measurement. Examples of such hangboards include the Motherboard, Climbro, SmartBoard, Entralpi or Tindeq Progressor",
   "main": "src/index.ts",
   "scripts": {

package/src/devices/entralpi.js

@@ -57,10 +57,12 @@ export const Entralpi = {
  * @param receivedData - Received data string
  */
 export function handleEntralpiData(uuid, receivedData) {
-    notifyCallback({
-        uuid,
-        value: {
-            massTotal: receivedData,
-        },
-    });
+    if (notifyCallback) {
+        notifyCallback({
+            uuid,
+            value: {
+                massTotal: receivedData,
+            },
+        });
+    }
 }

package/src/devices/entralpi.ts

@@ -60,10 +60,12 @@ export const Entralpi: Device = {
  * @param receivedData - Received data string
  */
 export function handleEntralpiData(uuid: string, receivedData: number): void {
-  notifyCallback({
-    uuid,
-    value: {
-      massTotal: receivedData,
-    },
-  })
+  if (notifyCallback) {
+    notifyCallback({
+      uuid,
+      value: {
+        massTotal: receivedData,
+      },
+    })
+  }
 }

package/src/devices/moterboard.js

@@ -98,7 +98,7 @@ const applyCalibration = (sample, calibration) => {
         // Change the sign to negative
         sign = -1;
         // Reflect the sample around the zero calibration point
-        sample = 2 * zeroCalibration - sample;
+        sample = /* 2 * zeroCalibration */ -sample;
     }
     // Iterate through the calibration data
     for (let i = 1; i < calibration.length; i++) {
@@ -156,18 +156,24 @@ export function handleMotherboardData(uuid, receivedData) {
                 return;
             packet.masses[i] = applyCalibration(packet.samples[i], CALIBRATION[i]);
         }
+        // invert center and right values
+        packet.masses[1] *= -1;
+        packet.masses[2] *= -1;
+        // map to variables
         const left = packet.masses[0];
         const center = packet.masses[1];
         const right = packet.masses[2];
-        notifyCallback({
-            uuid,
-            value: {
-                massTotal: Math.max(-1000, left + right + center).toFixed(3),
-                massLeft: Math.max(-1000, left).toFixed(3),
-                massRight: Math.max(-1000, right).toFixed(3),
-                massCenter: Math.max(-1000, center).toFixed(3),
-            },
-        });
+        if (notifyCallback) {
+            notifyCallback({
+                uuid,
+                value: {
+                    massTotal: Math.max(-1000, left + right + center).toFixed(1),
+                    massLeft: Math.max(-1000, left).toFixed(1),
+                    massRight: Math.max(-1000, right).toFixed(1),
+                    massCenter: Math.max(-1000, center).toFixed(1),
+                },
+            });
+        }
     }
     else if ((receivedData.match(/,/g) || []).length === 3) {
         console.log(receivedData);

package/src/devices/moterboard.ts

@@ -105,7 +105,7 @@ const applyCalibration = (sample: number, calibration: number[][]): number => {
     sign = -1
 
     // Reflect the sample around the zero calibration point
-    sample = 2 * zeroCalibration - sample
+    sample = /* 2 * zeroCalibration */ -sample
   }
 
   // Iterate through the calibration data
@@ -184,20 +184,24 @@ export function handleMotherboardData(uuid: string, receivedData: string): void
       if (!CALIBRATION[0].length) return
       packet.masses[i] = applyCalibration(packet.samples[i], CALIBRATION[i])
     }
-
+    // invert center and right values
+    packet.masses[1] *= -1;
+    packet.masses[2] *= -1;
+    // map to variables
     const left: number = packet.masses[0]
     const center: number = packet.masses[1]
     const right: number = packet.masses[2]
-
-    notifyCallback({
-      uuid,
-      value: {
-        massTotal: Math.max(-1000, left + right + center).toFixed(3),
-        massLeft: Math.max(-1000, left).toFixed(3),
-        massRight: Math.max(-1000, right).toFixed(3),
-        massCenter: Math.max(-1000, center).toFixed(3),
-      },
-    })
+    if (notifyCallback) {
+      notifyCallback({
+        uuid,
+        value: {
+          massTotal: Math.max(-1000, left + right + center).toFixed(1),
+          massLeft: Math.max(-1000, left).toFixed(1),
+          massRight: Math.max(-1000, right).toFixed(1),
+          massCenter: Math.max(-1000, center).toFixed(1),
+        },
+      })
+    }
   } else if ((receivedData.match(/,/g) || []).length === 3) {
     console.log(receivedData)
     // if the returned notification is a calibration string add them to the array