@hangtime/grip-connect 0.10.1 → 0.10.3

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

@@ -161,9 +161,10 @@ export class Entralpi extends Device implements IEntralpi {
    */
   override handleNotifications = (value: DataView): void => {
     if (value) {
-      // Update timestamp
       this.updateTimestamp()
       if (value.buffer) {
+        this.currentSamplesPerPacket = 1
+        this.recordPacketReceived()
         const receivedTime: number = Date.now()
         const receivedData: string = (value.getUint16(0) / 100).toFixed(1)
 
@@ -173,31 +174,28 @@ export class Entralpi extends Device implements IEntralpi {
         // This will display the removed or 'no-hanging' weight.
         const tare = this.applyTare(convertedData)
         const numericData = tare === 0 ? convertedData : (convertedData - tare) * -1
-        // Add data to downloadable Array
-        this.downloadPackets.push({
-          received: receivedTime,
-          sampleNum: this.dataPointCount,
-          battRaw: 0,
-          samples: [convertedData],
-          masses: [numericData],
-        })
-
-        // Update peak
-        this.peak = Math.max(this.peak, numericData)
-
-        // Update running sum and count
         const currentMassTotal = Math.max(-1000, numericData)
+
+        // Update session stats before building packet
+        this.peak = Math.max(this.peak, numericData)
+        this.min = Math.min(this.min, Math.max(-1000, numericData))
         this.sum += currentMassTotal
         this.dataPointCount++
-
-        // Calculate the average dynamically
         this.mean = this.sum / this.dataPointCount
 
+        // Add data to downloadable Array
+        this.downloadPackets.push(
+          this.buildDownloadPacket(currentMassTotal, [convertedData], {
+            timestamp: receivedTime,
+            sampleIndex: this.dataPointCount,
+          }),
+        )
+
         // Check if device is being used
         this.activityCheck(numericData)
 
         // Notify with weight data
-        this.notifyCallback(this.buildForceMeasurement(Math.max(-1000, numericData)))
+        this.notifyCallback(this.buildForceMeasurement(currentMassTotal))
       }
     }
   }

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

@@ -190,16 +190,15 @@ export class ForceBoard extends Device implements IForceBoard {
    */
   override handleNotifications = (value: DataView): void => {
     if (value) {
-      // Update timestamp
       this.updateTimestamp()
       if (value.buffer) {
         const receivedTime: number = Date.now()
         const dataArray = new Uint8Array(value.buffer)
 
-        // First two bytes contain the number of samples in the packet
         const numSamples = (dataArray[0] << 8) | dataArray[1]
+        this.currentSamplesPerPacket = numSamples
+        this.recordPacketReceived()
 
-        // Process each sample (3 bytes per sample)
         for (let i = 0; i < numSamples; i++) {
           const offset = 2 + i * 3 // Skip the first 2 bytes which indicate number of samples
           if (offset + 2 < dataArray.length) {
@@ -207,31 +206,28 @@ export class ForceBoard extends Device implements IForceBoard {
             const receivedData = dataArray[offset] * 32768 + dataArray[offset + 1] * 256 + dataArray[offset + 2]
             // Tare correction
             const numericData = receivedData - this.applyTare(receivedData)
-            // Add data to downloadable Array (raw and tare-adjusted, both in LBS)
-            this.downloadPackets.push({
-              received: receivedTime,
-              sampleNum: this.dataPointCount,
-              battRaw: 0,
-              samples: [receivedData],
-              masses: [numericData],
-            })
+            const currentMassTotal = Math.max(-1000, numericData)
 
-            // Update peak
+            // Update session stats before building packet
             this.peak = Math.max(this.peak, numericData)
-
-            // Update running sum and count
-            const currentMassTotal = Math.max(-1000, numericData)
+            this.min = Math.min(this.min, Math.max(-1000, numericData))
             this.sum += currentMassTotal
             this.dataPointCount++
-
-            // Calculate the average dynamically
             this.mean = this.sum / this.dataPointCount
 
+            // Add data to downloadable Array (raw and tare-adjusted, both in LBS)
+            this.downloadPackets.push(
+              this.buildDownloadPacket(currentMassTotal, [receivedData], {
+                timestamp: receivedTime,
+                sampleIndex: this.dataPointCount,
+              }),
+            )
+
             // Check if device is being used
             this.activityCheck(numericData)
 
             // Notify with weight data
-            this.notifyCallback(this.buildForceMeasurement(Math.max(-1000, numericData)))
+            this.notifyCallback(this.buildForceMeasurement(currentMassTotal))
           }
         }
       }
@@ -268,7 +264,7 @@ export class ForceBoard extends Device implements IForceBoard {
    * @returns {Promise<void>} A promise that resolves when the streaming operation is completed.
    */
   stream = async (duration = 0): Promise<void> => {
-    // Start streaming data - Streaming Data Mode
+    this.resetPacketTracking()
     await this.write("weight", "tx", this.commands.START_WEIGHT_MEAS, duration)
   }
 

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

@@ -1,6 +1,5 @@
 import { Device } from "../device.model.js"
 import type { IMotherboard } from "../../interfaces/device/motherboard.interface.js"
-import type { DownloadPacket } from "../../interfaces/download.interface.js"
 
 /**
  * Represents a Griptonite Motherboard device.
@@ -235,18 +234,22 @@ export class Motherboard extends Device implements IMotherboard {
 
           // Handle streaming packet
           if (isAllHex && receivedData.length === Motherboard.packetLength) {
+            this.currentSamplesPerPacket = Motherboard.samplesNumber
+            this.recordPacketReceived()
             // Base-16 decode the string: convert hex pairs to byte values
             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
-            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),
-              samples: [],
-              masses: [],
+            const sampleIndex = new DataView(new Uint8Array(bytes).buffer).getUint16(0, true)
+            const battRaw = new DataView(new Uint8Array(bytes).buffer).getUint16(2, true)
+            const packet = {
+              timestamp: receivedTime,
+              sampleIndex,
+              battRaw,
+              samples: [] as number[],
+              forces: [] as number[],
             }
 
             const dataView = new DataView(new Uint8Array(bytes).buffer)
@@ -265,24 +268,15 @@ export class Motherboard extends Device implements IMotherboard {
               if (packet.samples[i] >= 0x7fffff) {
                 packet.samples[i] -= 0x1000000
               }
-              packet.masses[i] = this.applyCalibration(packet.samples[i], this.calibrationData[i])
+              packet.forces[i] = this.applyCalibration(packet.samples[i], this.calibrationData[i])
             }
             // invert center and right values
-            packet.masses[1] *= -1
-            packet.masses[2] *= -1
-
-            // Add data to downloadable Array
-            this.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]
+            packet.forces[1] *= -1
+            packet.forces[2] *= -1
+
+            let left: number = packet.forces[0]
+            let center: number = packet.forces[1]
+            let right: number = packet.forces[2]
 
             // Tare correction
             left -= this.applyTare(left)
@@ -294,9 +288,9 @@ export class Motherboard extends Device implements IMotherboard {
             const centerClamped = Math.max(-1000, center)
             const rightClamped = Math.max(-1000, right)
 
+            // Update session stats before building packet
             this.peak = Math.max(this.peak, totalCurrent)
-
-            // Update running sum and count (total)
+            this.min = Math.min(this.min, totalCurrent)
             this.sum += totalCurrent
             this.dataPointCount++
             this.mean = this.sum / this.dataPointCount
@@ -309,6 +303,24 @@ export class Motherboard extends Device implements IMotherboard {
             this.rightPeak = Math.max(this.rightPeak, rightClamped)
             this.rightSum += rightClamped
 
+            // Add data to downloadable Array (distribution = per-zone measurements)
+            this.downloadPackets.push(
+              this.buildDownloadPacket(totalCurrent, [...packet.samples], {
+                timestamp: packet.timestamp,
+                battRaw: packet.battRaw,
+                sampleIndex: packet.sampleIndex,
+                distribution: {
+                  left: this.buildZoneMeasurement(leftClamped, this.leftPeak, this.leftSum / this.dataPointCount),
+                  center: this.buildZoneMeasurement(
+                    centerClamped,
+                    this.centerPeak,
+                    this.centerSum / this.dataPointCount,
+                  ),
+                  right: this.buildZoneMeasurement(rightClamped, this.rightPeak, this.rightSum / this.dataPointCount),
+                },
+              }),
+            )
+
             // Check if device is being used
             this.activityCheck(center)
 
@@ -400,7 +412,7 @@ export class Motherboard extends Device implements IMotherboard {
    * @returns {Promise<void>} A promise that resolves when the streaming operation is completed.
    */
   stream = async (duration = 0): Promise<void> => {
-    // Reset download packets
+    this.resetPacketTracking()
     this.downloadPackets.length = 0
     // Read calibration data if not already available
     if (!this.calibrationData[0].length) {

package/src/models/device/pb-700bt.model.ts

@@ -164,13 +164,14 @@ export class PB700BT extends Device {
    */
   override handleNotifications = (value: DataView): void => {
     if (value) {
-      // Update timestamp
       this.updateTimestamp()
       if (value.buffer) {
         const period = value.getUint32(0, false)
 
         if (!Number.isFinite(period) || period === 0) return
 
+        this.currentSamplesPerPacket = 1
+        this.recordPacketReceived()
         const ts = value.getUint32(4, false)
 
         const rpmFloat = 60 * (666666 / period)
@@ -183,31 +184,28 @@ export class PB700BT extends Device {
 
         const numericData = receivedData - this.applyTare(receivedData)
 
-        // Add data to downloadable Array
-        this.downloadPackets.push({
-          received: receivedTime,
-          sampleNum: ts,
-          battRaw: 0,
-          samples: [numericData],
-          masses: [numericData],
-        })
+        const currentMassTotal = Math.max(-1000, numericData)
 
-        // Update peak
+        // Update session stats before building packet
         this.peak = Math.max(this.peak, numericData)
-
-        // Update running sum and count
-        const currentMassTotal = Math.max(-1000, numericData)
+        this.min = Math.min(this.min, Math.max(-1000, numericData))
         this.sum += currentMassTotal
         this.dataPointCount++
-
-        // Calculate the average dynamically
         this.mean = this.sum / this.dataPointCount
 
+        // Add data to downloadable Array
+        this.downloadPackets.push(
+          this.buildDownloadPacket(currentMassTotal, [numericData], {
+            timestamp: receivedTime,
+            sampleIndex: ts,
+          }),
+        )
+
         // Check if device is being used
         this.activityCheck(numericData)
 
         // Notify with weight data
-        this.notifyCallback(this.buildForceMeasurement(Math.max(-1000, numericData)))
+        this.notifyCallback(this.buildForceMeasurement(currentMassTotal))
       }
     }
   }