@hangtime/grip-connect 0.0.8 → 0.0.10

package/README.md

@@ -13,7 +13,7 @@ Force-Sensing Hangboards / Plates used by climbers for strength measurement. Exa
 
 ## Roadmap
 
-- ✅ Griptonte Motherboard
+- ✅ Griptonite Motherboard
   - ✅️ Connect with devices
   - ✅️ Read / Write / Notify using Bluetooth
   - ➡️ Calibrate Devices
@@ -80,15 +80,11 @@ motherboardButton.addEventListener("click", () => {
     await read(Motherboard, "device", "hardware", 1000)
     await read(Motherboard, "device", "firmware", 1000)
 
-    // recalibrate
-    await write(Motherboard, "uart", "tx", "", 0)
-    await write(Motherboard, "uart", "tx", "", 0)
-    await write(Motherboard, "uart", "tx", "", 1000)
-
-    await write(Motherboard, "uart", "tx", "C3,0,0,0", 5000)
+    // read calibration (required before reading data)
+    await write(Motherboard, "uart", "tx", "C", 5000)
 
     // start stream
-    await write(Motherboard, "uart", "tx", "S20", 15000)
+    await write(Motherboard, "uart", "tx", "S30", 15000)
 
     // end stream
     await write(Motherboard, "uart", "tx", "", 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hangtime/grip-connect",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "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,16 @@ export const Entralpi = {
         },
     ],
 };
+/**
+ * handleEntralpiData
+ * @param uuid - Unique identifier
+ * @param receivedData - Received data string
+ */
+export function handleEntralpiData(uuid, receivedData) {
+    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,17 @@ export const Entralpi: Device = {
     },
   ],
 }
+
+/**
+ * handleEntralpiData
+ * @param uuid - Unique identifier
+ * @param receivedData - Received data string
+ */
+export function handleEntralpiData(uuid: string, receivedData: number): void {
+  notifyCallback({
+    uuid,
+    value: {
+      massTotal: receivedData,
+    },
+  })
+}

package/src/devices/moterboard.d.ts

@@ -2,6 +2,7 @@ import { Device } from "./types";
 export declare const Motherboard: Device;
 /**
  * handleMotherboardData
- * @param line
+ * @param uuid - Unique identifier
+ * @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

@@ -87,37 +87,50 @@ export const Motherboard = {
  * @param calibration
  */
 const applyCalibration = (sample, calibration) => {
-    const zeroCalib = calibration[0][2];
-    let sgn = 1;
+    // Extract the calibrated value for the zero point
+    const zeroCalibration = calibration[0][2];
+    // Initialize sign as positive
+    let sign = 1;
+    // Initialize the final calibrated value
     let final = 0;
-    if (sample < zeroCalib) {
-        sgn = -1;
-        sample = 2 * zeroCalib - sample;
+    // If the sample value is less than the zero calibration point
+    if (sample < zeroCalibration) {
+        // Change the sign to negative
+        sign = -1;
+        // Reflect the sample around the zero calibration point
+        sample = 2 * zeroCalibration - sample;
     }
+    // Iterate through the calibration data
     for (let i = 1; i < calibration.length; i++) {
-        const calibStart = calibration[i - 1][2];
-        const calibEnd = calibration[i][2];
-        if (sample < calibEnd) {
+        // Extract the lower and upper bounds of the current calibration range
+        const calibrationStart = calibration[i - 1][2];
+        const calibrationEnd = 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 - calibStart) / (calibEnd - calibStart)) * (calibration[i][1] - calibration[i - 1][1]);
+                    ((sample - calibrationStart) / (calibrationEnd - calibrationStart)) *
+                        (calibration[i][1] - calibration[i - 1][1]);
             break;
         }
     }
