@hangtime/grip-connect 0.0.9 → 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.9",
+  "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/connect.js

@@ -1,5 +1,6 @@
 import { notifyCallback } from "./notify";
 import { handleMotherboardData } from "./devices/moterboard";
+import { handleEntralpiData } from "./devices/entralpi";
 let server;
 const receiveBuffer = [];
 /**
@@ -22,27 +23,22 @@ const handleNotifications = (event, board) => {
     const value = characteristic.value;
     if (value) {
         if (board.name === "Motherboard") {
-            if (value) {
-                for (let i = 0; i < value.byteLength; i++) {
-                    receiveBuffer.push(value.getUint8(i));
-                }
-                let idx;
-                while ((idx = receiveBuffer.indexOf(10)) >= 0) {
-                    const line = receiveBuffer.splice(0, idx + 1).slice(0, -1); // Combine and remove LF
-                    if (line.length > 0 && line[line.length - 1] === 13)
-                        line.pop(); // Remove CR
-                    const decoder = new TextDecoder("utf-8");
-                    const receivedString = decoder.decode(new Uint8Array(line));
-                    handleMotherboardData(characteristic.uuid, receivedString);
-                }
+            for (let i = 0; i < value.byteLength; i++) {
+                receiveBuffer.push(value.getUint8(i));
+            }
+            let idx;
+            while ((idx = receiveBuffer.indexOf(10)) >= 0) {
+                const line = receiveBuffer.splice(0, idx + 1).slice(0, -1); // Combine and remove LF
+                if (line.length > 0 && line[line.length - 1] === 13)
+                    line.pop(); // Remove CR
+                const decoder = new TextDecoder("utf-8");
+                const receivedData = decoder.decode(new Uint8Array(line));
+                handleMotherboardData(characteristic.uuid, receivedData);
             }
         }
         else if (board.name === "ENTRALPI") {
-            // TODO: handle Entralpi notify
-            // characteristic.value!.getInt16(0) / 100;
-            if (notifyCallback) {
-                notifyCallback({ uuid: characteristic.uuid, value: value });
-            }
+            const receivedData = value.getInt16(0) / 100;
+            handleEntralpiData(characteristic.uuid, receivedData);
         }
         else if (board.name === "Tindeq") {
             // TODO: handle Tindeq notify

package/src/connect.ts

@@ -1,6 +1,7 @@
 import { Device } from "./devices/types"
 import { notifyCallback } from "./notify"
 import { handleMotherboardData } from "./devices/moterboard"
+import { handleEntralpiData } from "./devices/entralpi"
 
 let server: BluetoothRemoteGATTServer
 const receiveBuffer: number[] = []
@@ -25,26 +26,21 @@ const handleNotifications = (event: Event, board: Device): void => {
   const value = characteristic.value
   if (value) {
     if (board.name === "Motherboard") {
-      if (value) {
-        for (let i = 0; i < value.byteLength; i++) {
-          receiveBuffer.push(value.getUint8(i))
-        }
+      for (let i = 0; i < value.byteLength; i++) {
+        receiveBuffer.push(value.getUint8(i))
+      }
 
-        let idx: number
-        while ((idx = receiveBuffer.indexOf(10)) >= 0) {
-          const line = receiveBuffer.splice(0, idx + 1).slice(0, -1) // Combine and remove LF
-          if (line.length > 0 && line[line.length - 1] === 13) line.pop() // Remove CR
-          const decoder = new TextDecoder("utf-8")
-          const receivedString = decoder.decode(new Uint8Array(line))
-          handleMotherboardData(characteristic.uuid, receivedString)
-        }
+      let idx: number
+      while ((idx = receiveBuffer.indexOf(10)) >= 0) {
+        const line = receiveBuffer.splice(0, idx + 1).slice(0, -1) // Combine and remove LF
+        if (line.length > 0 && line[line.length - 1] === 13) line.pop() // Remove CR
+        const decoder = new TextDecoder("utf-8")
+        const receivedData = decoder.decode(new Uint8Array(line))
+        handleMotherboardData(characteristic.uuid, receivedData)
       }
     } else if (board.name === "ENTRALPI") {
-      // TODO: handle Entralpi notify
-      // characteristic.value!.getInt16(0) / 100;
-      if (notifyCallback) {
-        notifyCallback({ uuid: characteristic.uuid, value: value })
-      }
+      const receivedData: number = value.getInt16(0) / 100
+      handleEntralpiData(characteristic.uuid, receivedData)
     } else if (board.name === "Tindeq") {
       // TODO: handle Tindeq notify
     } else {

package/src/devices/entralpi.d.ts

@@ -1,2 +1,8 @@
 import { Device } from "./types";
 export declare const Entralpi: Device;
+/**
+ * handleEntralpiData
+ * @param uuid - Unique identifier
+ * @param receivedData - Received data string
+ */
+export declare function handleEntralpiData(uuid: string, receivedData: number): void;

