@hangtime/grip-connect 0.2.6 → 0.3.0

package/src/data.js

@@ -1,14 +1,23 @@
 import { notifyCallback } from "./notify";
+import { applyTare } from "./tare";
 import { ProgressorCommands, ProgressorResponses } from "./commands/progressor";
+import { MotherboardCommands } from "./commands";
 import { lastWrite } from "./write";
+import { DownloadPackets } from "./download";
 import struct from "./struct";
+// Constants
 const PACKET_LENGTH = 32;
 const NUM_SAMPLES = 3;
+let MASS_MAX = "0";
+let MASS_AVERAGE = "0";
+let MASS_TOTAL_SUM = 0;
+let DATAPOINT_COUNT = 0;
 export const CALIBRATION = [[], [], [], []];
 /**
- * applyCalibration
- * @param sample
- * @param calibration
+ * Applies calibration to a sample value.
+ * @param {number} sample - The sample value to calibrate.
+ * @param {number[][]} calibration - The calibration data.
+ * @returns {number} The calibrated sample value.
  */
 const applyCalibration = (sample, calibration) => {
     // Extract the calibrated value for the zero point
@@ -43,12 +52,10 @@ const applyCalibration = (sample, calibration) => {
     return sign * final;
 };
 /**
- * handleMotherboardData
- *
- * @param uuid - Unique identifier
- * @param receivedData - Received data string
+ * Handles data received from the Motherboard device.
+ * @param {string} receivedData - The received data string.
  */
-export const handleMotherboardData = (uuid, receivedData) => {
+export const handleMotherboardData = (receivedData) => {
     const receivedTime = Date.now();
     // Check if the line is entirely hex characters
     const isAllHex = /^[0-9A-Fa-f]+$/g.test(receivedData);
@@ -76,52 +83,91 @@ export const handleMotherboardData = (uuid, receivedData) => {
             if (packet.samples[i] >= 0x7fffff) {
                 packet.samples[i] -= 0x1000000;
             }
-            // 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 = packet.masses[0];
-        const center = packet.masses[1];
-        const right = packet.masses[2];
-        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),
-                },
-            });
-        }
+        // Add data to downloadable Array
+        DownloadPackets.push({
+            received: packet.received,
+            sampleNum: packet.battRaw,
+            battRaw: packet.received,
+            samples: [...packet.samples],
+            masses: [...packet.masses],
+        });
+        let left = packet.masses[0];
+        let center = packet.masses[1];
+        let right = packet.masses[2];
+        // Tare correction
+        left -= applyTare(left);
+        center -= applyTare(center);
+        right -= applyTare(right);
+        MASS_MAX = Math.max(Number(MASS_MAX), Math.max(-1000, left + center + right)).toFixed(1);
+        // Update running sum and count
+        const currentMassTotal = Math.max(-1000, left + center + right);
+        MASS_TOTAL_SUM += currentMassTotal;
+        DATAPOINT_COUNT++;
+        // Calculate the average dynamically
+        MASS_AVERAGE = (MASS_TOTAL_SUM / DATAPOINT_COUNT).toFixed(1);
+        // Notify with weight data
+        notifyCallback({
+            massTotal: Math.max(-1000, left + center + right).toFixed(1),
+            massMax: MASS_MAX,
+            massAverage: MASS_AVERAGE,
+            massLeft: Math.max(-1000, packet.masses[0]).toFixed(1),
+            massCenter: Math.max(-1000, packet.masses[1]).toFixed(1),
+            massRight: Math.max(-1000, packet.masses[2]).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 = receivedData.split(",");
-        const numericParts = parts.map((x) => parseFloat(x));
-        CALIBRATION[numericParts[0]].push(numericParts.slice(1));
+    else if (lastWrite === MotherboardCommands.GET_CALIBRATION) {
+        // check data integrity
+        if ((receivedData.match(/,/g) || []).length === 3) {
+            const parts = receivedData.split(",");
+            const numericParts = parts.map((x) => parseFloat(x));
+            CALIBRATION[numericParts[0]].push(numericParts.slice(1));
+        }
     }
     else {
-        // unhanded data
+        // unhandled data
         console.log(receivedData);
     }
 };
-export const handleProgressorData = (uuid, data) => {
-    const tare = 0; // todo: add tare
+/**
+ * Handles data received from the Progressor device.
+ * @param {DataView} data - The received data.
+ */
+export const handleProgressorData = (data) => {
+    const receivedTime = Date.now();
     const [kind] = struct("<bb").unpack(data.buffer.slice(0, 2));
     if (kind === ProgressorResponses.WEIGHT_MEASURE) {
         const iterable = struct("<fi").iter_unpack(data.buffer.slice(2));
-        for (const [weight] of iterable) {
-            if (notifyCallback) {
+        console.log(iterable);
+        // eslint-disable-next-line prefer-const
+        for (let [weight, seconds] of iterable) {
+            if (typeof weight === "number" && !isNaN(weight) && typeof seconds === "number" && !isNaN(seconds)) {
+                // Add data to downloadable Array: sample and mass are the same
+                DownloadPackets.push({
+                    received: receivedTime,
+                    sampleNum: seconds,
+                    battRaw: 0,
+                    samples: [weight],
+                    masses: [weight],
+                });
+                // Tare correction
+                weight -= applyTare(weight);
+                // Check for max weight
+                MASS_MAX = Math.max(Number(MASS_MAX), Number(weight)).toFixed(1);
+                // Update running sum and count
+                const currentMassTotal = Math.max(-1000, Number(weight));
+                MASS_TOTAL_SUM += currentMassTotal;
+                DATAPOINT_COUNT++;
+                // Calculate the average dynamically
+                MASS_AVERAGE = (MASS_TOTAL_SUM / DATAPOINT_COUNT).toFixed(1);
                 notifyCallback({
-                    uuid: uuid,
-                    value: {
-                        massTotal: Math.max(-1000, Number(weight) - tare).toFixed(1),
-                    },
+                    massMax: MASS_MAX,
+                    massAverage: MASS_AVERAGE,
+                    massTotal: Math.max(-1000, weight).toFixed(1),
                 });
             }
         }
@@ -132,7 +178,7 @@ export const handleProgressorData = (uuid, data) => {
         let value = "";
         if (lastWrite === ProgressorCommands.GET_BATT_VLTG) {
             const vdd = new DataView(data.buffer, 2).getUint32(0, true);
-            value = `Battery level = ${vdd} [mV]`;
+            value = `ℹ️ Battery level: ${vdd} mV`;
         }
         else if (lastWrite === ProgressorCommands.GET_FW_VERSION) {
             value = new TextDecoder().decode(data.buffer.slice(2));
@@ -140,18 +186,35 @@ export const handleProgressorData = (uuid, data) => {
         else if (lastWrite === ProgressorCommands.GET_ERR_INFO) {
             value = new TextDecoder().decode(data.buffer.slice(2));
         }
-        if (notifyCallback) {
-            notifyCallback({ uuid: uuid, value: value });
-        }
+        console.log(value);
     }
     else if (kind === ProgressorResponses.LOW_BATTERY_WARNING) {
-        if (notifyCallback) {
-            notifyCallback({ uuid: uuid, value: "low power warning" });
-        }
+        console.warn("⚠️ Low power detected. Please consider connecting to a power source.");
     }
     else {
-        if (notifyCallback) {
-            notifyCallback({ uuid: uuid, value: `unknown message kind ${kind}` });
-        }
+        console.error(`❌ Error: Unknown message kind detected: ${kind}`);
     }
 };
+/**
+ * Handles data received from the Entralpi device.
+ * @param {string} receivedData - The received data string.
+ */
+export const handleEntralpiData = (receivedData) => {
+    let numericData = Number(receivedData);
+    // Tare correction
+    numericData -= applyTare(numericData);
+    // Update MASS_MAX
+    MASS_MAX = Math.max(Number(MASS_MAX), numericData).toFixed(1);
+    // Update running sum and count
+    const currentMassTotal = Math.max(-1000, numericData);
+    MASS_TOTAL_SUM += currentMassTotal;
+    DATAPOINT_COUNT++;
+    // Calculate the average dynamically
+    MASS_AVERAGE = (MASS_TOTAL_SUM / DATAPOINT_COUNT).toFixed(1);
+    // Notify with weight data
+    notifyCallback({
+        massMax: MASS_MAX,
+        massAverage: MASS_AVERAGE,
+        massTotal: Math.max(-1000, numericData).toFixed(1),
+    });
+};

package/src/data.ts

@@ -1,23 +1,31 @@
 import { notifyCallback } from "./notify"
+import { applyTare } from "./tare"
 import { ProgressorCommands, ProgressorResponses } from "./commands/progressor"
+import { MotherboardCommands } from "./commands"
 import { lastWrite } from "./write"
+import { DownloadPacket, DownloadPackets } from "./download"
 import struct from "./struct"
 
+// Constants
 const PACKET_LENGTH: number = 32
 const NUM_SAMPLES: number = 3
+let MASS_MAX: string = "0"
+let MASS_AVERAGE: string = "0"
+let MASS_TOTAL_SUM: number = 0
+let DATAPOINT_COUNT: number = 0
 export const CALIBRATION = [[], [], [], []]
+
 /**
- * applyCalibration
- * @param sample
- * @param calibration
+ * Applies calibration to a sample value.
+ * @param {number} sample - The sample value to calibrate.
+ * @param {number[][]} calibration - The calibration data.
+ * @returns {number} The calibrated sample value.
  */
 const applyCalibration = (sample: number, calibration: number[][]): number => {
   // 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
 
@@ -25,7 +33,6 @@ const applyCalibration = (sample: number, calibration: number[][]): number => {
   if (sample < zeroCalibration) {
     // Change the sign to negative
     sign = -1
-
     // Reflect the sample around the zero calibration point
     sample = /* 2 * zeroCalibration */ -sample
   }
@@ -49,22 +56,11 @@ const applyCalibration = (sample: number, calibration: number[][]): number => {
   // Return the calibrated value with the appropriate sign (positive/negative)
   return sign * final
 }
-
-interface Packet {
-  received: number
-  sampleNum: number
-  battRaw: number
-  samples: number[]
-  masses: number[]
-}
-
 /**
- * handleMotherboardData
- *
- * @param uuid - Unique identifier
- * @param receivedData - Received data string
+ * Handles data received from the Motherboard device.
+ * @param {string} receivedData - The received data string.
  */
-export const handleMotherboardData = (uuid: string, receivedData: string): void => {
+export const handleMotherboardData = (receivedData: string): void => {
   const receivedTime: number = Date.now()
 
   // Check if the line is entirely hex characters
@@ -78,7 +74,7 @@ export const handleMotherboardData = (uuid: string, receivedData: string): void
     )
 
     // Translate header into packet, number of samples from the packet length
-    const packet: Packet = {
+    const packet: DownloadPacket = {
       received: receivedTime,
       sampleNum: new DataView(new Uint8Array(bytes).buffer).getUint16(0, true),
       battRaw: new DataView(new Uint8Array(bytes).buffer).getUint16(2, true),
@@ -102,51 +98,99 @@ export const handleMotherboardData = (uuid: string, receivedData: string): void
       if (packet.samples[i] >= 0x7fffff) {
         packet.samples[i] -= 0x1000000
       }
-      // 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]
-    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),
-        },
-      })
+
+    // Add data to downloadable Array
+    DownloadPackets.push({
+      received: packet.received,
+      sampleNum: packet.battRaw,
+      battRaw: packet.received,
+      samples: [...packet.samples],
+      masses: [...packet.masses],
+    })
+
+    let left: number = packet.masses[0]
+    let center: number = packet.masses[1]
+    let right: number = packet.masses[2]
+
+    // Tare correction
+    left -= applyTare(left)
+    center -= applyTare(center)
+    right -= applyTare(right)
+
+    MASS_MAX = Math.max(Number(MASS_MAX), Math.max(-1000, left + center + right)).toFixed(1)
+
+    // Update running sum and count
+    const currentMassTotal = Math.max(-1000, left + center + right)
+    MASS_TOTAL_SUM += currentMassTotal
+    DATAPOINT_COUNT++
+
+    // Calculate the average dynamically
+    MASS_AVERAGE = (MASS_TOTAL_SUM / DATAPOINT_COUNT).toFixed(1)
+
+    // Notify with weight data
+    notifyCallback({
+      massTotal: Math.max(-1000, left + center + right).toFixed(1),
+      massMax: MASS_MAX,
+      massAverage: MASS_AVERAGE,
+      massLeft: Math.max(-1000, packet.masses[0]).toFixed(1),
+      massCenter: Math.max(-1000, packet.masses[1]).toFixed(1),
+      massRight: Math.max(-1000, packet.masses[2]).toFixed(1),
+    })
+  } else if (lastWrite === MotherboardCommands.GET_CALIBRATION) {
+    // check data integrity
+    if ((receivedData.match(/,/g) || []).length === 3) {
+      const parts: string[] = receivedData.split(",")
+      const numericParts: number[] = parts.map((x) => parseFloat(x))
+      ;(CALIBRATION[numericParts[0]] as number[][]).push(numericParts.slice(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[] = receivedData.split(",")
-    const numericParts: number[] = parts.map((x) => parseFloat(x))
-    ;(CALIBRATION[numericParts[0]] as number[][]).push(numericParts.slice(1))
   } else {
-    // unhanded data
+    // unhandled data
     console.log(receivedData)
   }
 }
 
-export const handleProgressorData = (uuid: string, data: DataView): void => {
-  const tare: number = 0 // todo: add tare
+/**
+ * Handles data received from the Progressor device.
+ * @param {DataView} data - The received data.
+ */
+export const handleProgressorData = (data: DataView): void => {
+  const receivedTime: number = Date.now()
   const [kind] = struct("<bb").unpack(data.buffer.slice(0, 2))
   if (kind === ProgressorResponses.WEIGHT_MEASURE) {
-    const iterable = struct("<fi").iter_unpack(data.buffer.slice(2))
-    for (const [weight] of iterable) {
-      if (notifyCallback) {
+    const iterable: IterableIterator<unknown[]> = struct("<fi").iter_unpack(data.buffer.slice(2))
+    console.log(iterable)
+    // eslint-disable-next-line prefer-const
+    for (let [weight, seconds] of iterable) {
+      if (typeof weight === "number" && !isNaN(weight) && typeof seconds === "number" && !isNaN(seconds)) {
+        // Add data to downloadable Array: sample and mass are the same
+        DownloadPackets.push({
+          received: receivedTime,
+          sampleNum: seconds,
+          battRaw: 0,
+          samples: [weight],
+          masses: [weight],
+        })
+        // Tare correction
+        weight -= applyTare(weight)
+        // Check for max weight
+        MASS_MAX = Math.max(Number(MASS_MAX), Number(weight)).toFixed(1)
+        // Update running sum and count
+        const currentMassTotal = Math.max(-1000, Number(weight))
+        MASS_TOTAL_SUM += currentMassTotal
+        DATAPOINT_COUNT++
+
+        // Calculate the average dynamically
+        MASS_AVERAGE = (MASS_TOTAL_SUM / DATAPOINT_COUNT).toFixed(1)
+
         notifyCallback({
-          uuid: uuid,
-          value: {
-            massTotal: Math.max(-1000, Number(weight) - tare).toFixed(1),
-          },
+          massMax: MASS_MAX,
+          massAverage: MASS_AVERAGE,
+          massTotal: Math.max(-1000, weight).toFixed(1),
         })
       }
     }
@@ -157,22 +201,44 @@ export const handleProgressorData = (uuid: string, data: DataView): void => {
 
     if (lastWrite === ProgressorCommands.GET_BATT_VLTG) {
       const vdd = new DataView(data.buffer, 2).getUint32(0, true)
-      value = `Battery level = ${vdd} [mV]`
+      value = `ℹ️ Battery level: ${vdd} mV`
     } else if (lastWrite === ProgressorCommands.GET_FW_VERSION) {
       value = new TextDecoder().decode(data.buffer.slice(2))
     } else if (lastWrite === ProgressorCommands.GET_ERR_INFO) {
       value = new TextDecoder().decode(data.buffer.slice(2))
     }
-    if (notifyCallback) {
-      notifyCallback({ uuid: uuid, value: value })
-    }
+    console.log(value)
   } else if (kind === ProgressorResponses.LOW_BATTERY_WARNING) {
-    if (notifyCallback) {
-      notifyCallback({ uuid: uuid, value: "low power warning" })
-    }
+    console.warn("⚠️ Low power detected. Please consider connecting to a power source.")
   } else {
-    if (notifyCallback) {
-      notifyCallback({ uuid: uuid, value: `unknown message kind ${kind}` })
-    }
+    console.error(`❌ Error: Unknown message kind detected: ${kind}`)
   }
 }
+/**
+ * Handles data received from the Entralpi device.
+ * @param {string} receivedData - The received data string.
+ */
+export const handleEntralpiData = (receivedData: string): void => {
+  let numericData = Number(receivedData)
+
+  // Tare correction
+  numericData -= applyTare(numericData)
+
+  // Update MASS_MAX
+  MASS_MAX = Math.max(Number(MASS_MAX), numericData).toFixed(1)
+
+  // Update running sum and count
+  const currentMassTotal = Math.max(-1000, numericData)
+  MASS_TOTAL_SUM += currentMassTotal
+  DATAPOINT_COUNT++
+
+  // Calculate the average dynamically
+  MASS_AVERAGE = (MASS_TOTAL_SUM / DATAPOINT_COUNT).toFixed(1)
+
+  // Notify with weight data
+  notifyCallback({
+    massMax: MASS_MAX,
+    massAverage: MASS_AVERAGE,
+    massTotal: Math.max(-1000, numericData).toFixed(1),
+  })
+}

package/src/devices/climbro.d.ts

@@ -1,2 +1,6 @@
 import { Device } from "./types";
+/**
+ * Represents a Climbro device
+ * TODO: Add services, do you own a Climbro? Help us!
+ */
 export declare const Climbro: Device;

package/src/devices/climbro.js

@@ -1,3 +1,7 @@
+/**
+ * Represents a Climbro device
+ * TODO: Add services, do you own a Climbro? Help us!
+ */
 export const Climbro = {
     name: "Climbro",
     services: [],

package/src/devices/climbro.ts

@@ -1,5 +1,9 @@
 import { Device } from "./types"
 
+/**
+ * Represents a Climbro device
+ * TODO: Add services, do you own a Climbro? Help us!
+ */
 export const Climbro: Device = {
   name: "Climbro",
   services: [],

package/src/devices/entralpi.d.ts

@@ -1,2 +1,5 @@
 import { Device } from "./types";
+/**
+ * Represents a Entralpi device
+ */
 export declare const Entralpi: Device;

package/src/devices/entralpi.js

@@ -1,3 +1,6 @@
+/**
+ * Represents a Entralpi device
+ */
 export const Entralpi = {
     name: "ENTRALPI",
     services: [

package/src/devices/entralpi.ts

@@ -1,5 +1,8 @@
 import { Device } from "./types"
 
+/**
+ * Represents a Entralpi device
+ */
 export const Entralpi: Device = {
   name: "ENTRALPI",
   services: [

package/src/devices/index.d.ts

@@ -1,5 +1,6 @@
 export { Climbro } from "./climbro";
 export { Entralpi } from "./entralpi";
 export { Motherboard } from "./motherboard";
-export { SmartBoard } from "./smartboard";
+export { mySmartBoard } from "./mysmartboard";
+export { MuscleMeter } from "./musclemeter";
 export { Progressor } from "./progressor";

package/src/devices/index.js

@@ -1,5 +1,6 @@
 export { Climbro } from "./climbro";
 export { Entralpi } from "./entralpi";
 export { Motherboard } from "./motherboard";
-export { SmartBoard } from "./smartboard";
+export { mySmartBoard } from "./mysmartboard";
+export { MuscleMeter } from "./musclemeter";
 export { Progressor } from "./progressor";

package/src/devices/index.ts

@@ -4,6 +4,8 @@ export { Entralpi } from "./entralpi"
 
 export { Motherboard } from "./motherboard"
 
-export { SmartBoard } from "./smartboard"
+export { mySmartBoard } from "./mysmartboard"
+
+export { MuscleMeter } from "./musclemeter"
 
 export { Progressor } from "./progressor"

package/src/devices/motherboard.d.ts

@@ -1,2 +1,5 @@
 import { Device } from "./types";
+/**
+ * Represents a Griptonite Motherboard device
+ */
 export declare const Motherboard: Device;

package/src/devices/motherboard.js

@@ -1,3 +1,6 @@
+/**
+ * Represents a Griptonite Motherboard device
+ */
 export const Motherboard = {
     name: "Motherboard",
     companyId: 0x2a29,

package/src/devices/motherboard.ts

@@ -1,5 +1,8 @@
 import { Device } from "./types"
 
+/**
+ * Represents a Griptonite Motherboard device
+ */
 export const Motherboard: Device = {
   name: "Motherboard",
   companyId: 0x2a29,

package/src/devices/musclemeter.d.ts

@@ -0,0 +1,6 @@
+import { Device } from "./types";
+/**
+ * Represents a MAT Muscle Meter device
+ * TODO: Add services, do you own a MAT Muscle Meter? Help us!
+ */
+export declare const MuscleMeter: Device;

package/src/devices/musclemeter.js

@@ -0,0 +1,8 @@
+/**
+ * Represents a MAT Muscle Meter device
+ * TODO: Add services, do you own a MAT Muscle Meter? Help us!
+ */
+export const MuscleMeter = {
+    name: "MAT",
+    services: [],
+};

package/src/devices/musclemeter.ts

@@ -0,0 +1,10 @@
+import { Device } from "./types"
+
+/**
+ * Represents a MAT Muscle Meter device
+ * TODO: Add services, do you own a MAT Muscle Meter? Help us!
+ */
+export const MuscleMeter: Device = {
+  name: "MAT",
+  services: [],
+}

package/src/devices/mysmartboard.d.ts

@@ -0,0 +1,6 @@
+import { Device } from "./types";
+/**
+ * Represents a mySmartBoard device
+ * TODO: Add services, do you own a mySmartBoard? Help us!
+ */
+export declare const mySmartBoard: Device;

package/src/devices/mysmartboard.js

@@ -0,0 +1,8 @@
+/**
+ * Represents a mySmartBoard device
+ * TODO: Add services, do you own a mySmartBoard? Help us!
+ */
+export const mySmartBoard = {
+    name: "mySmartBoard",
+    services: [],
+};

package/src/devices/mysmartboard.ts

@@ -0,0 +1,10 @@
+import { Device } from "./types"
+
+/**
+ * Represents a mySmartBoard device
+ * TODO: Add services, do you own a mySmartBoard? Help us!
+ */
+export const mySmartBoard: Device = {
+  name: "mySmartBoard",
+  services: [],
+}

package/src/devices/progressor.d.ts

@@ -1,2 +1,5 @@
 import { Device } from "./types";
+/**
+ * Represents a Tindeq Progressor device
+ */
 export declare const Progressor: Device;