-    return sgn * final;
+    // Return the calibrated value with the appropriate sign (positive/negative)
+    return sign * final;
 };
 /**
  * handleMotherboardData
- * @param line
+ * @param uuid - Unique identifier
+ * @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 allHex = /^[0-9A-Fa-f]+$/g.test(receivedString);
-    // Decide if this is a streaming packet
-    if (allHex && receivedString.length === PACKET_LENGTH) {
+    const isAllHex = /^[0-9A-Fa-f]+$/g.test(receivedData);
+    // Handle streaming packet
+    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,
@@ -126,9 +139,15 @@ export function handleMotherboardData(uuid, receivedString) {
             samples: [],
             masses: [],
         };
+        const dataView = new DataView(new Uint8Array(bytes).buffer);
         for (let i = 0; i < NUM_SAMPLES; i++) {
             const sampleStart = 4 + 3 * i;
-            packet.samples[i] = bytes[sampleStart] | (bytes[sampleStart + 1] << 8) | (bytes[sampleStart + 2] << 16);
+            // Use DataView to read the 24-bit unsigned integer
+            const rawValue = dataView.getUint8(sampleStart) |
+                (dataView.getUint8(sampleStart + 1) << 8) |
+                (dataView.getUint8(sampleStart + 2) << 16);
+            // Ensure unsigned 32-bit integer
+            packet.samples[i] = rawValue >>> 0;
             if (packet.samples[i] >= 0x7fffff) {
                 packet.samples[i] -= 0x1000000;
             }
@@ -146,18 +165,19 @@ export function handleMotherboardData(uuid, receivedString) {
                 massTotal: Math.max(-1000, left + right + center).toFixed(3),
                 massLeft: Math.max(-1000, left).toFixed(3),
                 massRight: Math.max(-1000, right).toFixed(3),
-                massCentre: Math.max(-1000, center).toFixed(3),
+                massCenter: Math.max(-1000, center).toFixed(3),
             },
         });
     }
-    else if ((receivedString.match(/,/g) || []).length === 3) {
+    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

@@ -90,28 +90,42 @@ export const Motherboard: Device = {
  * @param calibration
  */
 const applyCalibration = (sample: number, calibration: number[][]): number => {
-  const zeroCalib: number = calibration[0][2]
-  let sgn: number = 1
+  // Extract the calibrated value for the zero point
+  const zeroCalibration: number = calibration[0][2]
+
+  // Initialize sign as positive
+  let sign: number = 1
+
+  // Initialize the final calibrated value
   let final: number = 0
 
-  if (sample < zeroCalib) {
-    sgn = -1
-    sample = 2 * zeroCalib - sample
+  // If the sample value is less than the zero calibration point
+  if (sample < zeroCalibration) {
+    // Change the sign to negative
+    sign = -1
+
+    // Reflect the sample around the zero calibration point
+    sample = 2 * zeroCalibration - sample
   }
 
+  // Iterate through the calibration data
   for (let i = 1; i < calibration.length; i++) {
-    const calibStart: number = calibration[i - 1][2]
-    const calibEnd: number = calibration[i][2]
+    // Extract the lower and upper bounds of the current calibration range
+    const calibrationStart: number = calibration[i - 1][2]
+    const calibrationEnd: number = calibration[i][2]
 
-    if (sample < calibEnd) {
+    // 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 - calibStart) / (calibEnd - calibStart)) * (calibration[i][1] - calibration[i - 1][1])
+        ((sample - calibrationStart) / (calibrationEnd - calibrationStart)) *
+          (calibration[i][1] - calibration[i - 1][1])
       break
     }
   }
-
-  return sgn * final
+  // Return the calibrated value with the appropriate sign (positive/negative)
+  return sign * final
 }
 
 interface Packet {
@@ -124,19 +138,20 @@ interface Packet {
 
 /**
  * handleMotherboardData
- * @param line
+ * @param uuid - Unique identifier
+ * @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 allHex: boolean = /^[0-9A-Fa-f]+$/g.test(receivedString)
+  const isAllHex: boolean = /^[0-9A-Fa-f]+$/g.test(receivedData)
 
-  // Decide if this is a streaming packet
-  if (allHex && receivedString.length === PACKET_LENGTH) {
+  // Handle streaming packet
+  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
@@ -148,9 +163,18 @@ export function handleMotherboardData(uuid: string, receivedString: string): voi
       masses: [],
     }
 
+    const dataView = new DataView(new Uint8Array(bytes).buffer)
+
     for (let i = 0; i < NUM_SAMPLES; i++) {
       const sampleStart: number = 4 + 3 * i
-      packet.samples[i] = bytes[sampleStart] | (bytes[sampleStart + 1] << 8) | (bytes[sampleStart + 2] << 16)
+      // Use DataView to read the 24-bit unsigned integer
+      const rawValue =
+        dataView.getUint8(sampleStart) |
+        (dataView.getUint8(sampleStart + 1) << 8) |
+        (dataView.getUint8(sampleStart + 2) << 16)
+
+      // Ensure unsigned 32-bit integer
+      packet.samples[i] = rawValue >>> 0
 
       if (packet.samples[i] >= 0x7fffff) {
         packet.samples[i] -= 0x1000000
@@ -158,7 +182,6 @@ export function handleMotherboardData(uuid: string, receivedString: string): voi
 
       // TODO: make sure device is calibrated
       if (!CALIBRATION[0].length) return
-
       packet.masses[i] = applyCalibration(packet.samples[i], CALIBRATION[i])
     }
 
@@ -172,16 +195,17 @@ export function handleMotherboardData(uuid: string, receivedString: string): voi
         massTotal: Math.max(-1000, left + right + center).toFixed(3),
         massLeft: Math.max(-1000, left).toFixed(3),
         massRight: Math.max(-1000, right).toFixed(3),
-        massCentre: Math.max(-1000, center).toFixed(3),
+        massCenter: Math.max(-1000, center).toFixed(3),
       },
     })
-  } else if ((receivedString.match(/,/g) || []).length === 3) {
+  } 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)
   }
 }

package/src/write.js

@@ -10,9 +10,8 @@ export const write = (board, serviceId, characteristicId, message, duration = 0)
             const encoder = new TextEncoder();
             const characteristic = getCharacteristic(board, serviceId, characteristicId);
             if (characteristic) {
-                const value = message + "\n";
                 characteristic
-                    .writeValue(encoder.encode(value))
+                    .writeValue(encoder.encode(message))
                     .then(() => {
                     setTimeout(() => {
                         resolve();

package/src/write.ts

@@ -19,9 +19,8 @@ export const write = (
       const characteristic = getCharacteristic(board, serviceId, characteristicId)
 
       if (characteristic) {
-        const value = message + "\n"
         characteristic
-          .writeValue(encoder.encode(value))
+          .writeValue(encoder.encode(message))
           .then(() => {
             setTimeout(() => {
               resolve()

package/tsconfig.json

@@ -3,7 +3,5 @@
   "include": ["src"],
   "compilerOptions": {
     "tsBuildInfoFile": "node_modules/.cache/.tsbuildinfo",
-    "types": ["web-bluetooth"],
-    "outDir": "./build",
   },
 }

package/build/characteristic.d.ts

@@ -1,9 +0,0 @@
-/// <reference types="web-bluetooth" />
-import { Device } from "./devices/types";
-/**
- * getCharacteristic
- * @param board
- * @param serviceId
- * @param characteristicId
- */
-export declare const getCharacteristic: (board: Device, serviceId: string, characteristicId: string) => BluetoothRemoteGATTCharacteristic | undefined;

package/build/characteristic.js

@@ -1,15 +0,0 @@
-/**
- * getCharacteristic
- * @param board
- * @param serviceId
- * @param characteristicId
- */
-export const getCharacteristic = (board, serviceId, characteristicId) => {
-    const boardService = board.services.find((service) => service.id === serviceId);
-    if (boardService) {
-        const boardCharacteristic = boardService.characteristics.find((characteristic) => characteristic.id === characteristicId);
-        if (boardCharacteristic) {
-            return boardCharacteristic.characteristic;
-        }
-    }
-};

package/build/connect.d.ts

@@ -1,7 +0,0 @@
-import { Device } from "./devices/types";
-/**
- * Connect to the BluetoothDevice
- * @param device
- * @param onSuccess
- */
-export declare const connect: (board: Device, onSuccess: () => void) => Promise<void>;

package/build/connect.js

@@ -1,150 +0,0 @@
-import { notifyCallback } from "./notify";
-import { handleMotherboardData } from "./devices/moterboard";
-let server;
-const receiveBuffer = [];
-/**
- * onDisconnected
- * @param board
- * @param event
- */
-const onDisconnected = (event, board) => {
-    board.device = undefined;
-    const device = event.target;
-    console.log(`Device ${device.name} is disconnected.`);
-};
-/**
- * handleNotifications
- * @param event
- * @param onNotify
- */
-const handleNotifications = (event, board) => {
-    const characteristic = event.target;
-    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);
-                }
-            }
-        }
-        else if (board.name === "ENTRALPI") {
-            // TODO: handle Entralpi notify
-            // characteristic.value!.getInt16(0) / 100;
-            if (notifyCallback) {
-                notifyCallback({ uuid: characteristic.uuid, value: value });
-            }
-        }
-        else if (board.name === "Tindeq") {
-            // TODO: handle Tindeq notify
-        }
-        else {
-            if (notifyCallback) {
-                notifyCallback({ uuid: characteristic.uuid, value: value });
-            }
-        }
-    }
-};
-/**
- * onConnected
- * @param event
- * @param board
- */
-const onConnected = async (board, onSuccess) => {
-    try {
-        const services = await server?.getPrimaryServices();
-        if (!services || services.length === 0) {
-            console.error("No services found");
-            return;
-        }
-        for (const service of services) {
-            const matchingService = board.services.find((boardService) => boardService.uuid === service.uuid);
-            if (matchingService) {
-                // Android bug: Introduce a delay before getting characteristics
-                await new Promise((resolve) => setTimeout(resolve, 100));
-                const characteristics = await service.getCharacteristics();
-                for (const characteristic of matchingService.characteristics) {
-                    const matchingCharacteristic = characteristics.find((char) => char.uuid === characteristic.uuid);
-                    if (matchingCharacteristic) {
-                        const element = matchingService.characteristics.find((char) => char.uuid === matchingCharacteristic.uuid);
-                        if (element) {
-                            element.characteristic = matchingCharacteristic;
-                            // notify
-                            if (element.id === "rx") {
-                                matchingCharacteristic.startNotifications();
-                                matchingCharacteristic.addEventListener("characteristicvaluechanged", (event) => handleNotifications(event, board));
-                            }
-                        }
-                    }
-                    else {
-                        console.warn(`Characteristic ${characteristic.uuid} not found in service ${service.uuid}`);
-                    }
-                }
-            }
-        }
-        // Call the onSuccess callback after successful connection and setup
-        onSuccess();
-    }
-    catch (error) {
-        console.error(error);
-    }
-};
-/**
- * Return all service UUIDs
- * @param device
- */
-function getAllServiceUUIDs(device) {
-    return device.services.map((service) => service.uuid);
-}
-/**
- * Connect to the BluetoothDevice
- * @param device
- * @param onSuccess
- */
-export const connect = async (board, onSuccess) => {
-    try {
-        const deviceServices = getAllServiceUUIDs(board);
-        // setup filter list
-        const filters = [];
-        if (board.name) {
-            filters.push({
-                name: board.name,
-            });
-        }
-        if (board.companyId) {
-            filters.push({
-                manufacturerData: [
-                    {
-                        companyIdentifier: board.companyId,
-                    },
-                ],
-            });
-        }
-        const device = await navigator.bluetooth.requestDevice({
-            filters: filters,
-            optionalServices: deviceServices,
-        });
-        board.device = device;
-        if (!board.device.gatt) {
-            console.error("GATT is not available on this device");
-            return;
-        }
-        server = await board.device?.gatt?.connect();
-        board.device.addEventListener("gattserverdisconnected", (event) => onDisconnected(event, board));
-        if (server.connected) {
-            await onConnected(board, onSuccess);
-        }
-    }
-    catch (error) {
-        console.error(error);
-    }
-};