package/src/devices/entralpi.js

@@ -1,3 +1,4 @@
+import { notifyCallback } from "../notify";
 export const Entralpi = {
     name: "ENTRALPI",
     services: [
@@ -50,3 +51,18 @@ export const Entralpi = {
         },
     ],
 };
+/**
+ * handleEntralpiData
+ * @param uuid - Unique identifier
+ * @param receivedData - Received data string
+ */
+export function handleEntralpiData(uuid, receivedData) {
+    if (notifyCallback) {
+        notifyCallback({
+            uuid,
+            value: {
+                massTotal: receivedData,
+            },
+        });
+    }
+}

package/src/devices/entralpi.ts

@@ -1,4 +1,5 @@
 import { Device } from "./types"
+import { notifyCallback } from "../notify"
 
 export const Entralpi: Device = {
   name: "ENTRALPI",
@@ -52,3 +53,19 @@ export const Entralpi: Device = {
     },
   ],
 }
+
+/**
+ * handleEntralpiData
+ * @param uuid - Unique identifier
+ * @param receivedData - Received data string
+ */
+export function handleEntralpiData(uuid: string, receivedData: number): void {
+  if (notifyCallback) {
+    notifyCallback({
+      uuid,
+      value: {
+        massTotal: receivedData,
+      },
+    })
+  }
+}

package/src/devices/moterboard.d.ts

@@ -3,6 +3,6 @@ export declare const Motherboard: Device;
 /**
  * handleMotherboardData
  * @param uuid - Unique identifier
- * @param receivedString - Received data string
+ * @param receivedData - Received data string
  */
-export declare function handleMotherboardData(uuid: string, receivedString: string): void;
+export declare function handleMotherboardData(uuid: string, receivedData: string): void;

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++) {
@@ -110,7 +110,8 @@ const applyCalibration = (sample, calibration) => {
             // Interpolate to get the calibrated value within the range
             final =
                 calibration[i - 1][1] +
-                    ((sample - calibrationStart) / (calibrationEnd - calibrationStart)) * (calibration[i][1] - calibration[i - 1][1]);
+                    ((sample - calibrationStart) / (calibrationEnd - calibrationStart)) *
+                        (calibration[i][1] - calibration[i - 1][1]);
             break;
         }
     }
