@hangtime/grip-connect 0.5.4 → 0.5.5

package/dist/models/device/entralpi.model.js

@@ -1,6 +1,7 @@
 import { Device } from "../device.model";
 import { applyTare } from "../../helpers/tare";
 import { checkActivity } from "../../helpers/is-active";
+import { DownloadPackets } from "../../helpers/download";
 export class Entralpi extends Device {
     constructor() {
         super({
@@ -158,10 +159,19 @@ export class Entralpi extends Device {
             if (value.buffer) {
                 const buffer = value.buffer;
                 const rawData = new DataView(buffer);
+                const receivedTime = Date.now();
                 const receivedData = (rawData.getUint16(0) / 100).toFixed(1);
-                let numericData = Number(receivedData);
+                const convertedData = Number(receivedData);
                 // Tare correction
-                numericData -= applyTare(numericData);
+                const numericData = convertedData - applyTare(convertedData);
+                // Add data to downloadable Array
+                DownloadPackets.push({
+                    received: receivedTime,
+                    sampleNum: this.dataPointCount,
+                    battRaw: 0,
+                    samples: [convertedData],
+                    masses: [numericData],
+                });
                 // Update massMax
                 this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1);
                 // Update running sum and count

package/dist/models/device/forceboard.model.js

@@ -1,5 +1,5 @@
 import { Device } from "../device.model";
-import { emptyDownloadPackets } from "../../helpers/download";
+import { DownloadPackets, emptyDownloadPackets } from "../../helpers/download";
 import { checkActivity } from "../../helpers/is-active";
 import { applyTare } from "../../helpers/tare";
 /**
@@ -188,11 +188,20 @@ export class ForceBoard extends Device {
             if (value.buffer) {
                 const buffer = value.buffer;
                 const rawData = new DataView(buffer);
+                const receivedTime = Date.now();
                 const receivedData = rawData.getUint8(4); // Read the value at index 4
                 // Convert from LBS to KG
-                let numericData = receivedData * 0.453592;
+                const convertedReceivedData = receivedData * 0.453592;
                 // Tare correction
-                numericData -= applyTare(numericData);
+                const numericData = convertedReceivedData - applyTare(convertedReceivedData);
+                // Add data to downloadable Array
+                DownloadPackets.push({
+                    received: receivedTime,
+                    sampleNum: this.dataPointCount,
+                    battRaw: 0,
+                    samples: [convertedReceivedData],
+                    masses: [numericData],
+                });
                 // Update massMax
                 this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1);
                 // Update running sum and count

package/dist/models/device/progressor.model.js

@@ -123,38 +123,38 @@ export class Progressor extends Device {
         if (value) {
             if (value.buffer) {
                 const buffer = value.buffer;
-                const data = new DataView(buffer);
+                const rawData = new DataView(buffer);
                 const receivedTime = Date.now();
-                const [kind] = struct("<bb").unpack(data.buffer.slice(0, 2));
+                const [kind] = struct("<bb").unpack(rawData.buffer.slice(0, 2));
                 if (kind === ProgressorResponses.WEIGHT_MEASURE) {
-                    const iterable = struct("<fi").iter_unpack(data.buffer.slice(2));
+                    const iterable = struct("<fi").iter_unpack(rawData.buffer.slice(2));
                     // 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
+                            // Tare correction
+                            const numericData = weight - applyTare(weight);
+                            // Add data to downloadable Array
                             DownloadPackets.push({
                                 received: receivedTime,
                                 sampleNum: seconds,
                                 battRaw: 0,
                                 samples: [weight],
-                                masses: [weight],
+                                masses: [numericData],
                             });
-                            // Tare correction
-                            weight -= applyTare(weight);
                             // Check for max weight
-                            this.massMax = Math.max(Number(this.massMax), Number(weight)).toFixed(1);
+                            this.massMax = Math.max(Number(this.massMax), Number(numericData)).toFixed(1);
                             // Update running sum and count
-                            const currentMassTotal = Math.max(-1000, Number(weight));
+                            const currentMassTotal = Math.max(-1000, Number(numericData));
                             this.massTotalSum += currentMassTotal;
                             this.dataPointCount++;
                             // Calculate the average dynamically
                             this.massAverage = (this.massTotalSum / this.dataPointCount).toFixed(1);
                             // Check if device is being used
-                            checkActivity(weight);
+                            checkActivity(numericData);
                             this.notifyCallback({
                                 massMax: this.massMax,
                                 massAverage: this.massAverage,
-                                massTotal: Math.max(-1000, weight).toFixed(1),
+                                massTotal: Math.max(-1000, numericData).toFixed(1),
                             });
                         }
                     }
@@ -164,13 +164,13 @@ export class Progressor extends Device {
                         return;
                     let value = "";
                     if (this.writeLast === this.commands.GET_BATT_VLTG) {
-                        value = new DataView(data.buffer, 2).getUint32(0, true).toString();
+                        value = new DataView(rawData.buffer, 2).getUint32(0, true).toString();
                     }
                     else if (this.writeLast === this.commands.GET_FW_VERSION) {
-                        value = new TextDecoder().decode(data.buffer.slice(2));
+                        value = new TextDecoder().decode(rawData.buffer.slice(2));
                     }
                     else if (this.writeLast === this.commands.GET_ERR_INFO) {
-                        value = new TextDecoder().decode(data.buffer.slice(2));
+                        value = new TextDecoder().decode(rawData.buffer.slice(2));
                     }
                     this.writeCallback(value);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hangtime/grip-connect",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Griptonite Motherboard, Tindeq Progressor, PitchSix Force Board, WHC-06, Entralpi, Climbro, mySmartBoard: Web Bluetooth API Force-Sensing strength analysis for climbers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/models/device/entralpi.model.ts

@@ -2,6 +2,7 @@ import { Device } from "../device.model"
 import type { IEntralpi } from "../../interfaces/device/entralpi.interface"
 import { applyTare } from "../../helpers/tare"
 import { checkActivity } from "../../helpers/is-active"
+import { DownloadPackets } from "../../helpers/download"
 
 export class Entralpi extends Device implements IEntralpi {
   constructor() {
@@ -165,12 +166,20 @@ export class Entralpi extends Device implements IEntralpi {
       if (value.buffer) {
         const buffer: ArrayBuffer = value.buffer
         const rawData: DataView = new DataView(buffer)
+        const receivedTime: number = Date.now()
         const receivedData: string = (rawData.getUint16(0) / 100).toFixed(1)
 
-        let numericData = Number(receivedData)
-
+        const convertedData = Number(receivedData)
         // Tare correction
-        numericData -= applyTare(numericData)
+        const numericData = convertedData - applyTare(convertedData)
+        // Add data to downloadable Array
+        DownloadPackets.push({
+          received: receivedTime,
+          sampleNum: this.dataPointCount,
+          battRaw: 0,
+          samples: [convertedData],
+          masses: [numericData],
+        })
 
         // Update massMax
         this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1)

package/src/models/device/forceboard.model.ts

@@ -1,6 +1,6 @@
 import { Device } from "../device.model"
 import type { IForceBoard } from "../../interfaces/device/forceboard.interface"
-import { emptyDownloadPackets } from "../../helpers/download"
+import { DownloadPackets, emptyDownloadPackets } from "../../helpers/download"
 import { checkActivity } from "../../helpers/is-active"
 import { applyTare } from "../../helpers/tare"
 
@@ -192,14 +192,21 @@ export class ForceBoard extends Device implements IForceBoard {
       if (value.buffer) {
         const buffer: ArrayBuffer = value.buffer
         const rawData: DataView = new DataView(buffer)
+        const receivedTime: number = Date.now()
 
         const receivedData = rawData.getUint8(4) // Read the value at index 4
-
         // Convert from LBS to KG
-        let numericData = receivedData * 0.453592
-
+        const convertedReceivedData = receivedData * 0.453592
         // Tare correction
-        numericData -= applyTare(numericData)
+        const numericData = convertedReceivedData - applyTare(convertedReceivedData)
+        // Add data to downloadable Array
+        DownloadPackets.push({
+          received: receivedTime,
+          sampleNum: this.dataPointCount,
+          battRaw: 0,
+          samples: [convertedReceivedData],
+          masses: [numericData],
+        })
 
         // Update massMax
         this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1)

package/src/models/device/progressor.model.ts

@@ -133,28 +133,28 @@ export class Progressor extends Device implements IProgressor {
     if (value) {
       if (value.buffer) {
         const buffer: ArrayBuffer = value.buffer
-        const data: DataView = new DataView(buffer)
+        const rawData: DataView = new DataView(buffer)
         const receivedTime: number = Date.now()
-        const [kind] = struct("<bb").unpack(data.buffer.slice(0, 2))
+        const [kind] = struct("<bb").unpack(rawData.buffer.slice(0, 2))
         if (kind === ProgressorResponses.WEIGHT_MEASURE) {
-          const iterable: IterableIterator<unknown[]> = struct("<fi").iter_unpack(data.buffer.slice(2))
+          const iterable: IterableIterator<unknown[]> = struct("<fi").iter_unpack(rawData.buffer.slice(2))
           // 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
+              // Tare correction
+              const numericData = weight - applyTare(weight)
+              // Add data to downloadable Array
               DownloadPackets.push({
                 received: receivedTime,
                 sampleNum: seconds,
                 battRaw: 0,
                 samples: [weight],
-                masses: [weight],
+                masses: [numericData],
               })
-              // Tare correction
-              weight -= applyTare(weight)
               // Check for max weight
-              this.massMax = Math.max(Number(this.massMax), Number(weight)).toFixed(1)
+              this.massMax = Math.max(Number(this.massMax), Number(numericData)).toFixed(1)
               // Update running sum and count
-              const currentMassTotal = Math.max(-1000, Number(weight))
+              const currentMassTotal = Math.max(-1000, Number(numericData))
               this.massTotalSum += currentMassTotal
               this.dataPointCount++
 
@@ -162,12 +162,12 @@ export class Progressor extends Device implements IProgressor {
               this.massAverage = (this.massTotalSum / this.dataPointCount).toFixed(1)
 
               // Check if device is being used
-              checkActivity(weight)
+              checkActivity(numericData)
 
               this.notifyCallback({
                 massMax: this.massMax,
                 massAverage: this.massAverage,
-                massTotal: Math.max(-1000, weight).toFixed(1),
+                massTotal: Math.max(-1000, numericData).toFixed(1),
               })
             }
           }
@@ -177,11 +177,11 @@ export class Progressor extends Device implements IProgressor {
           let value = ""
 
           if (this.writeLast === this.commands.GET_BATT_VLTG) {
-            value = new DataView(data.buffer, 2).getUint32(0, true).toString()
+            value = new DataView(rawData.buffer, 2).getUint32(0, true).toString()
           } else if (this.writeLast === this.commands.GET_FW_VERSION) {
-            value = new TextDecoder().decode(data.buffer.slice(2))
+            value = new TextDecoder().decode(rawData.buffer.slice(2))
           } else if (this.writeLast === this.commands.GET_ERR_INFO) {
-            value = new TextDecoder().decode(data.buffer.slice(2))
+            value = new TextDecoder().decode(rawData.buffer.slice(2))
           }
           this.writeCallback(value)
         } else if (kind === ProgressorResponses.LOW_BATTERY_WARNING) {