@hangtime/grip-connect 0.2.0 → 0.2.3

package/README.md

@@ -4,47 +4,16 @@
 
 The objective of this project is to create a Web Bluetooth API client that can establish connections with various
 Force-Sensing Hangboards / Plates used by climbers for strength measurement. Examples of such hangboards include the
-[Motherboard](https://griptonite.io/shop/motherboard/), [Climbro](https://climbro.com/),
+[Griptonite Motherboard](https://griptonite.io/shop/motherboard/), [Climbro](https://climbro.com/),
 [SmartBoard](https://www.smartboard-climbing.com/), [Entralpi](https://entralpi.com/) or
 [Tindeq Progressor](https://tindeq.com/)
 
-[Try it out](https://grip-connect.vercel.app/) - [Docs](https://stevie-ray.github.io/hangtime-grip-connect/) -
+Learn more: [Docs](https://stevie-ray.github.io/hangtime-grip-connect/) -
 [Browser Support](https://caniuse.com/web-bluetooth)
 
-## Roadmap
-
-**Help wanted:** Do you own any of these devices? Use Google Chrome's Bluetooth Internals
-`chrome://bluetooth-internals/#devices` and press `Start Scan` to look for your device, click on `Inspect` and share all
-available services with us.
-
-- ✅ Griptonite Motherboard
-  - ✅️ Connect with devices
-  - ✅️ Read / Write / Notify using Bluetooth
-  - ✅️ Output weight/force stream
-- ✅ Tindeq Progressor
-  - ✅️ Connect with devices
-  - ✅️ Read / Write / Notify using Bluetooth
-  - ✅️ Output weight/force stream
-- ✅ Entralpi
-  - ✅️ Connect with devices
-  - ✅️ Read / Write / Notify using Bluetooth
-  - ✅️️ Output weight/force stream
-- ➡️ Climbro
-  - ➡️ Connect with devices
-  - ➡️ Read / Write / Notify using Bluetooth
-  - ➡️ Output weight/force stream
-- ➡️ SmartBoard
-  - ➡️ Connect with devices
-  - ➡️ Read / Write / Notify using Bluetooth
-  - ➡️ Output weight/force stream
-
-## Development
+## Try it out
 
-```bash
-git clone https://github.com/Stevie-Ray/hangtime-grip-connect
-cd hangtime-grip-connect
-npm install
-```
+[Chart](https://grip-connect.vercel.app/) - [Flappy Bird](https://grip-connect-flappy-bird.vercel.app/)
 
 ## Install
 
@@ -89,18 +58,59 @@ motherboardButton.addEventListener("click", () => {
 })
 ```
 
+## Roadmap
+
+**Help wanted:** Do you own any of these devices? Use Google Chrome's Bluetooth Internals
+`chrome://bluetooth-internals/#devices` and press `Start Scan` to look for your device, click on `Inspect` and share all
+available services with us.
+
+### Device support
+
+- ✅ Griptonite Motherboard
+- ✅ Tindeq Progressor
+- ✅ Entralpi
+- ➡️ Climbro
+- ➡️ SmartBoard
+
+### Features
+
+- ✅ Connect
+- ✅ Disconnect
+- ✅ Start data stream (live data)
+- ✅ Stop data stream
+- ✅ Battery status
+- ✅ Read calibration
+- ✅ Device info (firmware / serial etc.)
+- ✅ Check if device is connected
+- ➡️ Peak load
+- ➡️ Endurance
+- ➡️ Rate of Force Development (RFD)
+- ➡️ Repeaters
+- ➡️ Critical Force
+
+## Development
+
+```bash
+git clone https://github.com/Stevie-Ray/hangtime-grip-connect
+cd hangtime-grip-connect
+npm install
+```
+
 ## Credits
 
 A special thank you to:
 
 - [@CassimLadha](https://github.com/CassimLadha) for sharing insights on reading the Motherboards data.
-- [@donaldharvey](https://github.com/donaldharvey) for a valuable example on connecting to the motherboard.
-- [@ecstrema](https://github.com/ecstrema) for providing an example on how to play games with the entralpi.
+- [@donaldharvey](https://github.com/donaldharvey) for a valuable example on connecting to the Motherboard.
+- [@ecstrema](https://github.com/ecstrema) for providing [examples](https://github.com/ecstrema/entralpi-games) on how
+  to play games with the Entralpi.
+- [@StuartLittlefair](https://github.com/StuartLittlefair) for his
+  [PyTindeq](https://github.com/StuartLittlefair/PyTindeq) implementation.
 
-## Disclamer
+## Disclaimer
 
-THIS SOFTWARE IS NOT OFFICIALY SUPPORTED, SUPPLIED OR MAINTAINED BY THE DEVICE MANUFACTURER. BY USING THE SOFTWARE YOU
-ARE ACKNOWLEDGEING THIS AND UNDERSTAND THAT USING THIS SOFTWARE WILL INVALIDATE THE MANUFACTURERS WARRANTY.
+THIS SOFTWARE IS NOT OFFICIALLY SUPPORTED, SUPPLIED OR MAINTAINED BY THE DEVICE MANUFACTURER. BY USING THE SOFTWARE YOU
+ARE ACKNOWLEDGING THIS AND UNDERSTAND THAT USING THIS SOFTWARE WILL INVALIDATE THE MANUFACTURERS WARRANTY.
 
 ## License
 

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@hangtime/grip-connect",
-  "version": "0.2.0",
-  "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",
+  "version": "0.2.3",
+  "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 Griptonite Motherboard, Climbro, SmartBoard, Entralpi or Tindeq Progressor",
   "main": "src/index.ts",
   "scripts": {
     "build": "tsc --build"
   },
   "author": "Stevie-Ray Hartog <mail@stevie-ray.nl>",
   "license": "BSD-2-Clause",
-  "devDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Stevie-Ray/hangtime-grip-connect.git"
@@ -25,5 +24,8 @@
   "bugs": {
     "url": "https://github.com/Stevie-Ray/hangtime-grip-connect/issues"
   },
-  "homepage": "https://stevie-ray.github.io/hangtime-grip-connect/"
+  "homepage": "https://stevie-ray.github.io/hangtime-grip-connect/",
+  "dependencies": {
+    "@aksel/structjs": "^1.0.0"
+  }
 }

package/src/battery.js

@@ -1,8 +1,8 @@
 import { write } from "./write";
 import { read } from "./read";
 import { isConnected } from "./is-connected";
-import { Motherboard, Tindeq } from "./devices";
-import { TindeqCommands } from "./commands";
+import { Motherboard, Progressor } from "./devices";
+import { ProgressorCommands } from "./commands";
 /**
  * Get Battery / Voltage information
  * @param board
@@ -12,8 +12,8 @@ export const battery = async (board) => {
         if (board.name === "Motherboard") {
             await read(Motherboard, "battery", "level", 250);
         }
-        if (board.name === "Tindeq") {
-            await write(Tindeq, "progressor", "tx", String(TindeqCommands.GET_BATT_VLTG), 250);
+        if (board.name && board.name.startsWith("Progressor")) {
+            await write(Progressor, "progressor", "tx", ProgressorCommands.GET_BATT_VLTG, 250);
         }
     }
 };

package/src/battery.ts

@@ -2,8 +2,8 @@ import { Device } from "./devices/types"
 import { write } from "./write"
 import { read } from "./read"
 import { isConnected } from "./is-connected"
-import { Motherboard, Tindeq } from "./devices"
-import { TindeqCommands } from "./commands"
+import { Motherboard, Progressor } from "./devices"
+import { ProgressorCommands } from "./commands"
 
 /**
  * Get Battery / Voltage information
@@ -14,8 +14,8 @@ export const battery = async (board: Device): Promise<void> => {
     if (board.name === "Motherboard") {
       await read(Motherboard, "battery", "level", 250)
     }
-    if (board.name === "Tindeq") {
-      await write(Tindeq, "progressor", "tx", String(TindeqCommands.GET_BATT_VLTG), 250)
+    if (board.name && board.name.startsWith("Progressor")) {
+      await write(Progressor, "progressor", "tx", ProgressorCommands.GET_BATT_VLTG, 250)
     }
   }
 }

package/src/calibration.js

@@ -9,7 +9,7 @@ import { MotherboardCommands } from "./commands";
 export const calibration = async (board) => {
     if (isConnected(board)) {
         if (board.name === "Motherboard") {
-            await write(Motherboard, "uart", "tx", String(MotherboardCommands.GET_CALIBRATION), 2500);
+            await write(Motherboard, "uart", "tx", MotherboardCommands.GET_CALIBRATION, 2500);
         }
     }
 };

package/src/calibration.ts

@@ -11,7 +11,7 @@ import { MotherboardCommands } from "./commands"
 export const calibration = async (board: Device): Promise<void> => {
   if (isConnected(board)) {
     if (board.name === "Motherboard") {
-      await write(Motherboard, "uart", "tx", String(MotherboardCommands.GET_CALIBRATION), 2500)
+      await write(Motherboard, "uart", "tx", MotherboardCommands.GET_CALIBRATION, 2500)
     }
   }
 }

package/src/commands/index.d.ts

@@ -1,5 +1,5 @@
 export { ClimbroCommands } from "./climbro";
 export { EntralpiCommands } from "./entralpi";
 export { MotherboardCommands } from "./motherboard";
+export { ProgressorCommands } from "./progressor";
 export { SmartBoardCommands } from "./smartboard";
-export { TindeqCommands } from "./tindeq";

package/src/commands/index.js

@@ -1,5 +1,5 @@
 export { ClimbroCommands } from "./climbro";
 export { EntralpiCommands } from "./entralpi";
 export { MotherboardCommands } from "./motherboard";
+export { ProgressorCommands } from "./progressor";
 export { SmartBoardCommands } from "./smartboard";
-export { TindeqCommands } from "./tindeq";

package/src/commands/index.ts

@@ -4,6 +4,6 @@ export { EntralpiCommands } from "./entralpi"
 
 export { MotherboardCommands } from "./motherboard"
 
-export { SmartBoardCommands } from "./smartboard"
+export { ProgressorCommands } from "./progressor"
 
-export { TindeqCommands } from "./tindeq"
+export { SmartBoardCommands } from "./smartboard"

package/src/commands/{tindeq.d.ts → progressor.d.ts}

@@ -3,8 +3,12 @@ import { Commands } from "../commands/types";
  * Warning:
  * Using other commands can seriously harm your device
  */
-export declare const TindeqCommands: Commands;
-export declare const NotificationTypes: {
+export declare const ProgressorCommands: Commands;
+/**
+ * The Progressor returns a Uint8Array.
+ * The first item [0] is the type of response it returns
+ */
+export declare const ProgressorResponses: {
     COMMAND_RESPONSE: number;
     WEIGHT_MEASURE: number;
     LOW_BATTERY_WARNING: number;

package/src/commands/{tindeq.js → progressor.js}

@@ -2,7 +2,7 @@
  * Warning:
  * Using other commands can seriously harm your device
  */
-export const TindeqCommands = {
+export const ProgressorCommands = {
     TARE_SCALE: "d", // 0x64,
     START_WEIGHT_MEAS: "e", // 0x65,
     STOP_WEIGHT_MEAS: "f", // 0x66,
@@ -10,13 +10,17 @@ export const TindeqCommands = {
     START_PEAK_RFD_MEAS_SERIES: "h", //  0x68,
     ADD_CALIB_POINT: "i", //  0x69,
     SAVE_CALIB: "j", //  0x6a,
-    GET_APP_VERSION: "k", //  0x6b,
+    GET_FW_VERSION: "k", //  0x6b,
     GET_ERR_INFO: "l", //  0x6c,
     CLR_ERR_INFO: "m", //  0x6d,
     SLEEP: "n", // 0x6e,
     GET_BATT_VLTG: "o", //  0x6f,
 };
-export const NotificationTypes = {
+/**
+ * The Progressor returns a Uint8Array.
+ * The first item [0] is the type of response it returns
+ */
+export const ProgressorResponses = {
     COMMAND_RESPONSE: 0,
     WEIGHT_MEASURE: 1,
     LOW_BATTERY_WARNING: 2,

package/src/commands/{tindeq.ts → progressor.ts}

@@ -3,7 +3,7 @@ import { Commands } from "../commands/types"
  * Warning:
  * Using other commands can seriously harm your device
  */
-export const TindeqCommands: Commands = {
+export const ProgressorCommands: Commands = {
   TARE_SCALE: "d", // 0x64,
   START_WEIGHT_MEAS: "e", // 0x65,
   STOP_WEIGHT_MEAS: "f", // 0x66,
@@ -11,14 +11,18 @@ export const TindeqCommands: Commands = {
   START_PEAK_RFD_MEAS_SERIES: "h", //  0x68,
   ADD_CALIB_POINT: "i", //  0x69,
   SAVE_CALIB: "j", //  0x6a,
-  GET_APP_VERSION: "k", //  0x6b,
+  GET_FW_VERSION: "k", //  0x6b,
   GET_ERR_INFO: "l", //  0x6c,
   CLR_ERR_INFO: "m", //  0x6d,
   SLEEP: "n", // 0x6e,
   GET_BATT_VLTG: "o", //  0x6f,
 }
 
-export const NotificationTypes = {
+/**
+ * The Progressor returns a Uint8Array.
+ * The first item [0] is the type of response it returns
+ */
+export const ProgressorResponses = {
   COMMAND_RESPONSE: 0,
   WEIGHT_MEASURE: 1,
   LOW_BATTERY_WARNING: 2,

package/src/commands/types.d.ts

@@ -2,8 +2,8 @@ export interface Commands {
     START_WEIGHT_MEAS?: string;
     STOP_WEIGHT_MEAS?: string;
     SLEEP?: number | string;
-    GET_TEXT?: string;
     GET_SERIAL?: string;
+    GET_TEXT?: string;
     DEBUG_STREAM?: string;
     GET_CALIBRATION?: string;
     TARE_SCALE?: string;
@@ -11,7 +11,7 @@ export interface Commands {
     START_PEAK_RFD_MEAS_SERIES?: string;
     ADD_CALIB_POINT?: string;
     SAVE_CALIB?: string;
-    GET_APP_VERSION?: string;
+    GET_FW_VERSION?: string;
     GET_ERR_INFO?: string;
     CLR_ERR_INFO?: string;
     GET_BATT_VLTG?: string;

package/src/commands/types.ts

@@ -1,20 +1,20 @@
 export interface Commands {
-  // Motherboard, Tindeq
+  // Motherboard, Progressor
   START_WEIGHT_MEAS?: string
   STOP_WEIGHT_MEAS?: string
   SLEEP?: number | string
-  // Motherboard
-  GET_TEXT?: string
   GET_SERIAL?: string
+  // Griptonite Motherboard
+  GET_TEXT?: string
   DEBUG_STREAM?: string
   GET_CALIBRATION?: string
-  // Tindeq
+  // Tindeq Progressor
   TARE_SCALE?: string
   START_PEAK_RFD_MEAS?: string
   START_PEAK_RFD_MEAS_SERIES?: string
   ADD_CALIB_POINT?: string
   SAVE_CALIB?: string
-  GET_APP_VERSION?: string
+  GET_FW_VERSION?: string
   GET_ERR_INFO?: string
   CLR_ERR_INFO?: string
   GET_BATT_VLTG?: string

package/src/connect.js

@@ -1,5 +1,5 @@
 import { notifyCallback } from "./notify";
-import { handleMotherboardData } from "./data";
+import { handleMotherboardData, handleProgressorData } from "./data";
 let server;
 const receiveBuffer = [];
 /**
@@ -50,8 +50,12 @@ const handleNotifications = (event, board) => {
                 }
             }
         }
-        else if (board.name === "Tindeq") {
-            // TODO: handle Tindeq notify
+        else if (board.name && board.name.startsWith("Progressor")) {
+            if (value.buffer) {
+                const buffer = value.buffer;
+                const rawData = new DataView(buffer);
+                handleProgressorData(characteristic.uuid, rawData);
+            }
         }
         else {
             if (notifyCallback) {
@@ -122,9 +126,8 @@ export const connect = async (board, onSuccess) => {
         // setup filter list
         const filters = [];
         if (board.name) {
-            filters.push({
-                name: board.name,
-            });
+            const filterName = board.name === "Progressor" ? { namePrefix: board.name } : { name: board.name };
+            filters.push(filterName);
         }
         if (board.companyId) {
             filters.push({

package/src/connect.ts

@@ -1,6 +1,6 @@
 import { Device } from "./devices/types"
 import { notifyCallback } from "./notify"
-import { handleMotherboardData } from "./data"
+import { handleMotherboardData, handleProgressorData } from "./data"
 
 let server: BluetoothRemoteGATTServer
 const receiveBuffer: number[] = []
@@ -23,6 +23,7 @@ const onDisconnected = (event: Event, board: Device): void => {
 const handleNotifications = (event: Event, board: Device): void => {
   const characteristic: BluetoothRemoteGATTCharacteristic = event.target as BluetoothRemoteGATTCharacteristic
   const value: DataView | undefined = characteristic.value
+
   if (value) {
     if (board.name === "Motherboard") {
       for (let i: number = 0; i < value.byteLength; i++) {
@@ -51,8 +52,12 @@ const handleNotifications = (event: Event, board: Device): void => {
           })
         }
       }
-    } else if (board.name === "Tindeq") {
-      // TODO: handle Tindeq notify
+    } else if (board.name && board.name.startsWith("Progressor")) {
+      if (value.buffer) {
+        const buffer: ArrayBuffer = value.buffer
+        const rawData: DataView = new DataView(buffer)
+        handleProgressorData(characteristic.uuid, rawData)
+      }
     } else {
       if (notifyCallback) {
         notifyCallback({ uuid: characteristic.uuid, value: value })
@@ -132,9 +137,8 @@ export const connect = async (board: Device, onSuccess: () => void): Promise<voi
     const filters = []
 
     if (board.name) {
-      filters.push({
-        name: board.name,
-      })
+      const filterName = board.name === "Progressor" ? { namePrefix: board.name } : { name: board.name }
+      filters.push(filterName)
     }
     if (board.companyId) {
       filters.push({

package/src/data.d.ts

@@ -6,3 +6,4 @@ export declare const CALIBRATION: never[][];
  * @param receivedData - Received data string
  */
 export declare const handleMotherboardData: (uuid: string, receivedData: string) => void;
+export declare const handleProgressorData: (uuid: string, data: DataView) => void;

package/src/data.js

@@ -1,4 +1,7 @@
 import { notifyCallback } from "./notify";
+import { ProgressorCommands, ProgressorResponses } from "./commands/progressor";
+import { lastWrite } from "./write";
+import struct from "@aksel/structjs";
 const PACKET_LENGTH = 32;
 const NUM_SAMPLES = 3;
 export const CALIBRATION = [[], [], [], []];
@@ -107,3 +110,48 @@ export const handleMotherboardData = (uuid, receivedData) => {
         console.log(receivedData);
     }
 };
+export const handleProgressorData = (uuid, data) => {
+    const tare = 0; // todo: add tare
+    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) {
+                notifyCallback({
+                    uuid: uuid,
+                    value: {
+                        massTotal: Math.max(-1000, weight - tare).toFixed(1),
+                    },
+                });
+            }
+        }
+    }
+    else if (kind === ProgressorResponses.COMMAND_RESPONSE) {
+        if (!lastWrite)
+            return;
+        let value = "";
+        if (lastWrite === ProgressorCommands.GET_BATT_VLTG) {
+            const vdd = new DataView(data.buffer, 2).getUint32(0, true);
+            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 });
+        }
+    }
+    else if (kind === ProgressorResponses.LOW_BATTERY_WARNING) {
+        if (notifyCallback) {
+            notifyCallback({ uuid: uuid, value: "low power warning" });
+        }
+    }
+    else {
+        if (notifyCallback) {
+            notifyCallback({ uuid: uuid, value: `unknown message kind ${kind}` });
+        }
+    }
+};

package/src/data.ts

@@ -1,4 +1,7 @@
 import { notifyCallback } from "./notify"
+import { ProgressorCommands, ProgressorResponses } from "./commands/progressor"
+import { lastWrite } from "./write"
+import struct from "@aksel/structjs"
 
 const PACKET_LENGTH: number = 32
 const NUM_SAMPLES: number = 3
@@ -131,3 +134,45 @@ export const handleMotherboardData = (uuid: string, receivedData: string): void
     console.log(receivedData)
   }
 }
+
+export const handleProgressorData = (uuid: string, data: DataView): void => {
+  const tare: number = 0 // todo: add tare
+  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) {
+        notifyCallback({
+          uuid: uuid,
+          value: {
+            massTotal: Math.max(-1000, weight - tare).toFixed(1),
+          },
+        })
+      }
+    }
+  } else if (kind === ProgressorResponses.COMMAND_RESPONSE) {
+    if (!lastWrite) return
+
+    let value: string = ""
+
+    if (lastWrite === ProgressorCommands.GET_BATT_VLTG) {
+      const vdd = new DataView(data.buffer, 2).getUint32(0, true)
+      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 })
+    }
+  } else if (kind === ProgressorResponses.LOW_BATTERY_WARNING) {
+    if (notifyCallback) {
+      notifyCallback({ uuid: uuid, value: "low power warning" })
+    }
+  } else {
+    if (notifyCallback) {
+      notifyCallback({ uuid: uuid, value: `unknown message kind ${kind}` })
+    }
+  }
+}

package/src/declarations.d.ts

@@ -0,0 +1 @@
+declare module "@aksel/structjs"

package/src/devices/index.d.ts

@@ -2,4 +2,4 @@ export { Climbro } from "./climbro";
 export { Entralpi } from "./entralpi";
 export { Motherboard } from "./motherboard";
 export { SmartBoard } from "./smartboard";
-export { Tindeq } from "./tindeq";
+export { Progressor } from "./progressor";

package/src/devices/index.js

@@ -2,4 +2,4 @@ export { Climbro } from "./climbro";
 export { Entralpi } from "./entralpi";
 export { Motherboard } from "./motherboard";
 export { SmartBoard } from "./smartboard";
-export { Tindeq } from "./tindeq";
+export { Progressor } from "./progressor";

package/src/devices/index.ts

@@ -6,4 +6,4 @@ export { Motherboard } from "./motherboard"
 
 export { SmartBoard } from "./smartboard"
 
-export { Tindeq } from "./tindeq"
+export { Progressor } from "./progressor"

package/src/devices/progressor.d.ts

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

package/src/devices/{tindeq.js → progressor.js}

@@ -1,20 +1,32 @@
-export const Tindeq = {
-    name: "Tindeq",
+export const Progressor = {
+    name: "Progressor",
     services: [
         {
             name: "Progressor Service",
             id: "progressor",
             uuid: "7e4e1701-1ea6-40c9-9dcc-13d34ffead57",
             characteristics: [
+                {
+                    name: "Notify",
+                    id: "rx",
+                    uuid: "7e4e1702-1ea6-40c9-9dcc-13d34ffead57",
+                },
                 {
                     name: "Write",
                     id: "tx",
                     uuid: "7e4e1703-1ea6-40c9-9dcc-13d34ffead57",
                 },
+            ],
+        },
+        {
+            name: "Secure DFU Service",
+            id: "dfu",
+            uuid: "0000fe59-0000-1000-8000-00805f9b34fb",
+            characteristics: [
                 {
-                    name: "Notify",
-                    id: "rx",
-                    uuid: "7e4e1702-1ea6-40c9-9dcc-13d34ffead57",
+                    name: "Buttonless DFU",
+                    id: "dfu",
+                    uuid: "8ec90003-f315-4f60-9fb8-838830daea50",
                 },
             ],
         },

package/src/devices/{tindeq.ts → progressor.ts}

@@ -1,22 +1,34 @@
 import { Device } from "./types"
 
-export const Tindeq: Device = {
-  name: "Tindeq",
+export const Progressor: Device = {
+  name: "Progressor",
   services: [
     {
       name: "Progressor Service",
       id: "progressor",
       uuid: "7e4e1701-1ea6-40c9-9dcc-13d34ffead57",
       characteristics: [
+        {
+          name: "Notify",
+          id: "rx",
+          uuid: "7e4e1702-1ea6-40c9-9dcc-13d34ffead57",
+        },
         {
           name: "Write",
           id: "tx",
           uuid: "7e4e1703-1ea6-40c9-9dcc-13d34ffead57",
         },
+      ],
+    },
+    {
+      name: "Secure DFU Service",
+      id: "dfu",
+      uuid: "0000fe59-0000-1000-8000-00805f9b34fb",
+      characteristics: [
         {
-          name: "Notify",
-          id: "rx",
-          uuid: "7e4e1702-1ea6-40c9-9dcc-13d34ffead57",
+          name: "Buttonless DFU",
+          id: "dfu",
+          uuid: "8ec90003-f315-4f60-9fb8-838830daea50",
         },
       ],
     },

package/src/index.d.ts

@@ -1,4 +1,4 @@
-export { Climbro, Entralpi, Motherboard, SmartBoard, Tindeq } from "./devices/index";
+export { Climbro, Entralpi, Motherboard, SmartBoard, Progressor } from "./devices/index";
 export { battery } from "./battery";
 export { calibration } from "./calibration";
 export { connect } from "./connect";

package/src/index.js

@@ -1,4 +1,4 @@
-export { Climbro, Entralpi, Motherboard, SmartBoard, Tindeq } from "./devices/index";
+export { Climbro, Entralpi, Motherboard, SmartBoard, Progressor } from "./devices/index";
 export { battery } from "./battery";
 export { calibration } from "./calibration";
 export { connect } from "./connect";

package/src/index.ts

@@ -1,4 +1,4 @@
-export { Climbro, Entralpi, Motherboard, SmartBoard, Tindeq } from "./devices/index"
+export { Climbro, Entralpi, Motherboard, SmartBoard, Progressor } from "./devices/index"
 
 export { battery } from "./battery"
 

package/src/info.js

@@ -1,8 +1,8 @@
 import { write } from "./write";
 import { read } from "./read";
 import { isConnected } from "./is-connected";
-import { Motherboard, Tindeq } from "./devices";
-import { MotherboardCommands, TindeqCommands } from "./commands";
+import { Motherboard, Progressor } from "./devices";
+import { MotherboardCommands, ProgressorCommands } from "./commands";
 /**
  * Get device information
  * @param board
@@ -13,11 +13,11 @@ export const info = async (board) => {
             await read(Motherboard, "device", "manufacturer", 250);
             await read(Motherboard, "device", "hardware", 250);
             await read(Motherboard, "device", "firmware", 250);
-            await write(Motherboard, "uart", "tx", String(MotherboardCommands.GET_TEXT), 250);
-            await write(Motherboard, "uart", "tx", String(MotherboardCommands.GET_SERIAL), 250);
+            await write(Motherboard, "uart", "tx", MotherboardCommands.GET_TEXT, 250);
+            await write(Motherboard, "uart", "tx", MotherboardCommands.GET_SERIAL, 250);
         }
-        if (board.name === "Tindeq") {
-            await write(Tindeq, "progressor", "tx", String(TindeqCommands.GET_APP_VERSION), 250);
+        if (board.name && board.name.startsWith("Progressor")) {
+            await write(Progressor, "progressor", "tx", ProgressorCommands.GET_FW_VERSION, 250);
         }
     }
 };

package/src/info.ts

@@ -2,8 +2,8 @@ import { Device } from "./devices/types"
 import { write } from "./write"
 import { read } from "./read"
 import { isConnected } from "./is-connected"
-import { Motherboard, Tindeq } from "./devices"
-import { MotherboardCommands, TindeqCommands } from "./commands"
+import { Motherboard, Progressor } from "./devices"
+import { MotherboardCommands, ProgressorCommands } from "./commands"
 
 /**
  * Get device information
@@ -15,11 +15,11 @@ export const info = async (board: Device): Promise<void> => {
       await read(Motherboard, "device", "manufacturer", 250)
       await read(Motherboard, "device", "hardware", 250)
       await read(Motherboard, "device", "firmware", 250)
-      await write(Motherboard, "uart", "tx", String(MotherboardCommands.GET_TEXT), 250)
-      await write(Motherboard, "uart", "tx", String(MotherboardCommands.GET_SERIAL), 250)
+      await write(Motherboard, "uart", "tx", MotherboardCommands.GET_TEXT, 250)
+      await write(Motherboard, "uart", "tx", MotherboardCommands.GET_SERIAL, 250)
     }
-    if (board.name === "Tindeq") {
-      await write(Tindeq, "progressor", "tx", String(TindeqCommands.GET_APP_VERSION), 250)
+    if (board.name && board.name.startsWith("Progressor")) {
+      await write(Progressor, "progressor", "tx", ProgressorCommands.GET_FW_VERSION, 250)
     }
   }
 }

package/src/stop.js

@@ -1,7 +1,7 @@
 import { write } from "./write";
 import { isConnected } from "./is-connected";
-import { Motherboard, Tindeq } from "./devices";
-import { MotherboardCommands, TindeqCommands } from "./commands";
+import { Motherboard, Progressor } from "./devices";
+import { MotherboardCommands, ProgressorCommands } from "./commands";
 /**
  * read calibration
  * @param board
@@ -9,10 +9,10 @@ import { MotherboardCommands, TindeqCommands } from "./commands";
 export const stop = async (board) => {
     if (isConnected(board)) {
         if (board.name === "Motherboard") {
-            await write(Motherboard, "uart", "tx", String(MotherboardCommands.STOP_WEIGHT_MEAS), 0);
+            await write(Motherboard, "uart", "tx", MotherboardCommands.STOP_WEIGHT_MEAS, 0);
         }
-        if (board.name === "Tindeq") {
-            await write(Tindeq, "progressor", "tx", String(TindeqCommands.STOP_WEIGHT_MEAS), 0);
+        if (board.name && board.name.startsWith("Progressor")) {
+            await write(Progressor, "progressor", "tx", ProgressorCommands.STOP_WEIGHT_MEAS, 0);
         }
     }
 };

package/src/stop.ts

@@ -1,8 +1,8 @@
 import { Device } from "./devices/types"
 import { write } from "./write"
 import { isConnected } from "./is-connected"
-import { Motherboard, Tindeq } from "./devices"
-import { MotherboardCommands, TindeqCommands } from "./commands"
+import { Motherboard, Progressor } from "./devices"
+import { MotherboardCommands, ProgressorCommands } from "./commands"
 
 /**
  * read calibration
@@ -11,10 +11,10 @@ import { MotherboardCommands, TindeqCommands } from "./commands"
 export const stop = async (board: Device): Promise<void> => {
   if (isConnected(board)) {
     if (board.name === "Motherboard") {
-      await write(Motherboard, "uart", "tx", String(MotherboardCommands.STOP_WEIGHT_MEAS), 0)
+      await write(Motherboard, "uart", "tx", MotherboardCommands.STOP_WEIGHT_MEAS, 0)
     }
-    if (board.name === "Tindeq") {
-      await write(Tindeq, "progressor", "tx", String(TindeqCommands.STOP_WEIGHT_MEAS), 0)
+    if (board.name && board.name.startsWith("Progressor")) {
+      await write(Progressor, "progressor", "tx", ProgressorCommands.STOP_WEIGHT_MEAS, 0)
     }
   }
 }

package/src/stream.js

@@ -1,8 +1,8 @@
 import { isConnected } from "./is-connected";
 import { write } from "./write";
 import { stop } from "./stop";
-import { Motherboard, Tindeq } from "./devices";
-import { MotherboardCommands, TindeqCommands } from "./commands";
+import { Motherboard, Progressor } from "./devices";
+import { MotherboardCommands, ProgressorCommands } from "./commands";
 import { CALIBRATION } from "./data";
 import { calibration } from "./calibration";
 /**
@@ -17,18 +17,18 @@ export const stream = async (board, duration = 0) => {
                 await calibration(Motherboard);
             }
             // start stream
-            await write(Motherboard, "uart", "tx", String(MotherboardCommands.START_WEIGHT_MEAS), duration);
+            await write(Motherboard, "uart", "tx", MotherboardCommands.START_WEIGHT_MEAS, duration);
             // end stream if duration is set
             if (duration !== 0) {
                 await stop(Motherboard);
             }
         }
-        if (board.name === "Tindeq") {
+        if (board.name && board.name.startsWith("Progressor")) {
             // start stream
-            await write(Tindeq, "progressor", "tx", String(TindeqCommands.START_WEIGHT_MEAS), duration);
+            await write(Progressor, "progressor", "tx", ProgressorCommands.START_WEIGHT_MEAS, duration);
             // end stream if duration is set
             if (duration !== 0) {
-                await stop(Tindeq);
+                await stop(Progressor);
             }
         }
     }

package/src/stream.ts

@@ -2,8 +2,8 @@ import { Device } from "./devices/types"
 import { isConnected } from "./is-connected"
 import { write } from "./write"
 import { stop } from "./stop"
-import { Motherboard, Tindeq } from "./devices"
-import { MotherboardCommands, TindeqCommands } from "./commands"
+import { Motherboard, Progressor } from "./devices"
+import { MotherboardCommands, ProgressorCommands } from "./commands"
 import { CALIBRATION } from "./data"
 import { calibration } from "./calibration"
 
@@ -19,18 +19,18 @@ export const stream = async (board: Device, duration: number = 0): Promise<void>
         await calibration(Motherboard)
       }
       // start stream
-      await write(Motherboard, "uart", "tx", String(MotherboardCommands.START_WEIGHT_MEAS), duration)
+      await write(Motherboard, "uart", "tx", MotherboardCommands.START_WEIGHT_MEAS, duration)
       // end stream if duration is set
       if (duration !== 0) {
         await stop(Motherboard)
       }
     }
-    if (board.name === "Tindeq") {
+    if (board.name && board.name.startsWith("Progressor")) {
       // start stream
-      await write(Tindeq, "progressor", "tx", String(TindeqCommands.START_WEIGHT_MEAS), duration)
+      await write(Progressor, "progressor", "tx", ProgressorCommands.START_WEIGHT_MEAS, duration)
       // end stream if duration is set
       if (duration !== 0) {
-        await stop(Tindeq)
+        await stop(Progressor)
       }
     }
   }

package/src/write.d.ts

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

package/src/write.js

@@ -1,5 +1,6 @@
 import { isConnected } from "./is-connected";
 import { getCharacteristic } from "./characteristic";
+export let lastWrite = null;
 /**
  * write
  * @param characteristic
@@ -8,12 +9,17 @@ import { getCharacteristic } from "./characteristic";
 export const write = (board, serviceId, characteristicId, message, duration = 0) => {
     return new Promise((resolve, reject) => {
         if (isConnected(board)) {
-            const encoder = new TextEncoder();
+            if (!message)
+                return;
             const characteristic = getCharacteristic(board, serviceId, characteristicId);
             if (characteristic) {
+                const encoder = new TextEncoder();
                 characteristic
                     .writeValue(encoder.encode(message))
                     .then(() => {
+                    // update last written message
+                    lastWrite = message;
+                    // handle timeout
                     if (duration !== 0) {
                         setTimeout(() => {
                             resolve();

package/src/write.ts

@@ -2,6 +2,7 @@ import { Device } from "./devices/types"
 import { isConnected } from "./is-connected"
 import { getCharacteristic } from "./characteristic"
 
+export let lastWrite: string | null = null
 /**
  * write
  * @param characteristic
@@ -11,19 +12,21 @@ export const write = (
   board: Device,
   serviceId: string,
   characteristicId: string,
-  message: string,
+  message: string | undefined,
   duration: number = 0,
 ): Promise<void> => {
   return new Promise((resolve, reject) => {
     if (isConnected(board)) {
-      const encoder = new TextEncoder()
-
+      if (!message) return
       const characteristic = getCharacteristic(board, serviceId, characteristicId)
-
       if (characteristic) {
+        const encoder = new TextEncoder()
         characteristic
           .writeValue(encoder.encode(message))
           .then(() => {
+            // update last written message
+            lastWrite = message
+            // handle timeout
             if (duration !== 0) {
               setTimeout(() => {
                 resolve()

package/src/devices/tindeq.d.ts

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