@@ -120,16 +121,16 @@ const applyCalibration = (sample, calibration) => {
 /**
  * handleMotherboardData
  * @param uuid - Unique identifier
- * @param receivedString - Received data string
+ * @param receivedData - Received data string
  */
-export function handleMotherboardData(uuid, receivedString) {
+export function handleMotherboardData(uuid, receivedData) {
     const receivedTime = Date.now();
     // Check if the line is entirely hex characters
-    const isAllHex = /^[0-9A-Fa-f]+$/g.test(receivedString);
+    const isAllHex = /^[0-9A-Fa-f]+$/g.test(receivedData);
     // Handle streaming packet
-    if (isAllHex && receivedString.length === PACKET_LENGTH) {
+    if (isAllHex && receivedData.length === PACKET_LENGTH) {
         // Base-16 decode the string: convert hex pairs to byte values
-        const bytes = Array.from({ length: receivedString.length / 2 }, (_, i) => Number(`0x${receivedString.substring(i * 2, i * 2 + 2)}`));
+        const bytes = Array.from({ length: receivedData.length / 2 }, (_, i) => Number(`0x${receivedData.substring(i * 2, i * 2 + 2)}`));
         // Translate header into packet, number of samples from the packet length
         const packet = {
             received: receivedTime,
@@ -155,28 +156,34 @@ export function handleMotherboardData(uuid, receivedString) {
                 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 ((receivedString.match(/,/g) || []).length === 3) {
-        console.log(receivedString);
+    else if ((receivedData.match(/,/g) || []).length === 3) {
+        console.log(receivedData);
         // if the returned notification is a calibration string add them to the array
-        const parts = receivedString.split(",");
+        const parts = receivedData.split(",");
         const numericParts = parts.map((x) => parseFloat(x));
         CALIBRATION[numericParts[0]].push(numericParts.slice(1));
     }
     else {
         // unhanded data
-        console.log(receivedString);
+        console.log(receivedData);
     }
 }

package/src/devices/moterboard.ts

@@ -91,40 +91,41 @@ export const Motherboard: Device = {
  */
 const applyCalibration = (sample: number, calibration: number[][]): number => {
   // Extract the calibrated value for the zero point
-  const zeroCalibration: number = calibration[0][2];
+  const zeroCalibration: number = calibration[0][2]
 
   // Initialize sign as positive
-  let sign: number = 1;
+  let sign: number = 1
 
   // Initialize the final calibrated value
-  let final: number = 0;
+  let final: number = 0
 
   // If the sample value is less than the zero calibration point
   if (sample < zeroCalibration) {
     // Change the sign to negative
-    sign = -1;
+    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++) {
     // Extract the lower and upper bounds of the current calibration range
-    const calibrationStart: number = calibration[i - 1][2];
-    const calibrationEnd: number = calibration[i][2];
+    const calibrationStart: number = calibration[i - 1][2]
+    const calibrationEnd: number = calibration[i][2]
 
     // If the sample value is within the current calibration range
     if (sample < calibrationEnd) {
       // Interpolate to get the calibrated value within the range
       final =
         calibration[i - 1][1] +
-        ((sample - calibrationStart) / (calibrationEnd - calibrationStart)) * (calibration[i][1] - calibration[i - 1][1]);
-      break;
+        ((sample - calibrationStart) / (calibrationEnd - calibrationStart)) *
+          (calibration[i][1] - calibration[i - 1][1])
+      break
     }
   }
   // Return the calibrated value with the appropriate sign (positive/negative)
-  return sign * final;
+  return sign * final
 }
 
 interface Packet {
@@ -138,19 +139,19 @@ interface Packet {
 /**
  * handleMotherboardData
  * @param uuid - Unique identifier
- * @param receivedString - Received data string
+ * @param receivedData - Received data string
  */
-export function handleMotherboardData(uuid: string, receivedString: string): void {
+export function handleMotherboardData(uuid: string, receivedData: string): void {
   const receivedTime: number = Date.now()
 
   // Check if the line is entirely hex characters
-  const isAllHex: boolean = /^[0-9A-Fa-f]+$/g.test(receivedString);
+  const isAllHex: boolean = /^[0-9A-Fa-f]+$/g.test(receivedData)
 
   // Handle streaming packet
-  if (isAllHex && receivedString.length === PACKET_LENGTH) {
+  if (isAllHex && receivedData.length === PACKET_LENGTH) {
     // Base-16 decode the string: convert hex pairs to byte values
-    const bytes: number[] = Array.from({ length: receivedString.length / 2 }, (_, i) =>
-      Number(`0x${receivedString.substring(i * 2, i * 2 + 2)}`),
+    const bytes: number[] = Array.from({ length: receivedData.length / 2 }, (_, i) =>
+      Number(`0x${receivedData.substring(i * 2, i * 2 + 2)}`),
     )
 
     // Translate header into packet, number of samples from the packet length
@@ -162,50 +163,53 @@ export function handleMotherboardData(uuid: string, receivedString: string): voi
       masses: [],
     }
 
-    const dataView = new DataView(new Uint8Array(bytes).buffer);
+    const dataView = new DataView(new Uint8Array(bytes).buffer)
 
     for (let i = 0; i < NUM_SAMPLES; i++) {
       const sampleStart: number = 4 + 3 * i
       // Use DataView to read the 24-bit unsigned integer
-      const rawValue = dataView.getUint8(sampleStart) |
+      const rawValue =
+        dataView.getUint8(sampleStart) |
         (dataView.getUint8(sampleStart + 1) << 8) |
-        (dataView.getUint8(sampleStart + 2) << 16);
+        (dataView.getUint8(sampleStart + 2) << 16)
 
       // Ensure unsigned 32-bit integer
-      packet.samples[i] = rawValue >>> 0;
+      packet.samples[i] = rawValue >>> 0
 
       if (packet.samples[i] >= 0x7fffff) {
-        packet.samples[i] -= 0x1000000;
+        packet.samples[i] -= 0x1000000
       }
 
       // TODO: make sure device is calibrated
       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),
-      },
-    })
-  } else if ((receivedString.match(/,/g) || []).length === 3) {
-    console.log(receivedString)
+    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
-    const parts: string[] = receivedString.split(",")
+    const parts: string[] = receivedData.split(",")
     const numericParts: number[] = parts.map((x) => parseFloat(x))
     ;(CALIBRATION[numericParts[0]] as number[][]).push(numericParts.slice(1))
   } else {
     // unhanded data
-    console.log(receivedString)
+    console.log(receivedData)
   }
 }
-
-