@hangtime/grip-connect 0.10.9 → 0.13.0

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

@@ -169,11 +169,9 @@ export class Entralpi extends Device implements IEntralpi {
         const receivedData: string = (value.getUint16(0) / 100).toFixed(1)
 
         const convertedData = Number(receivedData)
-        // Adjust weight by using the tare value
-        // If tare is 0, use the original weight, otherwise subtract tare and invert.
-        // This will display the removed or 'no-hanging' weight.
-        const tare = this.applyTare(convertedData)
-        const numericData = tare === 0 ? convertedData : (convertedData - tare) * -1
+        // Adjust weight by using the tare value.
+        // Keep stream output consistent with other devices: positive load after tare.
+        const numericData = convertedData - this.applyTare(convertedData)
         const currentMassTotal = Math.max(-1000, numericData)
 
         // Update session stats before building packet

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

@@ -1,11 +1,11 @@
-import { Device } from "../device.model.js"
+import { NordicDfuDevice, createNordicDfuService } from "../nordic.model.js"
 import type { IForceBoard } from "../../interfaces/device/forceboard.interface.js"
 
 /**
  * Represents a PitchSix Force Board device.
  * {@link https://pitchsix.com}
  */
-export class ForceBoard extends Device implements IForceBoard {
+export class ForceBoard extends NordicDfuDevice implements IForceBoard {
   protected override streamUnit = "lbs" as const
 
   constructor() {
@@ -46,18 +46,7 @@ export class ForceBoard extends Device implements IForceBoard {
             },
           ],
         },
-        {
-          name: "Nordic Device Firmware Update (DFU) Service",
-          id: "dfu",
-          uuid: "0000fe59-0000-1000-8000-00805f9b34fb",
-          characteristics: [
-            {
-              name: "Buttonless DFU",
-              id: "dfu",
-              uuid: "8ec90003-f315-4f60-9fb8-838830daea50",
-            },
-          ],
-        },
+        createNordicDfuService(),
         {
           name: "",
           id: "",

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

@@ -1,4 +1,4 @@
-import { Device } from "../device.model.js"
+import { NordicDfuDevice, createNordicDfuService } from "../nordic.model.js"
 import type { IProgressor } from "../../interfaces/device/progressor.interface.js"
 
 /**
@@ -66,9 +66,8 @@ function parseProgressorIdPayload(payload: Uint8Array): string {
 }
 
 /**
- * Parse calibration curve: 12 opaque bytes (CalibrationCurve = [u8; 12]).
- * Progressor two-point calibration stores two raw ADC readings (zero + reference)
- * and a third value (version/reserved). Exact layout is device-specific.
+ * Parse calibration block: 3× float32 LE.
+ * value = raw * slope + intercept + trim.
  */
 function parseCalibrationCurvePayload(payload: Uint8Array): string {
   const hex = toHex(payload)
@@ -76,14 +75,49 @@ function parseCalibrationCurvePayload(payload: Uint8Array): string {
   if (payload.length !== 12) return hex
 
   const view = new DataView(payload.buffer, payload.byteOffset, payload.byteLength)
-  const [v0, v1, v2] = [0, 4, 8].map((o) => view.getUint32(o, true))
+  const slope = view.getFloat32(0, true)
+  const intercept = view.getFloat32(4, true)
+  const trim = view.getFloat32(8, true)
+  const effectiveOffset = intercept + trim
+
+  const formatSignedFloat = (value: number): string => {
+    const formatted = formatCalibrationFloat(Math.abs(value))
+    return value < 0 ? ` - ${formatted}` : ` + ${formatted}`
+  }
+
+  return `${hex} — slope: ${formatCalibrationFloat(slope)} | intercept: ${formatCalibrationFloat(intercept)} | trim: ${formatCalibrationFloat(trim)} | effective offset: ${formatCalibrationFloat(effectiveOffset)} | formula: raw * ${formatCalibrationFloat(slope)}${formatSignedFloat(intercept)}${formatSignedFloat(trim)}`
+}
 
-  return `${hex} — 1: ${v1.toLocaleString()} | 2: ${v0.toLocaleString()} | 3: ${v2}`
+/**
+ * Format floating-point values for calibration-table display.
+ */
+function formatCalibrationFloat(value: number): string {
+  if (!Number.isFinite(value)) return String(value)
+  const abs = Math.abs(value)
+  return abs !== 0 && (abs >= 1_000_000 || abs < 0.0001) ? value.toExponential(6) : value.toFixed(6)
 }
 
-export class Progressor extends Device implements IProgressor {
+/**
+ * Parse one calibration table record: [u32 lower, u32 upper, f32 slope, f32 intercept].
+ */
+function parseCalibrationTableRecordPayload(payload: Uint8Array, index: number): string {
+  if (payload.length !== 16) return `${String(index).padStart(2, "0")}: ${toHex(payload)}`
+
+  const view = new DataView(payload.buffer, payload.byteOffset, payload.byteLength)
+  const lowerRaw = view.getUint32(0, true)
+  const upperRaw = view.getUint32(4, true)
+  const slope = view.getFloat32(8, true)
+  const intercept = view.getFloat32(12, true)
+  const hex = toHex(payload)
+
+  return `${String(index).padStart(2, "0")}: ${hex} | raw ${lowerRaw.toLocaleString()}..${upperRaw.toLocaleString()} | slope ${formatCalibrationFloat(slope)} | intercept ${formatCalibrationFloat(intercept)}`
+}
+
+export class Progressor extends NordicDfuDevice implements IProgressor {
   /** Device timestamps (µs) of recent samples (samples in last 1s device time). */
   private recentSampleTimestamps: number[] = []
+  /** 1-based index for multi-packet calibration-table export responses. */
+  private calibrationTableRecordIndex = 0
 
   constructor() {
     super({
@@ -106,20 +140,9 @@ export class Progressor extends Device implements IProgressor {
             },
           ],
         },
-        {
-          name: "Nordic Device Firmware Update (DFU) Service",
-          id: "dfu",
-          uuid: "0000fe59-0000-1000-8000-00805f9b34fb",
-          characteristics: [
-            {
-              name: "Buttonless DFU",
-              id: "dfu",
-              uuid: "8ec90003-f315-4f60-9fb8-838830daea50",
-            },
-          ],
-        },
+        createNordicDfuService(),
       ],
-      // Tindeq API: opcode = single byte (ASCII char code = decimal 100–114;)
+      // Tindeq API: opcode = single byte (ASCII char code = decimal 100–114 v2 firmware: 115-118)
       commands: {
         TARE_SCALE: "d", // 100 (0x64)
         START_WEIGHT_MEAS: "e", // 101 (0x65)
@@ -136,6 +159,11 @@ export class Progressor extends Device implements IProgressor {
         GET_PROGRESSOR_ID: "p", // 112 (0x70)
         SET_CALIBRATION: "q", // 113 (0x71)
         GET_CALIBRATION: "r", // 114 (0x72)
+        // V2 FIRMWARE ONLY COMMANDS
+        // ADD_CALIBRATION_TABLE_POINT: "s",  // 115 (0x73)
+        GET_CALIBRATION_TABLE: "t", // 116 (0x74)
+        REBOOT: "u", // 117 (0x75)
+        // CLR_CALIBRATION_TABLE: "v",  // 118 (0x76)
       },
     })
   }
@@ -153,7 +181,7 @@ export class Progressor extends Device implements IProgressor {
   }
 
   /**
-   * Retrieves firmware version from the device (GetAppVersion, opcode 0x6B).
+   * Retrieves firmware version from the device.
    * @returns {Promise<string>} A Promise that resolves with the firmware version,
    */
   firmware = async (): Promise<string | undefined> => {
@@ -165,7 +193,7 @@ export class Progressor extends Device implements IProgressor {
   }
 
   /**
-   * Retrieves the Progressor ID from the device (opcode 0x70).
+   * Retrieves the Progressor ID from the device.
    * @returns {Promise<string>} A Promise that resolves with the raw response (hex of payload).
    */
   progressorId = async (): Promise<string | undefined> => {
@@ -177,8 +205,8 @@ export class Progressor extends Device implements IProgressor {
   }
 
   /**
-   * Retrieves calibration values from the device.
-   * @returns {Promise<string>} A Promise that resolves with the raw response (hex of payload).
+   * Retrieves the linear calibration block from the device.
+   * Returns raw hex plus decoded slope/intercept/trim coefficients.
    */
   calibration = async (): Promise<string | undefined> => {
     let response: string | undefined = undefined
@@ -189,7 +217,21 @@ export class Progressor extends Device implements IProgressor {
   }
 
   /**
-   * Computes calibration curve from stored points and saves to flash (opcode 0x6A).
+   * Retrieves the hidden 15-entry piecewise calibration table.
+   * Each response packet contains one 16-byte record.
+   * @returns {Promise<string | undefined>} Newline-separated decoded records.
+   */
+  calibrationTable = async (): Promise<string | undefined> => {
+    const responses: string[] = []
+    this.calibrationTableRecordIndex = 0
+    await this.write("progressor", "tx", this.commands.GET_CALIBRATION_TABLE, 1000, (data) => {
+      responses.push(data)
+    })
+    return responses.length > 0 ? responses.join("\n") : undefined
+  }
+
+  /**
+   * Computes calibration curve from stored points and saves to flash.
    * Requires addCalibrationPoint() for zero and reference. Normal flow: i → i → j.
    * @returns {Promise<void>} A Promise that resolves when the command is sent.
    */
@@ -198,24 +240,24 @@ export class Progressor extends Device implements IProgressor {
   }
 
   /**
-   * Opcode 0x71 ('q'): write calibration curve directly (raw overwrite).
+   * Write calibration block directly (raw overwrite).
    *
    * Payload layout (14 bytes):
-   * - [0]   opcode ('q' = 0x71)
+   * - [0]   opcode ('q')
    * - [1]   reserved (ignored by firmware)
-   * - [2..13] 12-byte calibration curve (3× u32 LE read at offsets +2, +6, +10)
+   * - [2..13] 12-byte calibration block (3× float32 LE: slope, intercept, trim)
    *
    * Notes:
    * - This command does not compute anything; it overwrites stored calibration data.
-   * - Sending only the opcode (no 12-byte curve) is not a supported "reset" mode.
+   * - Sending only the opcode (no 12-byte calibration block) is not a supported "reset" mode.
    *
-   * @param curve - Raw 12-byte calibration curve (required).
+   * @param curve - Raw 12-byte calibration block (3× float32 LE: slope, intercept, trim) (required).
    * @returns Promise that resolves when the command is sent.
    */
   setCalibration = async (curve: Uint8Array): Promise<void> => {
     if (curve.length !== 12) throw new Error("Curve must be 12 bytes")
 
-    const opcode = (this.commands.SET_CALIBRATION as string).charCodeAt(0) // 0x71
+    const opcode = (this.commands.SET_CALIBRATION as string).charCodeAt(0)
     const payload = new Uint8Array(14)
 
     payload[0] = opcode
@@ -269,6 +311,16 @@ export class Progressor extends Device implements IProgressor {
     await this.write("progressor", "tx", typeof cmd === "string" ? cmd : String(cmd), 0)
   }
 
+  /**
+   * Reboots the device immediately.
+   * @returns {Promise<void>} A Promise that resolves when the command is sent.
+   */
+  reboot = async (): Promise<void> => {
+    const opcode = (this.commands.REBOOT as string).charCodeAt(0)
+    // Send byte 1 to trigger the reboot.
+    await this.write("progressor", "tx", new Uint8Array([opcode, 0, 1]), 0)
+  }
+
   /**
    * Retrieves error information from the device.
    * @returns {Promise<string | undefined>} A Promise that resolves with the error info text.
@@ -364,6 +416,9 @@ export class Progressor extends Device implements IProgressor {
         output = parseProgressorIdPayload(payload)
       } else if (this.writeLast === this.commands.GET_CALIBRATION) {
         output = parseCalibrationCurvePayload(payload)
+      } else if (this.writeLast === this.commands.GET_CALIBRATION_TABLE) {
+        this.calibrationTableRecordIndex += 1
+        output = parseCalibrationTableRecordPayload(payload, this.calibrationTableRecordIndex)
       } else {
         // Unknown command response: return raw hex
         output = toHex(payload)

package/src/models/device.model.ts

@@ -213,6 +213,14 @@ export abstract class Device extends BaseModel implements IDevice {
    */
   private tareActive = false
 
+  /**
+   * The characteristic ID that accepts notifications.
+   * Switching to "buttonless" allows to enter DFU mode and update the firmware.
+   *
+   * @type {"rx" | "buttonless" | "control"}
+   */
+  protected notifyCharacteristicId: "rx" | "buttonless" = "rx"
+
   /**
    * Timestamp when the tare calibration process started.
    * @type {number | null}
@@ -562,10 +570,12 @@ export abstract class Device extends BaseModel implements IDevice {
       //   }
       // }
 
-      this.bluetooth = await bluetooth.requestDevice({
-        filters: this.filters,
-        optionalServices: deviceServices,
-      })
+      if (!this.bluetooth?.gatt) {
+        this.bluetooth = await bluetooth.requestDevice({
+          filters: this.filters,
+          optionalServices: deviceServices,
+        })
+      }
 
       if (!this.bluetooth.gatt) {
         throw new Error("GATT is not available on this device")
@@ -573,7 +583,7 @@ export abstract class Device extends BaseModel implements IDevice {
 
       this.bluetooth.addEventListener("gattserverdisconnected", this.onDisconnectedListener)
 
-      this.server = await this.bluetooth.gatt.connect()
+      this.server = this.bluetooth.gatt.connected ? this.bluetooth.gatt : await this.bluetooth.gatt.connect()
 
       if (this.server.connected) {
         await this.onConnected(onSuccess)
@@ -596,31 +606,39 @@ export abstract class Device extends BaseModel implements IDevice {
    * device.disconnect();
    */
   disconnect = (): void => {
-    if (this.isConnected()) {
+    const isConnected = this.isConnected()
+    if (isConnected) {
       this.updateTimestamp()
-      // Remove all notification listeners
-      this.services.forEach((service) => {
-        service.characteristics.forEach((char) => {
-          // Look for the "rx" characteristic that accepts notifications
-          if (char.characteristic && char.id === "rx") {
-            char.characteristic.stopNotifications()
-            const listener = this.notificationListeners.get(char.uuid)
-            if (listener) {
-              char.characteristic.removeEventListener("characteristicvaluechanged", listener)
-              this.notificationListeners.delete(char.uuid)
-            }
-          }
-        })
+    }
+
+    // Remove all notification listeners and stop notifications if possible.
+    this.services.forEach((service) => {
+      service.characteristics.forEach((char) => {
+        if (!char.characteristic || char.id !== this.notifyCharacteristicId) return
+
+        if (isConnected) {
+          // Best effort only: avoid unhandled rejections when the device already disconnected.
+          void char.characteristic.stopNotifications().catch(() => undefined)
+        }
+
+        const listener = this.notificationListeners.get(char.uuid)
+        if (listener) {
+          char.characteristic.removeEventListener("characteristicvaluechanged", listener)
+          this.notificationListeners.delete(char.uuid)
+        }
       })
-      // Remove disconnect listener
-      this.bluetooth?.removeEventListener("gattserverdisconnected", this.onDisconnectedListener)
-      // Safely attempt to disconnect the device's GATT server, if available
-      this.bluetooth?.gatt?.disconnect()
-      // Reset properties
-      this.server = undefined
-      this.writeLast = null
-      this.isActive = false
+    })
+
+    // Remove disconnect listener
+    this.bluetooth?.removeEventListener("gattserverdisconnected", this.onDisconnectedListener)
+    // Safely attempt to disconnect the device's GATT server, if available
+    if (this.bluetooth?.gatt?.connected) {
+      this.bluetooth.gatt.disconnect()
     }
+    // Reset properties
+    this.server = undefined
+    this.writeLast = null
+    this.isActive = false
   }
 
   /**
@@ -890,7 +908,9 @@ export abstract class Device extends BaseModel implements IDevice {
     }
 
     for (const service of services) {
-      const matchingService = this.services.find((boardService) => boardService.uuid === service.uuid)
+      const matchingService = this.services.find(
+        (boardService) => boardService.uuid.toLowerCase() === service.uuid.toLowerCase(),
+      )
 
       if (matchingService) {
         // Android bug: Add a small delay before getting characteristics
@@ -899,16 +919,20 @@ export abstract class Device extends BaseModel implements IDevice {
         const characteristics = await service.getCharacteristics()
 
         for (const characteristic of matchingService.characteristics) {
-          const matchingCharacteristic = characteristics.find((char) => char.uuid === characteristic.uuid)
+          const matchingCharacteristic = characteristics.find(
+            (char) => char.uuid.toLowerCase() === characteristic.uuid.toLowerCase(),
+          )
 
           if (matchingCharacteristic) {
             // Find the corresponding characteristic descriptor in the service's characteristics array
-            const descriptor = matchingService.characteristics.find((char) => char.uuid === matchingCharacteristic.uuid)
+            const descriptor = matchingService.characteristics.find(
+              (char) => char.uuid.toLowerCase() === matchingCharacteristic.uuid.toLowerCase(),
+            )
             if (descriptor) {
               // Assign the actual Bluetooth characteristic object to the descriptor so it can be used later
               descriptor.characteristic = matchingCharacteristic
-              // Look for the "rx" characteristic id that accepts notifications
-              if (descriptor.id === "rx") {
+              // Look for our default notify characteristic id that accepts notifications
+              if (descriptor.id === this.notifyCharacteristicId) {
                 // Start receiving notifications for changes on this characteristic
                 matchingCharacteristic.startNotifications()
                 // Triggered when the characteristic's value changes
@@ -926,6 +950,10 @@ export abstract class Device extends BaseModel implements IDevice {
                 this.notificationListeners.set(descriptor.uuid, listener)
               }
             }
+          } else if (matchingService.id === "dfu") {
+            // App mode exposes buttonless only, bootloader exposes control+packet only.
+            delete characteristic.characteristic
+            continue
           } else {
             throw new Error(`Characteristic ${characteristic.uuid} not found in service ${service.uuid}`)
           }

package/src/models/index.ts

@@ -1,9 +1,13 @@
 export { Climbro } from "./device/climbro.model.js"
 
+export { CTS500 } from "./device/cts500.model.js"
+
 export { Entralpi } from "./device/entralpi.model.js"
 
 export { ForceBoard } from "./device/forceboard.model.js"
 
+export { NordicDfuDevice, createNordicDfuService } from "./nordic.model.js"
+
 export { KilterBoard, KilterBoardPlacementRoles } from "./device/kilterboard.model.js"
 
 export { Motherboard } from "./device/motherboard.model.js"