package/build/devices/entralpi.d.ts

@@ -1,2 +0,0 @@
-import { Device } from "./types";
-export declare const Entralpi: Device;

package/build/devices/entralpi.js

@@ -1,52 +0,0 @@
-export const Entralpi = {
-    name: "ENTRALPI",
-    services: [
-        {
-            name: "Device Information",
-            id: "device",
-            uuid: "0000180a-0000-1000-8000-00805f9b34fb",
-            characteristics: [],
-        },
-        {
-            name: "Battery Service",
-            id: "battery",
-            uuid: "0000180f-0000-1000-8000-00805f9b34fb",
-            characteristics: [],
-        },
-        {
-            name: "Generic Attribute",
-            id: "attribute",
-            uuid: "00001801-0000-1000-8000-00805f9b34fb",
-            characteristics: [],
-        },
-        {
-            name: "UART ISSC Transparent Service",
-            id: "uart",
-            uuid: "0000fff0-0000-1000-8000-00805f9b34fb",
-            characteristics: [
-                {
-                    name: "TX",
-                    id: "tx",
-                    uuid: "0000fff5-0000-1000-8000-00805f9b34fb",
-                },
-                {
-                    name: "RX",
-                    id: "rx",
-                    uuid: "0000fff4-0000-1000-8000-00805f9b34fb",
-                },
-            ],
-        },
-        {
-            name: "Weight Scale",
-            id: "weight",
-            uuid: "0000181d-0000-1000-8000-00805f9b34fb",
-            characteristics: [],
-        },
-        {
-            name: "Generic Access",
-            id: "access",
-            uuid: "00001800-0000-1000-8000-00805f9b34fb",
-            characteristics: [],
-        },
-    ],
-};

