@robdobsn/raftjs 1.5.0 → 1.5.5

package/examples/dashboard/src/SettingsScreen.tsx

@@ -0,0 +1,125 @@
+// src/SettingsScreen.tsx
+import React, { useState, useEffect } from 'react';
+import SettingsManager from './SettingsManager';
+import ConnManager from './ConnManager';
+
+const connManager = ConnManager.getInstance();
+
+const SettingsScreen = ({ onBack }: { onBack: () => void }) => {
+  const settingsManager = SettingsManager.getInstance();
+
+  const [latencyTest, setLatencyTest] = useState<boolean>(
+    settingsManager.getSetting('latencyTest')
+  );
+  const [showCharts, setShowCharts] = useState<boolean>(
+    settingsManager.getSetting('showCharts')
+  );
+  const [maxChartDataPoints, setMaxChartDataPoints] = useState<number>(
+    settingsManager.getSetting('maxChartDataPoints')
+  );
+  const [maxDatapointsToStore, setMaxDatapointsToStore] = useState<number>(
+    settingsManager.getSetting('maxDatapointsToStore')
+  );
+
+  const handleSaveAndReturn = () => {
+    // Save settings to SettingsManager
+    settingsManager.setSetting('latencyTest', latencyTest);
+    settingsManager.setSetting('showCharts', showCharts);
+    settingsManager.setSetting('maxChartDataPoints', maxChartDataPoints);
+    settingsManager.setSetting('maxDatapointsToStore', maxDatapointsToStore);
+
+    // Log and update maxDatapointsToStore in DeviceManager
+    console.log(
+      `Set maxDatapointsToStore to ${maxDatapointsToStore} ` +
+      `${connManager.getConnector().getSystemType()} ` +
+      `${connManager.getConnector().getSystemType()?.deviceMgrIF}` +
+      `${connManager.getConnector().getSystemType()?.deviceMgrIF?.setMaxDataPointsToStore}`
+    );
+
+    connManager.getConnector().getSystemType()?.deviceMgrIF?.setMaxDataPointsToStore(maxDatapointsToStore);
+
+    // Call the onBack function
+    onBack();
+  };
+
+  return (
+    <div className="content-outer">
+      <div className="header">
+        <h1>RaftJS Dashboard Settings</h1>
+      </div>
+      <div className="content-body">
+        <div className="info-boxes">
+          <div className="info-box">
+
+            <div className="settings-item">
+              <label>
+                <input
+                  type="checkbox"
+                  checked={latencyTest}
+                  onChange={(e) => setLatencyTest(e.target.checked)}
+                />
+                Latency Test
+              </label>
+            </div>
+
+            <div className="settings-item">
+              <label>
+                <input
+                  type="checkbox"
+                  checked={showCharts}
+                  onChange={(e) => setShowCharts(e.target.checked)}
+                />
+                Show Charts
+              </label>
+            </div>
+
+            <div className="settings-item">
+              <label>
+                Max Chart Points
+                <input
+                  type="number"
+                  min="1"
+                  max="500"
+                  value={maxChartDataPoints}
+                  onChange={(e) => setMaxChartDataPoints(Math.min(parseInt(e.target.value, 10) || 1, 500))}
+                  style={{ width: '50px', marginLeft: '10px' }}
+                />
+              </label>
+            </div>
+
+            <div className="settings-item">
+              <label>
+                Max Stored Points
+                <input
+                  type="number"
+                  min="1"
+                  max="100000"
+                  value={maxDatapointsToStore}
+                  onChange={(e) => setMaxDatapointsToStore(Math.min(parseInt(e.target.value, 10) || 1, 100000))}
+                  style={{ width: '50px', marginLeft: '10px' }}
+                />
+              </label>
+            </div>
+
+            <button className="action-button" onClick={handleSaveAndReturn}>
+              Save and Return
+            </button>
+
+            <button
+              className="action-button"
+              style={{ marginTop: '10px' }}
+              onClick={() => {
+                settingsManager.resetSettings();
+                window.location.reload();
+              }}
+            >
+              Reset to Defaults
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default SettingsScreen;

package/examples/dashboard/src/SystemTypeCog/CogStateInfo.ts

@@ -1,6 +1,7 @@
 import { time } from "console";
 import RaftLog from "../../../../src/RaftLog";
 import { DeviceManager } from "../../../../src/RaftDeviceManager";
+import RaftUtils from "../../../../src/RaftUtils";
 
 // export interface IMUStateInfo {
 //     gx: number;
@@ -45,18 +46,22 @@ export class CogStateInfo {
         return this._deviceManager; 
     }
 
-    updateFromMsg(rxMsg: Uint8Array, frameTimeMs: number): Array<string> {
+    updateFromMsg(rxMsg: Uint8Array, frameTimeMs: number, isBinary: boolean): Array<string> {
 
         // Debug 
         // RaftLog.info(`CogStateInfo: updateFromMsg: rxMsg: ${rxMsg} frameTimeMs: ${frameTimeMs}`);
 
-        // Convert Uint8Array to string
-        const decoder = new TextDecoder('utf-8');
-        const jsonString = decoder.decode(rxMsg.slice(2));
-
-        // Handle using device manager
-        this._deviceManager.handleClientMsgJson(jsonString);
-
+        if (isBinary) {
+            // console.log(`CogStateInfo: updateFromMsg: ${RaftUtils.bufferToHex(rxMsg)}`);
+            this._deviceManager.handleClientMsgBinary(rxMsg);
+        } else {
+            // Convert Uint8Array to string
+            const decoder = new TextDecoder('utf-8');
+            const jsonString = decoder.decode(rxMsg.slice(2));
+
+            // Handle using device manager
+            this._deviceManager.handleClientMsgJson(jsonString);
+        }
 
     //     // Debug
     //     // RaftLog.info(`CogStateInfo: updateFromMsg: jsonString: ${jsonString}`);

package/examples/dashboard/src/SystemTypeCog/SystemTypeCog.ts

@@ -3,6 +3,8 @@ import { RaftEventFn, RaftLog, RaftOKFail, RaftPublishEvent, RaftPublishEventNam
 import { CogStateInfo } from "./CogStateInfo";
 import { DeviceManager } from "../../../../src/RaftDeviceManager";
 
+const SUBSCRIBE_BINARY_MSGS = true;
+
 export default class SystemTypeCog implements RaftSystemType {
     nameForDialogs = "Robotical Cog";
     defaultWiFiHostname = "Cog";
@@ -38,15 +40,16 @@ export default class SystemTypeCog implements RaftSystemType {
     // Subscribe for updates
     subscribeForUpdates: RaftSubscribeForUpdatesCBType | null = async (systemUtils: RaftSystemUtils, enable: boolean) => {
       // Subscription rate
+      const topic = SUBSCRIBE_BINARY_MSGS ? "devbin" : "devjson";
       const subscribeRateHz = 0.1;
       try {
         const subscribeDisable = '{"cmdName":"subscription","action":"update",' +
           '"pubRecs":[' +
-          `{"name":"devjson","rateHz":0,}` +
+          `{"name":"${topic}","rateHz":0,}` +
           ']}';
         const subscribeEnable = '{"cmdName":"subscription","action":"update",' +
           '"pubRecs":[' +
-          `{"name":"devjson","trigger":"timeorchange","rateHz":${subscribeRateHz.toString()}}` +
+          `{"name":"${topic}","trigger":"timeorchange","rateHz":${subscribeRateHz.toString()}}` +
           ']}';
 
         const msgHandler = systemUtils.getMsgHandler();
@@ -67,9 +70,9 @@ export default class SystemTypeCog implements RaftSystemType {
     // Other message type
     rxOtherMsgType(payload: Uint8Array, frameTimeMs: number) {
 
-      // RICLog.debug(`rxOtherMsgType payload ${RICUtils.bufferToHex(payload)}`);
+      // RICLog.debug(`rxOtherMsgType payload ${RaftUtils.bufferToHex(payload)}`);
       RaftLog.verbose(`rxOtherMsgType payloadLen ${payload.length}`);
-      const topicIDs = this._stateInfo.updateFromMsg(payload, frameTimeMs);
+      const topicIDs = this._stateInfo.updateFromMsg(payload, frameTimeMs, SUBSCRIBE_BINARY_MSGS);
 
       // Call event handler if registered
       if (this._onEvent) {
@@ -77,7 +80,8 @@ export default class SystemTypeCog implements RaftSystemType {
           {
             topicIDs: topicIDs,
             payload: payload,
-            frameTimeMs: frameTimeMs
+            frameTimeMs: frameTimeMs,
+            isBinary: SUBSCRIBE_BINARY_MSGS
           });
       }
     };

package/examples/dashboard/src/SystemTypeGeneric/StateInfoGeneric.ts

@@ -7,17 +7,23 @@ export class StateInfoGeneric {
     public constructor(private _deviceManager: DeviceManager) {
     }
 
-    updateFromMsg(rxMsg: Uint8Array, frameTimeMs: number): Array<string> {
+    updateFromMsg(rxMsg: Uint8Array, frameTimeMs: number, isBinary: boolean): Array<string> {
 
         // Debug 
         // RaftLog.info(`StateInfoGeneric: updateFromMsg: rxMsg: ${rxMsg} frameTimeMs: ${frameTimeMs}`);
 
-        // Convert Uint8Array to string
-        const decoder = new TextDecoder('utf-8');
-        const jsonString = decoder.decode(rxMsg.slice(2));
+        // Handle binary or JSON
+        if (isBinary) {
+            // Handle using device manager
+            this._deviceManager.handleClientMsgBinary(rxMsg);            
+        } else {
+            // Convert Uint8Array to string
+            const decoder = new TextDecoder('utf-8');
+            const jsonString = decoder.decode(rxMsg.slice(2));
 
-        // Handle using device manager
-        this._deviceManager.handleClientMsgJson(jsonString);
+            // Handle using device manager
+            this._deviceManager.handleClientMsgJson(jsonString);
+        }
         return [];
 
     }

package/examples/dashboard/src/SystemTypeGeneric/SystemTypeGeneric.ts

@@ -3,6 +3,8 @@ import { RaftEventFn, RaftLog, RaftOKFail, RaftPublishEvent, RaftPublishEventNam
 import { StateInfoGeneric } from "./StateInfoGeneric";
 import { DeviceManager } from "../../../../src/RaftDeviceManager";
 
+const SUBSCRIBE_BINARY_MSGS = false;
+
 export default class SystemTypeGeneric implements RaftSystemType {
     nameForDialogs = "Generic System";
     defaultWiFiHostname = "Generic";
@@ -40,13 +42,14 @@ export default class SystemTypeGeneric implements RaftSystemType {
       // Subscription rate
       const subscribeRateHz = 0.1;
       try {
+        const topic = SUBSCRIBE_BINARY_MSGS ? "devbin" : "devjson";
         const subscribeDisable = '{"cmdName":"subscription","action":"update",' +
           '"pubRecs":[' +
-          `{"name":"devjson","rateHz":0,}` +
+          `{"name":"${topic}","rateHz":0,}` +
           ']}';
         const subscribeEnable = '{"cmdName":"subscription","action":"update",' +
           '"pubRecs":[' +
-          `{"name":"devjson","trigger":"timeorchange","rateHz":${subscribeRateHz.toString()}}` +
+          `{"name":"${topic}","trigger":"timeorchange","rateHz":${subscribeRateHz.toString()}}` +
           ']}';
 
         const msgHandler = systemUtils.getMsgHandler();
@@ -67,9 +70,9 @@ export default class SystemTypeGeneric implements RaftSystemType {
     // Other message type
     rxOtherMsgType(payload: Uint8Array, frameTimeMs: number) {
 
-      // RICLog.debug(`rxOtherMsgType payload ${RICUtils.bufferToHex(payload)}`);
+      // RICLog.debug(`rxOtherMsgType payload ${RaftUtils.bufferToHex(payload)}`);
       RaftLog.verbose(`rxOtherMsgType payloadLen ${payload.length}`);
-      const topicIDs = this._stateInfo.updateFromMsg(payload, frameTimeMs);
+      const topicIDs = this._stateInfo.updateFromMsg(payload, frameTimeMs, SUBSCRIBE_BINARY_MSGS);
 
       // Call event handler if registered
       if (this._onEvent) {
@@ -77,7 +80,8 @@ export default class SystemTypeGeneric implements RaftSystemType {
           {
             topicIDs: topicIDs,
             payload: payload,
-            frameTimeMs: frameTimeMs
+            frameTimeMs: frameTimeMs,
+            isBinary: SUBSCRIBE_BINARY_MSGS
           });
       }
     };

package/examples/dashboard/src/SystemTypeMarty/RICStateInfo.ts

@@ -50,19 +50,38 @@ export class RICStateInfo implements RaftDeviceMgrIF {
             deviceAttributes: {},
             deviceIsNew: false,
             stateChanged: false,
-            isOnline: false
+            isOnline: false,
+            deviceAddress: "",
+            deviceType: "",
+            busName: ""
         };
     }
 
-    onNewDevice(callback: (deviceKey: string, state: DeviceState) => void): void {
+    setMaxDataPointsToStore(maxDataPointsToStore: number): void {
         // TODO - implement if RICStateInfo is to be used as a DeviceMgr
     }
 
-    onNewDeviceAttribute(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void {
+    addNewDeviceCallback(callback: (deviceKey: string, state: DeviceState) => void): void {
         // TODO - implement if RICStateInfo is to be used as a DeviceMgr
     }
 
-    onNewAttributeData(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void {
+    removeNewDeviceCallback(callback: (deviceKey: string, state: DeviceState) => void): void {
+        // TODO - implement if RICStateInfo is to be used as a DeviceMgr
+    }
+
+    addNewAttributeCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void {
+        // TODO - implement if RICStateInfo is to be used as a DeviceMgr
+    }
+
+    removeNewAttributeCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void {
+        // TODO - implement if RICStateInfo is to be used as a DeviceMgr
+    }
+
+    addAttributeDataCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void {
+        // TODO - implement if RICStateInfo is to be used as a DeviceMgr
+    }
+
+    removeAttributeDataCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void {
         // TODO - implement if RICStateInfo is to be used as a DeviceMgr
     }
 

package/examples/dashboard/src/SystemTypeMarty/SystemTypeMarty.ts

@@ -98,7 +98,7 @@ export default class SystemTypeMarty implements RaftSystemType {
 
   // Other message type
   rxOtherMsgType(payload: Uint8Array, frameTimeMs: number) {
-    // RICLog.debug(`onRxROSSerialMsg payload ${RICUtils.bufferToHex(payload)}`);
+    // RICLog.debug(`onRxROSSerialMsg payload ${RaftUtils.bufferToHex(payload)}`);
     RaftLog.verbose(`onRxROSSerialMsg payloadLen ${payload.length}`);
     const topicIDs = this._ricStateInfo.updateFromROSSerialMsg(payload, this._commsStats, this._addOnManager, frameTimeMs);
 

package/examples/dashboard/src/styles.css

@@ -77,6 +77,16 @@ h1 {
     font-size: 1rem;
 }
 
+.settings-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px;
+    border: 1px solid #666;
+    border-radius: 4px;
+    margin-bottom: 10px;
+}
+
 .info-boxes {
     display: flex;
     justify-content: flex-start;
@@ -349,6 +359,10 @@ h1 {
     z-index: 10;
 }
 
+.header .dropdown-menu {
+    margin-top: 30px;
+}
+
 .menu-item {
     padding: 10px;
     cursor: pointer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robdobsn/raftjs",
-  "version": "1.5.0",
+  "version": "1.5.5",
   "description": "Javascript/TS library for Raft library",
   "main": "dist/web/main.js",
   "types": "dist/web/main.d.ts",
@@ -36,12 +36,12 @@
     "@typescript-eslint/eslint-plugin": "^8.6.0",
     "eslint": "^9.4.0",
     "react-native-ble-plx": "^3.2.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "text-encoding": "^0.7.0"
   },
   "dependencies": {
     "@types/text-encoding": "^0.0.39",
     "isomorphic-ws": "^5.0.0",
-    "text-encoding": "^0.7.0",
     "tslib": "^2.6.2"
   },
   "peerDependencies": {

package/src/RaftAttributeHandler.ts

@@ -103,7 +103,8 @@ export default class AttributeHandler {
                 devAttrsState[attrDef.n] = {
                     name: attrDef.n,
                     newAttribute: true,
-                    newData: true,
+                    newData: false,
+                    numNewValues: 0,
                     values: [],
                     units: decodeAttrUnitsEncoding(attrDef.u || ""),
                     range: attrDef.r || [0, 0],
@@ -122,6 +123,7 @@ export default class AttributeHandler {
             // Add the new values
             devAttrsState[attrDef.n].values.push(...newAttrValues[attrIdx]);
             devAttrsState[attrDef.n].newData = newAttrValues[attrIdx].length > 0;
+            devAttrsState[attrDef.n].numNewValues = newAttrValues[attrIdx].length;
         }
 
         // Handle the timestamps with increments if specified
@@ -239,6 +241,10 @@ export default class AttributeHandler {
         // Move buffer position if using relative positioning
         msgBufIdx += attrUsesAbsPos ? 0 : numBytesConsumed;
 
+        // if (attrDef.n === "amb0") {
+        //     console.log(`${new Date().toISOString()} ${attrDef.n} ${attrValues}`);
+        // }
+
         // Return the value
         return { values: attrValues, newMsgBufIdx: msgBufIdx };
     }

package/src/RaftChannelBLE.native.ts

@@ -474,7 +474,7 @@ export default class RaftChannelPhoneBLE implements RaftChannel {
     const rxFrame = RaftUtils.atob(msgFrameBase64!);
 
     // Debug
-    // RaftLog.debug('_onMsgRx from BLE ' + RICUtils.bufferToHex(rxFrame));
+    // RaftLog.debug('_onMsgRx from BLE ' + RaftUtils.bufferToHex(rxFrame));
 
     // Send
     if (rxFrame !== null && this._raftMsgHandler) {