@hangtime/grip-connect 0.10.0 → 0.10.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -11
- package/dist/cjs/index.d.ts +1 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/interfaces/callback.interface.d.ts +19 -12
- package/dist/cjs/interfaces/callback.interface.d.ts.map +1 -1
- package/dist/cjs/interfaces/command.interface.d.ts +10 -6
- package/dist/cjs/interfaces/command.interface.d.ts.map +1 -1
- package/dist/cjs/interfaces/device/progressor.interface.d.ts +42 -0
- package/dist/cjs/interfaces/device/progressor.interface.d.ts.map +1 -1
- package/dist/cjs/interfaces/device.interface.d.ts +5 -3
- package/dist/cjs/interfaces/device.interface.d.ts.map +1 -1
- package/dist/cjs/interfaces/download.interface.d.ts +8 -11
- package/dist/cjs/interfaces/download.interface.d.ts.map +1 -1
- package/dist/cjs/models/device/climbro.model.d.ts.map +1 -1
- package/dist/cjs/models/device/climbro.model.js +34 -16
- package/dist/cjs/models/device/climbro.model.js.map +1 -1
- package/dist/cjs/models/device/entralpi.model.d.ts.map +1 -1
- package/dist/cjs/models/device/entralpi.model.js +11 -14
- package/dist/cjs/models/device/entralpi.model.js.map +1 -1
- package/dist/cjs/models/device/forceboard.model.d.ts +1 -0
- package/dist/cjs/models/device/forceboard.model.d.ts.map +1 -1
- package/dist/cjs/models/device/forceboard.model.js +15 -21
- package/dist/cjs/models/device/forceboard.model.js.map +1 -1
- package/dist/cjs/models/device/motherboard.model.d.ts.map +1 -1
- package/dist/cjs/models/device/motherboard.model.js +28 -20
- package/dist/cjs/models/device/motherboard.model.js.map +1 -1
- package/dist/cjs/models/device/pb-700bt.model.d.ts.map +1 -1
- package/dist/cjs/models/device/pb-700bt.model.js +11 -14
- package/dist/cjs/models/device/pb-700bt.model.js.map +1 -1
- package/dist/cjs/models/device/progressor.model.d.ts +47 -5
- package/dist/cjs/models/device/progressor.model.d.ts.map +1 -1
- package/dist/cjs/models/device/progressor.model.js +185 -49
- package/dist/cjs/models/device/progressor.model.js.map +1 -1
- package/dist/cjs/models/device/smartboard-pro.model.d.ts.map +1 -1
- package/dist/cjs/models/device/smartboard-pro.model.js +11 -16
- package/dist/cjs/models/device/smartboard-pro.model.js.map +1 -1
- package/dist/cjs/models/device/wh-c06.model.d.ts.map +1 -1
- package/dist/cjs/models/device/wh-c06.model.js +11 -14
- package/dist/cjs/models/device/wh-c06.model.js.map +1 -1
- package/dist/cjs/models/device.model.d.ts +74 -5
- package/dist/cjs/models/device.model.d.ts.map +1 -1
- package/dist/cjs/models/device.model.js +159 -44
- package/dist/cjs/models/device.model.js.map +1 -1
- package/dist/cjs/utils.d.ts +16 -0
- package/dist/cjs/utils.d.ts.map +1 -0
- package/dist/cjs/utils.js +77 -0
- package/dist/cjs/utils.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces/callback.interface.d.ts +19 -12
- package/dist/interfaces/callback.interface.d.ts.map +1 -1
- package/dist/interfaces/command.interface.d.ts +10 -6
- package/dist/interfaces/command.interface.d.ts.map +1 -1
- package/dist/interfaces/device/progressor.interface.d.ts +42 -0
- package/dist/interfaces/device/progressor.interface.d.ts.map +1 -1
- package/dist/interfaces/device.interface.d.ts +5 -3
- package/dist/interfaces/device.interface.d.ts.map +1 -1
- package/dist/interfaces/download.interface.d.ts +8 -11
- package/dist/interfaces/download.interface.d.ts.map +1 -1
- package/dist/models/device/climbro.model.d.ts.map +1 -1
- package/dist/models/device/climbro.model.js +34 -16
- package/dist/models/device/climbro.model.js.map +1 -1
- package/dist/models/device/entralpi.model.d.ts.map +1 -1
- package/dist/models/device/entralpi.model.js +11 -14
- package/dist/models/device/entralpi.model.js.map +1 -1
- package/dist/models/device/forceboard.model.d.ts +1 -0
- package/dist/models/device/forceboard.model.d.ts.map +1 -1
- package/dist/models/device/forceboard.model.js +15 -21
- package/dist/models/device/forceboard.model.js.map +1 -1
- package/dist/models/device/motherboard.model.d.ts.map +1 -1
- package/dist/models/device/motherboard.model.js +28 -20
- package/dist/models/device/motherboard.model.js.map +1 -1
- package/dist/models/device/pb-700bt.model.d.ts.map +1 -1
- package/dist/models/device/pb-700bt.model.js +11 -14
- package/dist/models/device/pb-700bt.model.js.map +1 -1
- package/dist/models/device/progressor.model.d.ts +47 -5
- package/dist/models/device/progressor.model.d.ts.map +1 -1
- package/dist/models/device/progressor.model.js +184 -49
- package/dist/models/device/progressor.model.js.map +1 -1
- package/dist/models/device/smartboard-pro.model.d.ts.map +1 -1
- package/dist/models/device/smartboard-pro.model.js +11 -16
- package/dist/models/device/smartboard-pro.model.js.map +1 -1
- package/dist/models/device/wh-c06.model.d.ts.map +1 -1
- package/dist/models/device/wh-c06.model.js +11 -14
- package/dist/models/device/wh-c06.model.js.map +1 -1
- package/dist/models/device.model.d.ts +74 -5
- package/dist/models/device.model.d.ts.map +1 -1
- package/dist/models/device.model.js +164 -45
- package/dist/models/device.model.js.map +1 -1
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/utils.d.ts +16 -0
- package/dist/utils.d.ts.map +1 -0
- package/dist/utils.js +73 -0
- package/dist/utils.js.map +1 -0
- package/package.json +1 -1
- package/src/index.ts +0 -1
- package/src/interfaces/callback.interface.ts +21 -12
- package/src/interfaces/command.interface.ts +11 -6
- package/src/interfaces/device/progressor.interface.ts +50 -0
- package/src/interfaces/device.interface.ts +5 -3
- package/src/interfaces/download.interface.ts +9 -11
- package/src/models/device/climbro.model.ts +38 -20
- package/src/models/device/entralpi.model.ts +15 -17
- package/src/models/device/forceboard.model.ts +19 -24
- package/src/models/device/motherboard.model.ts +38 -26
- package/src/models/device/pb-700bt.model.ts +14 -16
- package/src/models/device/progressor.model.ts +198 -50
- package/src/models/device/smartboard-pro.model.ts +14 -19
- package/src/models/device/wh-c06.model.ts +14 -17
- package/src/models/device.model.ts +199 -48
- package/src/utils.ts +82 -0
package/README.md
CHANGED
|
@@ -20,12 +20,13 @@ And LED system boards from [Aurora Climbing](https://auroraclimbing.com/) like t
|
|
|
20
20
|
|
|
21
21
|
And gyroscopic hand exercisers, such as the [NSD PB-700BT](https://www.nsd.com.tw/).
|
|
22
22
|
|
|
23
|
-
The library is
|
|
23
|
+
The library is split into platform-specific packages:
|
|
24
24
|
|
|
25
25
|
- **Web**: The core package for web applications using the Web Bluetooth API
|
|
26
26
|
- **Capacitor**: For hybrid mobile apps using Capacitor
|
|
27
27
|
- **React Native**: For native mobile apps using React Native
|
|
28
|
-
- **
|
|
28
|
+
- **Runtime**: Adapter for Node.js, Bun, and Deno—script connections
|
|
29
|
+
- **CLI**: Ready to use Command-line tool to connect to devices
|
|
29
30
|
|
|
30
31
|
Learn more: [Documentation](https://stevie-ray.github.io/hangtime-grip-connect/) -
|
|
31
32
|
[Browser Support](https://caniuse.com/web-bluetooth) - [Discord](https://discord.gg/f7QQnEBQQt)
|
|
@@ -41,6 +42,12 @@ Learn more: [Documentation](https://stevie-ray.github.io/hangtime-grip-connect/)
|
|
|
41
42
|
[Pong](https://hangtime-grip-connect-pong.vercel.app/) -
|
|
42
43
|
[Kilter Board](https://grip-connect-kilter-board.vercel.app/?route=p1083r15p1117r15p1164r12p1185r12p1233r13p1282r13p1303r13p1372r13p1392r14p1505r15)
|
|
43
44
|
|
|
45
|
+
```bash
|
|
46
|
+
npx @hangtime/grip-connect-cli
|
|
47
|
+
```
|
|
48
|
+
|
|
49
|
+
> The CLI requires Node.js 22 or newer
|
|
50
|
+
|
|
44
51
|

|
|
45
52
|
|
|
46
53
|
## Install
|
|
@@ -48,20 +55,18 @@ Learn more: [Documentation](https://stevie-ray.github.io/hangtime-grip-connect/)
|
|
|
48
55
|
The packages are available on both [NPM](https://www.npmjs.com/package/@hangtime/grip-connect) and
|
|
49
56
|
[JSR](https://jsr.io/@hangtime/grip-connect).
|
|
50
57
|
|
|
51
|
-
```
|
|
58
|
+
```bash
|
|
52
59
|
# For Web applications
|
|
53
|
-
|
|
60
|
+
npm install @hangtime/grip-connect
|
|
54
61
|
|
|
55
62
|
# For Capacitor hybrid mobile apps
|
|
56
|
-
|
|
63
|
+
npm install @hangtime/grip-connect-capacitor
|
|
57
64
|
|
|
58
65
|
# For React Native mobile apps
|
|
59
|
-
|
|
66
|
+
npm install @hangtime/grip-connect-react-native
|
|
60
67
|
|
|
61
|
-
# For Node.js, Bun, Deno
|
|
62
|
-
|
|
63
|
-
$ bun add @hangtime/grip-connect-cli
|
|
64
|
-
$ deno add @hangtime/grip-connect-cli
|
|
68
|
+
# For Node.js, Bun, Deno
|
|
69
|
+
npm install @hangtime/grip-connect-runtime
|
|
65
70
|
```
|
|
66
71
|
|
|
67
72
|
## Example usage (with a Motherboard)
|
|
@@ -78,7 +83,7 @@ import { Motherboard } from "@hangtime/grip-connect"
|
|
|
78
83
|
// Initiate device
|
|
79
84
|
const motherboard = new Motherboard()
|
|
80
85
|
|
|
81
|
-
// Optional: Custom data handler
|
|
86
|
+
// Optional: Custom data handler. For pounds ("lbs") or newton ("n"): device.notify((data) => {}, "lbs")
|
|
82
87
|
motherboard.notify((data) => {
|
|
83
88
|
// { unit, timestamp, current, peak, mean, distribution? }
|
|
84
89
|
console.log(data)
|
package/dist/cjs/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export type { IClimbro, IEntralpi, IForceBoard, IKilterBoard, IMotherboard, ImySmartBoard, IProgressor, ISmartBoardPro, IWHC06, } from "./interfaces/index.js";
|
|
2
|
-
export type { ForceUnit,
|
|
2
|
+
export type { ForceUnit, ForceMeasurement, NotifyCallback, WriteCallback, ActiveCallback, } from "./interfaces/callback.interface.js";
|
|
3
3
|
export { Climbro, Entralpi, ForceBoard, KilterBoard, KilterBoardPlacementRoles, Motherboard, mySmartBoard, PB700BT, Progressor, SmartBoardPro, WHC06, } from "./models/index.js";
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,QAAQ,EACR,SAAS,EACT,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,WAAW,EACX,cAAc,EACd,MAAM,GACP,MAAM,uBAAuB,CAAA;AAE9B,YAAY,EACV,SAAS,EACT,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,QAAQ,EACR,SAAS,EACT,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,WAAW,EACX,cAAc,EACd,MAAM,GACP,MAAM,uBAAuB,CAAA;AAE9B,YAAY,EACV,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,cAAc,GACf,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EACL,OAAO,EACP,QAAQ,EACR,UAAU,EACV,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,YAAY,EACZ,OAAO,EACP,UAAU,EACV,aAAa,EACb,KAAK,GACN,MAAM,mBAAmB,CAAA"}
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAoBA,8CAY0B;AAXxB,mGAAA,OAAO,OAAA;AACP,oGAAA,QAAQ,OAAA;AACR,sGAAA,UAAU,OAAA;AACV,uGAAA,WAAW,OAAA;AACX,qHAAA,yBAAyB,OAAA;AACzB,uGAAA,WAAW,OAAA;AACX,wGAAA,YAAY,OAAA;AACZ,mGAAA,OAAO,OAAA;AACP,sGAAA,UAAU,OAAA;AACV,yGAAA,aAAa,OAAA;AACb,iGAAA,KAAK,OAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** Force-equivalent display unit used for all values in this measurement */
|
|
2
|
-
export type ForceUnit = "kg" | "lbs";
|
|
2
|
+
export type ForceUnit = "kg" | "lbs" | "n";
|
|
3
3
|
/**
|
|
4
4
|
* Core statistical values describing force over a time window or session.
|
|
5
5
|
*/
|
|
@@ -10,26 +10,33 @@ export interface ForceStats {
|
|
|
10
10
|
peak: number;
|
|
11
11
|
/** Mean (average) force across all samples in the measured window or session */
|
|
12
12
|
mean: number;
|
|
13
|
+
/** Lowest instantaneous force recorded within the measured window or session (e.g. for charts and Min/Max UI) */
|
|
14
|
+
min: number;
|
|
15
|
+
}
|
|
16
|
+
export interface ForcePerformance {
|
|
17
|
+
/** Time in ms since the previous BLE notification (packet). */
|
|
18
|
+
notifyIntervalMs?: number;
|
|
19
|
+
/** Cumulative count of data packets received this session (one BLE notification = one packet). */
|
|
20
|
+
packetIndex?: number;
|
|
21
|
+
/** Device-specific sample identifier (e.g. data point count or device timestamp µs). */
|
|
22
|
+
sampleIndex?: number;
|
|
23
|
+
/** Number of samples in the current packet (e.g. Progressor: payload length / 8). */
|
|
24
|
+
samplesPerPacket?: number;
|
|
25
|
+
/** Data rate in Hz: samples per second from device timestamps (samples in last 1s of device time). */
|
|
26
|
+
samplingRateHz?: number;
|
|
13
27
|
}
|
|
14
28
|
/**
|
|
15
29
|
* Complete force measurement including timing, unit, and optional spatial distribution.
|
|
16
30
|
* Can represent either a single real-time sample or a rolling/session summary.
|
|
17
31
|
*/
|
|
18
32
|
export interface ForceMeasurement extends ForceStats {
|
|
19
|
-
/** Display unit for all force values (
|
|
33
|
+
/** Display unit for all force values (kgf, lbf, or N) */
|
|
20
34
|
unit: ForceUnit;
|
|
21
35
|
/** Unix epoch timestamp in milliseconds indicating when the measurement was recorded */
|
|
22
36
|
timestamp: number;
|
|
23
|
-
/**
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
*/
|
|
27
|
-
samplingRateHz?: number;
|
|
28
|
-
/**
|
|
29
|
-
* Optional force distribution across multiple sensor zones.
|
|
30
|
-
* Each zone follows the exact same measurement structure as the parent.
|
|
31
|
-
* Nested distributions should be avoided to keep the model one level deep.
|
|
32
|
-
*/
|
|
37
|
+
/** Performance metadata (notify interval, packet count, samples/packet, Hz). */
|
|
38
|
+
performance?: ForcePerformance;
|
|
39
|
+
/** Motherboard only: Force distribution across multiple sensor zones. */
|
|
33
40
|
distribution?: {
|
|
34
41
|
/** Force statistics for the left sensor zone */
|
|
35
42
|
left?: ForceMeasurement;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/callback.interface.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"callback.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/callback.interface.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,GAAG,GAAG,CAAA;AAE1C;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAA;IAEf,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAA;IAEZ,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAA;IAEZ,iHAAiH;IACjH,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,gBAAgB;IAC/B,+DAA+D;IAC/D,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,kGAAkG;IAClG,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,wFAAwF;IACxF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,qFAAqF;IACrF,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,sGAAsG;IACtG,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD,yDAAyD;IACzD,IAAI,EAAE,SAAS,CAAA;IAEf,wFAAwF;IACxF,SAAS,EAAE,MAAM,CAAA;IAEjB,gFAAgF;IAChF,WAAW,CAAC,EAAE,gBAAgB,CAAA;IAE9B,yEAAyE;IACzE,YAAY,CAAC,EAAE;QACb,gDAAgD;QAChD,IAAI,CAAC,EAAE,gBAAgB,CAAA;QAEvB,kDAAkD;QAClD,MAAM,CAAC,EAAE,gBAAgB,CAAA;QAEzB,iDAAiD;QACjD,KAAK,CAAC,EAAE,gBAAgB,CAAA;KACzB,CAAA;CACF;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAA;AAE7D;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;AAElD;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA"}
|
|
@@ -62,31 +62,35 @@ export interface Commands {
|
|
|
62
62
|
* Adds a calibration point to the device.
|
|
63
63
|
* Used to improve the accuracy of future measurements.
|
|
64
64
|
*/
|
|
65
|
-
|
|
65
|
+
ADD_CALIBRATION_POINT?: string;
|
|
66
66
|
/**
|
|
67
67
|
* Saves the current calibration settings to the device.
|
|
68
68
|
* Ensures the device remembers the calibration for future sessions.
|
|
69
69
|
*/
|
|
70
|
-
|
|
70
|
+
SAVE_CALIBRATION?: string;
|
|
71
71
|
/**
|
|
72
72
|
* Retrieves the firmware version of the device.
|
|
73
73
|
* Useful for ensuring compatibility and tracking updates.
|
|
74
74
|
*/
|
|
75
|
-
|
|
75
|
+
GET_FIRMWARE_VERSION?: string;
|
|
76
76
|
/**
|
|
77
77
|
* Retrieves error information from the device.
|
|
78
78
|
* Provides details on any faults or issues that occurred during operation.
|
|
79
79
|
*/
|
|
80
|
-
|
|
80
|
+
GET_ERROR_INFORMATION?: string;
|
|
81
81
|
/**
|
|
82
82
|
* Clears the error information on the device.
|
|
83
83
|
* Used to reset error logs after troubleshooting or repair.
|
|
84
84
|
*/
|
|
85
|
-
|
|
85
|
+
CLR_ERROR_INFORMATION?: string;
|
|
86
86
|
/**
|
|
87
87
|
* Retrieves the battery voltage level of the device.
|
|
88
88
|
* Provides insight into the device's remaining battery power.
|
|
89
89
|
*/
|
|
90
|
-
|
|
90
|
+
GET_BATTERY_VOLTAGE?: string;
|
|
91
|
+
/**
|
|
92
|
+
* Get the Progressor ID.
|
|
93
|
+
*/
|
|
94
|
+
GET_PROGRESSOR_ID?: string;
|
|
91
95
|
}
|
|
92
96
|
//# sourceMappingURL=command.interface.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/command.interface.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,QAAQ;IAGvB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAE1B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAEvB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAInB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IAIxB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAIzB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAE5B;;;OAGG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAA;IAEnC;;;OAGG;IACH,
|
|
1
|
+
{"version":3,"file":"command.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/command.interface.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,QAAQ;IAGvB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAE1B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAEvB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAInB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IAIxB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAIzB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAE5B;;;OAGG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAA;IAEnC;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAE9B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAE7B;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAE9B;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAE9B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAE5B;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B"}
|
|
@@ -13,6 +13,37 @@ export interface IProgressor extends IDevice {
|
|
|
13
13
|
* @returns {Promise<string>} A Promise that resolves with the firmware version.
|
|
14
14
|
*/
|
|
15
15
|
firmware(): Promise<string | undefined>;
|
|
16
|
+
/**
|
|
17
|
+
* Retrieves the Progressor ID from the device. Formatted as hex MSB-first to match the official app.
|
|
18
|
+
* @returns {Promise<string | undefined>} A Promise that resolves with the device ID hex string.
|
|
19
|
+
*/
|
|
20
|
+
progressorId(): Promise<string | undefined>;
|
|
21
|
+
/**
|
|
22
|
+
* Retrieves calibration curve from the device (opcode 0x72). Payload is 12 opaque bytes;
|
|
23
|
+
* parsed for display as zero-point, ref-point, and version (3× uint32 LE) plus hex.
|
|
24
|
+
* @returns {Promise<string | undefined>} A Promise that resolves with a display string (e.g. "hex — zero-point: X | ref-point: Y | version: Z").
|
|
25
|
+
*/
|
|
26
|
+
calibration(): Promise<string | undefined>;
|
|
27
|
+
/**
|
|
28
|
+
* Saves the current calibration settings to the device.
|
|
29
|
+
* @returns {Promise<void>} A Promise that resolves when the command is sent.
|
|
30
|
+
*/
|
|
31
|
+
saveCalibration(): Promise<void>;
|
|
32
|
+
/**
|
|
33
|
+
* Puts the device to sleep / shutdown.
|
|
34
|
+
* @returns {Promise<void>} A Promise that resolves when the command is sent.
|
|
35
|
+
*/
|
|
36
|
+
sleep(): Promise<void>;
|
|
37
|
+
/**
|
|
38
|
+
* Retrieves error information from the device.
|
|
39
|
+
* @returns {Promise<string | undefined>} A Promise that resolves with the error info text.
|
|
40
|
+
*/
|
|
41
|
+
errorInfo(): Promise<string | undefined>;
|
|
42
|
+
/**
|
|
43
|
+
* Clears error information on the device.
|
|
44
|
+
* @returns {Promise<void>} A Promise that resolves when the command is sent.
|
|
45
|
+
*/
|
|
46
|
+
clearErrorInfo(): Promise<void>;
|
|
16
47
|
/**
|
|
17
48
|
* Stops the data stream on the specified device.
|
|
18
49
|
* @returns {Promise<void>} A promise that resolves when the stream is stopped.
|
|
@@ -24,5 +55,16 @@ export interface IProgressor extends IDevice {
|
|
|
24
55
|
* @returns {Promise<void>} A promise that resolves when the streaming operation is completed.
|
|
25
56
|
*/
|
|
26
57
|
stream(duration?: number): Promise<void>;
|
|
58
|
+
/**
|
|
59
|
+
* Adds a calibration point. Use 0 for zero point, then known weight; then saveCalibration().
|
|
60
|
+
* @param weightKg - Weight in kg (0 or known reference < 150 kg).
|
|
61
|
+
*/
|
|
62
|
+
addCalibrationPoint(weightKg: number): Promise<void>;
|
|
63
|
+
/**
|
|
64
|
+
* Sends the device tare command to zero the scale (hardware tare).
|
|
65
|
+
* For software tare over a duration, use the base tare(duration) method.
|
|
66
|
+
* @returns {Promise<void>} A Promise that resolves when the command is sent.
|
|
67
|
+
*/
|
|
68
|
+
tareScale(): Promise<void>;
|
|
27
69
|
}
|
|
28
70
|
//# sourceMappingURL=progressor.interface.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progressor.interface.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/device/progressor.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAErD;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C;;;OAGG;IACH,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAEtC;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAEvC;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAErB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"progressor.interface.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/device/progressor.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAErD;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C;;;OAGG;IACH,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAEtC;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAEvC;;;OAGG;IACH,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAE3C;;;;OAIG;IACH,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAE1C;;;OAGG;IACH,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAEhC;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAEtB;;;OAGG;IACH,SAAS,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAExC;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAE/B;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAErB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAExC;;;OAGG;IACH,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEpD;;;;OAIG;IACH,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { IBase } from "./base.interface.js";
|
|
2
|
-
import type { ForceMeasurement } from "./callback.interface.js";
|
|
2
|
+
import type { ForceMeasurement, ForceUnit } from "./callback.interface.js";
|
|
3
3
|
import type { Commands } from "./command.interface.js";
|
|
4
4
|
/**
|
|
5
5
|
* Represents a characteristic of a Bluetooth service.
|
|
@@ -143,6 +143,7 @@ export interface IDevice extends IBase {
|
|
|
143
143
|
/**
|
|
144
144
|
* Sets the callback function to be called when notifications are received.
|
|
145
145
|
* @param {NotifyCallback} callback - The callback function to be set.
|
|
146
|
+
* @param {ForceUnit} [unit="kg"] - Display unit for force values in the callback payload.
|
|
146
147
|
* @returns {void}
|
|
147
148
|
* @public
|
|
148
149
|
*
|
|
@@ -150,8 +151,9 @@ export interface IDevice extends IBase {
|
|
|
150
151
|
* device.notify((data) => {
|
|
151
152
|
* console.log('Received notification:', data);
|
|
152
153
|
* });
|
|
154
|
+
* device.notify((data) => { ... }, 'lbs');
|
|
153
155
|
*/
|
|
154
|
-
notify(callback: (data: ForceMeasurement) => void): void;
|
|
156
|
+
notify(callback: (data: ForceMeasurement) => void, unit?: ForceUnit): void;
|
|
155
157
|
/**
|
|
156
158
|
* Reads the value of the specified characteristic from the device.
|
|
157
159
|
* @param {string} serviceId - The service ID where the characteristic belongs.
|
|
@@ -193,7 +195,7 @@ export interface IDevice extends IBase {
|
|
|
193
195
|
*
|
|
194
196
|
* @example
|
|
195
197
|
* // Example usage of the write function with a custom callback
|
|
196
|
-
* await Progressor.write("progressor", "tx", ProgressorCommands.
|
|
198
|
+
* await Progressor.write("progressor", "tx", ProgressorCommands.GET_BATTERY_VOLTAGE, 250, (data) => {
|
|
197
199
|
* console.log(`Battery voltage: ${data}`);
|
|
198
200
|
* });
|
|
199
201
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/device.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"device.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/device.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAEtD;;GAEG;AACH,UAAU,cAAc;IACtB,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAA;IACV,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,6CAA6C;IAC7C,cAAc,CAAC,EAAE,iCAAiC,CAAA;CACnD;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,gCAAgC;IAChC,EAAE,EAAE,MAAM,CAAA;IACV,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,yDAAyD;IACzD,eAAe,EAAE,cAAc,EAAE,CAAA;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,OAAQ,SAAQ,KAAK;IACpC;;;;;;OAMG;IACH,OAAO,EAAE,qBAAqB,EAAE,CAAA;IAEhC;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,EAAE,CAAA;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,eAAe,CAAA;IAE3B;;;;;;OAMG;IACH,QAAQ,EAAE,QAAQ,CAAA;IAElB;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IAErG;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEhF;;;;;;;;;;;OAWG;IACH,UAAU,IAAI,IAAI,CAAA;IAElB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,IAAI,CAAA;IAE/C;;;;;;;;;;;OAWG;IACH,WAAW,IAAI,OAAO,CAAA;IAEtB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;IAE1E;;;;;;;;;;;OAWG;IACH,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAEjG;;;;;;;;;;;;;OAaG;IACH,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IAEhC;;;;;;;;;;;;;;;;OAgBG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,EACxC,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,IAAI,CAAC,CAAA;CACjB"}
|
|
@@ -1,16 +1,13 @@
|
|
|
1
|
+
import type { ForceMeasurement } from "./callback.interface.js";
|
|
1
2
|
/**
|
|
2
|
-
* Represents a single data packet.
|
|
3
|
+
* Represents a single data packet for export (CSV, JSON, XML).
|
|
4
|
+
* Extends ForceMeasurement with export-specific fields. Force values come from
|
|
5
|
+
* `current` (single-sample) or `distribution` (multi-zone, e.g. Motherboard).
|
|
3
6
|
*/
|
|
4
|
-
export interface DownloadPacket {
|
|
5
|
-
/**
|
|
6
|
-
|
|
7
|
-
/**
|
|
8
|
-
sampleNum: number;
|
|
9
|
-
/** Battery raw value */
|
|
10
|
-
battRaw: number;
|
|
11
|
-
/** Array of sample values */
|
|
7
|
+
export interface DownloadPacket extends ForceMeasurement {
|
|
8
|
+
/** Battery raw value (device-specific, 0 when N/A) */
|
|
9
|
+
battRaw?: number;
|
|
10
|
+
/** Raw sensor/ADC values from device */
|
|
12
11
|
samples: number[];
|
|
13
|
-
/** Array of mass values */
|
|
14
|
-
masses: number[];
|
|
15
12
|
}
|
|
16
13
|
//# sourceMappingURL=download.interface.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/download.interface.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"download.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/download.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAE/D;;;;GAIG;AACH,MAAM,WAAW,cAAe,SAAQ,gBAAgB;IACtD,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,wCAAwC;IACxC,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"climbro.model.d.ts","sourceRoot":"","sources":["../../../../src/models/device/climbro.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8CAA8C,CAAA;AAoB5E;;;GAGG;AACH,qBAAa,OAAQ,SAAQ,MAAO,YAAW,QAAQ;IACrD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAc;IACpD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAc;IACpD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAoD;IACxF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAkC;IAEtE;;;;;OAKG;IACH,OAAO,CAAC,WAAW,CAAI;IAEvB;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAAI;;IAsBxB;;;OAGG;IACH,OAAO,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG9C;IAED;;;;;OAKG;IACM,mBAAmB,GAAI,OAAO,QAAQ,KAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"climbro.model.d.ts","sourceRoot":"","sources":["../../../../src/models/device/climbro.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8CAA8C,CAAA;AAoB5E;;;GAGG;AACH,qBAAa,OAAQ,SAAQ,MAAO,YAAW,QAAQ;IACrD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAc;IACpD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAc;IACpD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAoD;IACxF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAkC;IAEtE;;;;;OAKG;IACH,OAAO,CAAC,WAAW,CAAI;IAEvB;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAAI;;IAsBxB;;;OAGG;IACH,OAAO,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG9C;IAED;;;;;OAKG;IACM,mBAAmB,GAAI,OAAO,QAAQ,KAAG,IAAI,CA2FrD;CACF"}
|
|
@@ -73,13 +73,34 @@ class Climbro extends device_model_js_1.Device {
|
|
|
73
73
|
*/
|
|
74
74
|
this.handleNotifications = (value) => {
|
|
75
75
|
if (value) {
|
|
76
|
-
// Update timestamp
|
|
77
76
|
this.updateTimestamp();
|
|
78
77
|
if (value.buffer) {
|
|
79
|
-
const receivedTime = Date.now();
|
|
80
|
-
// Convert DataView to Uint8Array for easier processing
|
|
81
78
|
const buffer = new Uint8Array(value.buffer);
|
|
82
79
|
const byteCount = buffer.length;
|
|
80
|
+
let flagSynchro = this.flagSynchro;
|
|
81
|
+
let forceCount = 0;
|
|
82
|
+
for (let i = 0; i < byteCount; i++) {
|
|
83
|
+
let b = buffer[i];
|
|
84
|
+
if (b === ClimbroResponses.BAT_DAT) {
|
|
85
|
+
flagSynchro = ClimbroResponses.BAT_DAT;
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
if (b === ClimbroResponses.SENS_DAT) {
|
|
89
|
+
flagSynchro = ClimbroResponses.SENS_DAT;
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
if (b === ClimbroResponses.DAT_36KG) {
|
|
93
|
+
b = 36;
|
|
94
|
+
}
|
|
95
|
+
if (flagSynchro === ClimbroResponses.BAT_DAT)
|
|
96
|
+
continue;
|
|
97
|
+
if (flagSynchro === ClimbroResponses.SENS_DAT) {
|
|
98
|
+
forceCount++;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
this.currentSamplesPerPacket = forceCount;
|
|
102
|
+
this.recordPacketReceived();
|
|
103
|
+
const receivedTime = Date.now();
|
|
83
104
|
for (let i = 0; i < byteCount; i++) {
|
|
84
105
|
let signalValue = buffer[i];
|
|
85
106
|
// Check for battery data marker
|
|
@@ -106,25 +127,22 @@ class Climbro extends device_model_js_1.Device {
|
|
|
106
127
|
// Process force data inline
|
|
107
128
|
const forceValue = signalValue;
|
|
108
129
|
const numericData = forceValue - this.applyTare(forceValue);
|
|
109
|
-
// Add data to downloadable array
|
|
110
|
-
this.downloadPackets.push({
|
|
111
|
-
received: receivedTime,
|
|
112
|
-
sampleNum: this.dataPointCount,
|
|
113
|
-
battRaw: this.batteryLevel,
|
|
114
|
-
samples: [forceValue],
|
|
115
|
-
masses: [numericData],
|
|
116
|
-
});
|
|
117
|
-
// Check for max weight
|
|
118
|
-
this.peak = Math.max(this.peak, Number(numericData));
|
|
119
|
-
// Update running sum and count
|
|
120
130
|
const currentMassTotal = Math.max(-1000, Number(numericData));
|
|
131
|
+
// Update session stats before building packet (so packet reflects this sample)
|
|
132
|
+
this.peak = Math.max(this.peak, Number(numericData));
|
|
133
|
+
this.min = Math.min(this.min, Math.max(-1000, Number(numericData)));
|
|
121
134
|
this.sum += currentMassTotal;
|
|
122
135
|
this.dataPointCount++;
|
|
123
|
-
// Calculate the average dynamically
|
|
124
136
|
this.mean = this.sum / this.dataPointCount;
|
|
137
|
+
// Add data to downloadable array
|
|
138
|
+
this.downloadPackets.push(this.buildDownloadPacket(currentMassTotal, [forceValue], {
|
|
139
|
+
timestamp: receivedTime,
|
|
140
|
+
battRaw: this.batteryLevel,
|
|
141
|
+
sampleIndex: this.dataPointCount,
|
|
142
|
+
}));
|
|
125
143
|
// Check if device is being used
|
|
126
144
|
this.activityCheck(numericData);
|
|
127
|
-
this.notifyCallback(this.buildForceMeasurement(
|
|
145
|
+
this.notifyCallback(this.buildForceMeasurement(currentMassTotal));
|
|
128
146
|
continue;
|
|
129
147
|
}
|
|
130
148
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"climbro.model.js","sourceRoot":"","sources":["../../../../src/models/device/climbro.model.ts"],"names":[],"mappings":";;;;AAAA,wDAA2C;AAG3C;;GAEG;AACH,IAAK,gBAaJ;AAbD,WAAK,gBAAgB;IACnB;;OAEG;IACH,+DAAc,CAAA;IACd;;OAEG;IACH,iEAAe,CAAA;IACf;;OAEG;IACH,iEAAe,CAAA;AACjB,CAAC,EAbI,gBAAgB,KAAhB,gBAAgB,QAapB;AAED;;;GAGG;AACH,MAAa,OAAQ,SAAQ,wBAAM;IAwBjC;QACE,KAAK,CAAC;YACJ,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;YACpC,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,0BAA0B;oBAChC,EAAE,EAAE,MAAM;oBACV,IAAI,EAAE,sCAAsC;oBAC5C,eAAe,EAAE;wBACf;4BACE,IAAI,EAAE,aAAa;4BACnB,EAAE,EAAE,IAAI;4BACR,IAAI,EAAE,sCAAsC;yBAC7C;qBACF;iBACF;aACF;SACF,CAAC,CAAA;QAhCJ;;;;;WAKG;QACK,gBAAW,GAAG,CAAC,CAAA;QAEvB;;;;WAIG;QACK,iBAAY,GAAG,CAAC,CAAA;QAsBxB;;;WAGG;QACH,YAAO,GAAG,KAAK,IAAiC,EAAE;YAChD,0DAA0D;YAC1D,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAA;QACrC,CAAC,CAAA;QAED;;;;;WAKG;QACM,wBAAmB,GAAG,CAAC,KAAe,EAAQ,EAAE;YACvD,IAAI,KAAK,EAAE,CAAC;gBACV,
|
|
1
|
+
{"version":3,"file":"climbro.model.js","sourceRoot":"","sources":["../../../../src/models/device/climbro.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entralpi.model.d.ts","sourceRoot":"","sources":["../../../../src/models/device/entralpi.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAA;AAE9E;;;GAGG;AACH,qBAAa,QAAS,SAAQ,MAAO,YAAW,SAAS;;IA2HvD;;;OAGG;IACH,OAAO,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE9C;IAED;;;OAGG;IACH,aAAa,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEpD;IAED;;;OAGG;IACH,QAAQ,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE/C;IAED;;;;;;OAMG;IACM,mBAAmB,GAAI,OAAO,QAAQ,KAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"entralpi.model.d.ts","sourceRoot":"","sources":["../../../../src/models/device/entralpi.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAA;AAE9E;;;GAGG;AACH,qBAAa,QAAS,SAAQ,MAAO,YAAW,SAAS;;IA2HvD;;;OAGG;IACH,OAAO,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE9C;IAED;;;OAGG;IACH,aAAa,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEpD;IAED;;;OAGG;IACH,QAAQ,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE/C;IAED;;;;;;OAMG;IACM,mBAAmB,GAAI,OAAO,QAAQ,KAAG,IAAI,CAuCrD;IAED;;;OAGG;IACH,QAAQ,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE/C;IAED;;;OAGG;IACH,YAAY,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEnD;IAED;;;OAGG;IACH,KAAK,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE5C;IAED;;;;OAIG;IACH,GAAG,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE1C;IAED;;;OAGG;IACH,QAAQ,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE/C;IAED;;;OAGG;IACH,MAAM,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7C;CACF"}
|
|
@@ -157,9 +157,10 @@ class Entralpi extends device_model_js_1.Device {
|
|
|
157
157
|
*/
|
|
158
158
|
this.handleNotifications = (value) => {
|
|
159
159
|
if (value) {
|
|
160
|
-
// Update timestamp
|
|
161
160
|
this.updateTimestamp();
|
|
162
161
|
if (value.buffer) {
|
|
162
|
+
this.currentSamplesPerPacket = 1;
|
|
163
|
+
this.recordPacketReceived();
|
|
163
164
|
const receivedTime = Date.now();
|
|
164
165
|
const receivedData = (value.getUint16(0) / 100).toFixed(1);
|
|
165
166
|
const convertedData = Number(receivedData);
|
|
@@ -168,26 +169,22 @@ class Entralpi extends device_model_js_1.Device {
|
|
|
168
169
|
// This will display the removed or 'no-hanging' weight.
|
|
169
170
|
const tare = this.applyTare(convertedData);
|
|
170
171
|
const numericData = tare === 0 ? convertedData : (convertedData - tare) * -1;
|
|
171
|
-
// Add data to downloadable Array
|
|
172
|
-
this.downloadPackets.push({
|
|
173
|
-
received: receivedTime,
|
|
174
|
-
sampleNum: this.dataPointCount,
|
|
175
|
-
battRaw: 0,
|
|
176
|
-
samples: [convertedData],
|
|
177
|
-
masses: [numericData],
|
|
178
|
-
});
|
|
179
|
-
// Update peak
|
|
180
|
-
this.peak = Math.max(this.peak, numericData);
|
|
181
|
-
// Update running sum and count
|
|
182
172
|
const currentMassTotal = Math.max(-1000, numericData);
|
|
173
|
+
// Update session stats before building packet
|
|
174
|
+
this.peak = Math.max(this.peak, numericData);
|
|
175
|
+
this.min = Math.min(this.min, Math.max(-1000, numericData));
|
|
183
176
|
this.sum += currentMassTotal;
|
|
184
177
|
this.dataPointCount++;
|
|
185
|
-
// Calculate the average dynamically
|
|
186
178
|
this.mean = this.sum / this.dataPointCount;
|
|
179
|
+
// Add data to downloadable Array
|
|
180
|
+
this.downloadPackets.push(this.buildDownloadPacket(currentMassTotal, [convertedData], {
|
|
181
|
+
timestamp: receivedTime,
|
|
182
|
+
sampleIndex: this.dataPointCount,
|
|
183
|
+
}));
|
|
187
184
|
// Check if device is being used
|
|
188
185
|
this.activityCheck(numericData);
|
|
189
186
|
// Notify with weight data
|
|
190
|
-
this.notifyCallback(this.buildForceMeasurement(
|
|
187
|
+
this.notifyCallback(this.buildForceMeasurement(currentMassTotal));
|
|
191
188
|
}
|
|
192
189
|
}
|
|
193
190
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entralpi.model.js","sourceRoot":"","sources":["../../../../src/models/device/entralpi.model.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"entralpi.model.js","sourceRoot":"","sources":["../../../../src/models/device/entralpi.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import type { IForceBoard } from "../../interfaces/device/forceboard.interface.j
|
|
|
5
5
|
* {@link https://pitchsix.com}
|
|
6
6
|
*/
|
|
7
7
|
export declare class ForceBoard extends Device implements IForceBoard {
|
|
8
|
+
protected streamUnit: "lbs";
|
|
8
9
|
constructor();
|
|
9
10
|
/**
|
|
10
11
|
* Retrieves battery or voltage information from the device.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forceboard.model.d.ts","sourceRoot":"","sources":["../../../../src/models/device/forceboard.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAElF;;;GAGG;AACH,qBAAa,UAAW,SAAQ,MAAO,YAAW,WAAW;;
|
|
1
|
+
{"version":3,"file":"forceboard.model.d.ts","sourceRoot":"","sources":["../../../../src/models/device/forceboard.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAElF;;;GAGG;AACH,qBAAa,UAAW,SAAQ,MAAO,YAAW,WAAW;IAC3D,UAAmB,UAAU,EAAG,KAAK,CAAS;;IAuK9C;;;OAGG;IACH,OAAO,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE9C;IAED;;;;;;OAMG;IACM,mBAAmB,GAAI,OAAO,QAAQ,KAAG,IAAI,CA4CrD;IAED;;;OAGG;IACH,QAAQ,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE/C;IAED;;;OAGG;IACH,YAAY,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEnD;IAED;;;OAGG;IACH,IAAI,QAAa,OAAO,CAAC,IAAI,CAAC,CAE7B;IAED;;;;OAIG;IACH,MAAM,GAAU,iBAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAG3C;IAED;;;;OAIG;IACH,SAAS,GAAU,cAAc,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC,CAStD;IAED;;;OAGG;IACH,oBAAoB,QAAa,OAAO,CAAC,IAAI,CAAC,CAI7C;IAED;;;;OAIG;IACH,UAAU,QAAa,OAAO,CAAC,IAAI,CAAC,CAEnC;IAED;;;OAGG;IACH,WAAW,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAElD;IAED;;;;;OAKG;IACH,KAAK,GAAU,iBAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAG1C;CACF"}
|
|
@@ -170,6 +170,7 @@ class ForceBoard extends device_model_js_1.Device {
|
|
|
170
170
|
STOP_WEIGHT_MEAS: String.fromCharCode(0x07), // Idle Mode: Force Board is idle.
|
|
171
171
|
},
|
|
172
172
|
});
|
|
173
|
+
this.streamUnit = "lbs";
|
|
173
174
|
/**
|
|
174
175
|
* Retrieves battery or voltage information from the device.
|
|
175
176
|
* @returns {Promise<string | undefined>} A Promise that resolves with the battery or voltage information,
|
|
@@ -186,43 +187,36 @@ class ForceBoard extends device_model_js_1.Device {
|
|
|
186
187
|
*/
|
|
187
188
|
this.handleNotifications = (value) => {
|
|
188
189
|
if (value) {
|
|
189
|
-
// Update timestamp
|
|
190
190
|
this.updateTimestamp();
|
|
191
191
|
if (value.buffer) {
|
|
192
192
|
const receivedTime = Date.now();
|
|
193
193
|
const dataArray = new Uint8Array(value.buffer);
|
|
194
|
-
// First two bytes contain the number of samples in the packet
|
|
195
194
|
const numSamples = (dataArray[0] << 8) | dataArray[1];
|
|
196
|
-
|
|
195
|
+
this.currentSamplesPerPacket = numSamples;
|
|
196
|
+
this.recordPacketReceived();
|
|
197
197
|
for (let i = 0; i < numSamples; i++) {
|
|
198
198
|
const offset = 2 + i * 3; // Skip the first 2 bytes which indicate number of samples
|
|
199
199
|
if (offset + 2 < dataArray.length) {
|
|
200
|
-
// Sample = byte1*32768 + byte2*256 + byte3
|
|
200
|
+
// Sample = byte1*32768 + byte2*256 + byte3 (device streams in LBS)
|
|
201
201
|
const receivedData = dataArray[offset] * 32768 + dataArray[offset + 1] * 256 + dataArray[offset + 2];
|
|
202
|
-
// Convert from LBS to KG
|
|
203
|
-
const convertedReceivedData = receivedData * 0.453592;
|
|
204
202
|
// Tare correction
|
|
205
|
-
const numericData =
|
|
206
|
-
// Add data to downloadable Array
|
|
207
|
-
this.downloadPackets.push({
|
|
208
|
-
received: receivedTime,
|
|
209
|
-
sampleNum: this.dataPointCount,
|
|
210
|
-
battRaw: 0,
|
|
211
|
-
samples: [convertedReceivedData],
|
|
212
|
-
masses: [numericData],
|
|
213
|
-
});
|
|
214
|
-
// Update peak
|
|
215
|
-
this.peak = Math.max(this.peak, numericData);
|
|
216
|
-
// Update running sum and count
|
|
203
|
+
const numericData = receivedData - this.applyTare(receivedData);
|
|
217
204
|
const currentMassTotal = Math.max(-1000, numericData);
|
|
205
|
+
// Update session stats before building packet
|
|
206
|
+
this.peak = Math.max(this.peak, numericData);
|
|
207
|
+
this.min = Math.min(this.min, Math.max(-1000, numericData));
|
|
218
208
|
this.sum += currentMassTotal;
|
|
219
209
|
this.dataPointCount++;
|
|
220
|
-
// Calculate the average dynamically
|
|
221
210
|
this.mean = this.sum / this.dataPointCount;
|
|
211
|
+
// Add data to downloadable Array (raw and tare-adjusted, both in LBS)
|
|
212
|
+
this.downloadPackets.push(this.buildDownloadPacket(currentMassTotal, [receivedData], {
|
|
213
|
+
timestamp: receivedTime,
|
|
214
|
+
sampleIndex: this.dataPointCount,
|
|
215
|
+
}));
|
|
222
216
|
// Check if device is being used
|
|
223
217
|
this.activityCheck(numericData);
|
|
224
218
|
// Notify with weight data
|
|
225
|
-
this.notifyCallback(this.buildForceMeasurement(
|
|
219
|
+
this.notifyCallback(this.buildForceMeasurement(currentMassTotal));
|
|
226
220
|
}
|
|
227
221
|
}
|
|
228
222
|
}
|
|
@@ -255,7 +249,7 @@ class ForceBoard extends device_model_js_1.Device {
|
|
|
255
249
|
* @returns {Promise<void>} A promise that resolves when the streaming operation is completed.
|
|
256
250
|
*/
|
|
257
251
|
this.stream = async (duration = 0) => {
|
|
258
|
-
|
|
252
|
+
this.resetPacketTracking();
|
|
259
253
|
await this.write("weight", "tx", this.commands.START_WEIGHT_MEAS, duration);
|
|
260
254
|
};
|
|
261
255
|
/**
|