package/build/devices/index.d.ts

@@ -1,3 +0,0 @@
-export { Motherboard } from "./moterboard";
-export { Entralpi } from "./entralpi";
-export { Tindeq } from "./tindeq";

package/build/devices/index.js

@@ -1,3 +0,0 @@
-export { Motherboard } from "./moterboard";
-export { Entralpi } from "./entralpi";
-export { Tindeq } from "./tindeq";

package/build/devices/moterboard.d.ts

@@ -1,7 +0,0 @@
-import { Device } from "./types";
-export declare const Motherboard: Device;
-/**
- * handleMotherboardData
- * @param line
- */
-export declare function handleMotherboardData(uuid: string, receivedString: string): void;

package/build/devices/moterboard.js

@@ -1,163 +0,0 @@
-import { notifyCallback } from "../notify";
-const PACKET_LENGTH = 32;
-const NUM_SAMPLES = 3;
-const CALIBRATION = [[], [], [], []];
-export const Motherboard = {
-    name: "Motherboard",
-    companyId: 0x2a29,
-    services: [
-        {
-            name: "Device Information",
-            id: "device",
-            uuid: "0000180a-0000-1000-8000-00805f9b34fb",
-            characteristics: [
-                // {
-                //     name: 'Serial Number (Blocked)',
-                //     id: 'serial'
-                //     uuid: '00002a25-0000-1000-8000-00805f9b34fb'
-                // },
-                {
-                    name: "Firmware Revision",
-                    id: "firmware",
-                    uuid: "00002a26-0000-1000-8000-00805f9b34fb",
-                },
-                {
-                    name: "Hardware Revision",
-                    id: "hardware",
-                    uuid: "00002a27-0000-1000-8000-00805f9b34fb",
-                },
-                {
-                    name: "Manufacturer Name",
-                    id: "manufacturer",
-                    uuid: "00002a29-0000-1000-8000-00805f9b34fb",
-                },
-            ],
-        },
-        {
-            name: "Battery Service",
-            id: "battery",
-            uuid: "0000180f-0000-1000-8000-00805f9b34fb",
-            characteristics: [
-                {
-                    name: "Battery Level",
-                    id: "level",
-                    uuid: "00002a19-0000-1000-8000-00805f9b34fb",
-                },
-            ],
-        },
-        {
-            name: "Unknown Service",
-            id: "unknown",
-            uuid: "10ababcd-15e1-28ff-de13-725bea03b127",
-            characteristics: [
-                {
-                    name: "Unknown 01",
-                    id: "01",
-                    uuid: "10ab1524-15e1-28ff-de13-725bea03b127",
-                },
-                {
-                    name: "Unknown 02",
-                    id: "02",
-                    uuid: "10ab1525-15e1-28ff-de13-725bea03b127",
-                },
-            ],
-        },
-        {
-            name: "UART Nordic Service",
-            id: "uart",
-            uuid: "6e400001-b5a3-f393-e0a9-e50e24dcca9e",
-            characteristics: [
-                {
-                    name: "TX",
-                    id: "tx",
-                    uuid: "6e400002-b5a3-f393-e0a9-e50e24dcca9e",
-                },
-                {
-                    name: "RX",
-                    id: "rx",
-                    uuid: "6e400003-b5a3-f393-e0a9-e50e24dcca9e",
-                },
-            ],
-        },
-    ],
-};
-/**
- * applyCalibration
- * @param sample
- * @param calibration
- */
-const applyCalibration = (sample, calibration) => {
-    const zeroCalib = calibration[0][2];
-    let sgn = 1;
-    let final = 0;
-    if (sample < zeroCalib) {
-        sgn = -1;
-        sample = 2 * zeroCalib - sample;
-    }
-    for (let i = 1; i < calibration.length; i++) {
-        const calibStart = calibration[i - 1][2];
-        const calibEnd = calibration[i][2];
-        if (sample < calibEnd) {
-            final =
-                calibration[i - 1][1] +
-                    ((sample - calibStart) / (calibEnd - calibStart)) * (calibration[i][1] - calibration[i - 1][1]);
-            break;
-        }
-    }
-    return sgn * final;
-};
-/**
- * handleMotherboardData
- * @param line
- */
-export function handleMotherboardData(uuid, receivedString) {
-    const receivedTime = Date.now();
-    // Check if the line is entirely hex characters
-    const allHex = /^[0-9A-Fa-f]+$/g.test(receivedString);
-    // Decide if this is a streaming packet
-    if (allHex && receivedString.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)}`));
-        // Translate header into packet, number of samples from the packet length
-        const packet = {
-            received: receivedTime,
-            sampleNum: new DataView(new Uint8Array(bytes).buffer).getUint16(0, true),
-            battRaw: new DataView(new Uint8Array(bytes).buffer).getUint16(2, true),
-            samples: [],
-            masses: [],
-        };
-        for (let i = 0; i < NUM_SAMPLES; i++) {
-            const sampleStart = 4 + 3 * i;
-            packet.samples[i] = bytes[sampleStart] | (bytes[sampleStart + 1] << 8) | (bytes[sampleStart + 2] << 16);
-            if (packet.samples[i] >= 0x7fffff) {
-                packet.samples[i] -= 0x1000000;
-            }
-            // TODO: make sure device is calibrated
-            if (!CALIBRATION[0].length)
-                return;
-            packet.masses[i] = applyCalibration(packet.samples[i], CALIBRATION[i]);
-        }
-        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),
-                massCentre: Math.max(-1000, center).toFixed(3),
-            },
-        });
-    }
-    else if ((receivedString.match(/,/g) || []).length === 3) {
-        // if the returned notification is a calibration string add them to the array
-        const parts = receivedString.split(",");
-        const numericParts = parts.map((x) => parseFloat(x));
-        CALIBRATION[numericParts[0]].push(numericParts.slice(1));
-    }
-    else {
-        // unhanded data
-        console.log(receivedString);
-    }
-}

package/build/devices/tindeq.d.ts

@@ -1,17 +0,0 @@
-import { Device } from "./types";
-export declare const Tindeq: Device;
-export declare const Commands: {
-    TARE_SCALE: number;
-    START_MEASURING: number;
-    STOP_MEASURING: number;
-    GET_APP_VERSION: number;
-    GET_ERROR_INFO: number;
-    CLEAR_ERR_INFO: number;
-    GET_BATTERY_LEVEL: number;
-    SLEEP: number;
-};
-export declare const NotificationTypes: {
-    COMMAND_RESPONSE: number;
-    WEIGHT_MEASURE: number;
-    LOW_BATTERY_WARNING: number;
-};

package/build/devices/tindeq.js

@@ -1,37 +0,0 @@
-export const Tindeq = {
-    name: "Tindeq",
-    services: [
-        {
-            name: "Progressor Service",
-            id: "progressor",
-            uuid: "7e4e1701-1ea6-40c9-9dcc-13d34ffead57",
-            characteristics: [
-                {
-                    name: "Write",
-                    id: "tx",
-                    uuid: "7e4e1703-1ea6-40c9-9dcc-13d34ffead57",
-                },
-                {
-                    name: "Notify",
-                    id: "rx",
-                    uuid: "7e4e1702-1ea6-40c9-9dcc-13d34ffead57",
-                },
-            ],
-        },
-    ],
-};
-export const Commands = {
-    TARE_SCALE: 0x64,
-    START_MEASURING: 0x65,
-    STOP_MEASURING: 0x66,
-    GET_APP_VERSION: 0x6b,
-    GET_ERROR_INFO: 0x6c,
-    CLEAR_ERR_INFO: 0x6d,
-    GET_BATTERY_LEVEL: 0x6f,
-    SLEEP: 0x6e,
-};
-export const NotificationTypes = {
-    COMMAND_RESPONSE: 0,
-    WEIGHT_MEASURE: 1,
-    LOW_BATTERY_WARNING: 2,
-};

package/build/devices/types.d.ts

@@ -1,20 +0,0 @@
-/// <reference types="web-bluetooth" />
-interface Characteristic {
-    name: string;
-    id: string;
-    uuid: string;
-    characteristic?: BluetoothRemoteGATTCharacteristic;
-}
-interface Service {
-    name: string;
-    id: string;
-    uuid: string;
-    characteristics: Characteristic[];
-}
-export interface Device {
-    name: string;
-    companyId?: number;
-    services: Service[];
-    device?: BluetoothDevice;
-}
-export {};

package/build/devices/types.js

@@ -1 +0,0 @@
-export {};

package/build/disconnect.d.ts

@@ -1,6 +0,0 @@
-import { Device } from "./devices/types";
-/**
- * disconnect
- * @param board
- */
-export declare const disconnect: (board: Device) => void;

package/build/disconnect.js

@@ -1,11 +0,0 @@
-/**
- * disconnect
- * @param board
- */
-export const disconnect = (board) => {
-    if (!board.device)
-        return;
-    if (board.device.gatt?.connected) {
-        board.device.gatt?.disconnect();
-    }
-};

package/build/index.d.ts

@@ -1,6 +0,0 @@
-export { Motherboard, Entralpi, Tindeq } from "./devices/index";
-export { connect } from "./connect";
-export { disconnect } from "./disconnect";
-export { notify } from "./notify";
-export { read } from "./read";
-export { write } from "./write";

package/build/index.js

@@ -1,6 +0,0 @@
-export { Motherboard, Entralpi, Tindeq } from "./devices/index";
-export { connect } from "./connect";
-export { disconnect } from "./disconnect";
-export { notify } from "./notify";
-export { read } from "./read";
-export { write } from "./write";

package/build/notify.d.ts

@@ -1,4 +0,0 @@
-type NotifyCallback = (data: object) => void;
-export declare let notifyCallback: NotifyCallback;
-export declare const notify: (callback: NotifyCallback) => void;
-export {};

package/build/notify.js

@@ -1,6 +0,0 @@
-// Initialize the callback variable
-export let notifyCallback;
-// Export a function to set the callback
-export const notify = (callback) => {
-    notifyCallback = callback;
-};

package/build/read.d.ts

@@ -1,6 +0,0 @@
-import { Device } from "./devices/types";
-/**
- * read
- * @param characteristic
- */
-export declare const read: (board: Device, serviceId: string, characteristicId: string, duration?: number) => Promise<void>;

package/build/read.js

@@ -1,44 +0,0 @@
-import { notifyCallback } from "./notify";
-import { getCharacteristic } from "./characteristic";
-/**
- * read
- * @param characteristic
- */
-export const read = (board, serviceId, characteristicId, duration = 0) => {
-    return new Promise((resolve, reject) => {
-        if (board.device?.gatt?.connected) {
-            const characteristic = getCharacteristic(board, serviceId, characteristicId);
-            if (characteristic) {
-                characteristic
-                    .readValue()
-                    .then((value) => {
-                    let decodedValue;
-                    const decoder = new TextDecoder("utf-8");
-                    switch (characteristicId) {
-                        case "level":
-                            decodedValue = value.getUint8(0);
-                            break;
-                        default:
-                            decodedValue = decoder.decode(value);
-                            break;
-                    }
-                    if (notifyCallback) {
-                        notifyCallback({ uuid: characteristic.uuid, value: decodedValue });
-                    }
-                    setTimeout(() => {
-                        resolve();
-                    }, duration);
-                })
-                    .catch((error) => {
-                    reject(error);
-                });
-            }
-            else {
-                reject(new Error("Characteristic is undefined"));
-            }
-        }
-        else {
-            reject(new Error("Device is not connected"));
-        }
-    });
-};

package/build/write.d.ts

@@ -1,7 +0,0 @@
-import { Device } from "./devices/types";
-/**
- * write
- * @param characteristic
- * @param message
- */
-export declare const write: (board: Device, serviceId: string, characteristicId: string, message: string, duration?: number) => Promise<void>;

package/build/write.js

@@ -1,33 +0,0 @@
-import { getCharacteristic } from "./characteristic";
-/**
- * write
- * @param characteristic
- * @param message
- */
-export const write = (board, serviceId, characteristicId, message, duration = 0) => {
-    return new Promise((resolve, reject) => {
-        if (board.device?.gatt?.connected) {
-            const encoder = new TextEncoder();
-            const characteristic = getCharacteristic(board, serviceId, characteristicId);
-            if (characteristic) {
-                const value = message + "\n";
-                characteristic
-                    .writeValue(encoder.encode(value))
-                    .then(() => {
-                    setTimeout(() => {
-                        resolve();
-                    }, duration);
-                })
-                    .catch((error) => {
-                    reject(error);
-                });
-            }
-            else {
-                reject(new Error("Characteristics is undefined"));
-            }
-        }
-        else {
-            reject(new Error("Device is not connected"));
-        }
-    });
-};