@robotical/webapp-types 3.7.8 → 3.7.10

package/dist-types/src/store/SelectedRaftContext.js

@@ -26,15 +26,18 @@ export var NewRobotIdE;
     NewRobotIdE["NEW"] = "=+__new__+=";
 })(NewRobotIdE || (NewRobotIdE = {}));
 var ConnectedRaftContext = createContext({
+    nameUpdatedState: 0,
     connectedRafts: [],
     addConnectedRaft: function (connectedRaft) { },
     removeConnectedRaft: function (connectedRaftId) { },
     setSelectedRaft: function (connectedRaftId) { },
+    nameUpdated: function () { },
 });
 // Provider component
 export var ConnectedRaftContentProvider = function (_a) {
     var children = _a.children;
     var _b = useState([{ id: NewRobotIdE.NEW, isSelected: true, name: "Connect to new robot", type: RaftTypeE.undefined }]), connectedRafts = _b[0], setConnectedRafts = _b[1];
+    var _c = useState(0), nameUpdatedState = _c[0], setNameUpdatedState = _c[1];
     useEffect(function () {
         if (window.applicationManager) {
             window.applicationManager.connectedRaftContextMethods = {
@@ -47,12 +50,18 @@ export var ConnectedRaftContentProvider = function (_a) {
                 setSelectedRaft: function (connectedRaftId) {
                     setSelectedRaft(connectedRaftId);
                 },
+                nameUpdated: function () {
+                    nameUpdated();
+                },
             };
         }
     }, []);
     useEffect(function () {
         window.applicationManager.connectedRaftsContext = connectedRafts;
     }, [connectedRafts]);
+    var nameUpdated = function () {
+        setNameUpdatedState(function (prev) { return prev + 1; });
+    };
     var addConnectedRaft = function (connectedRaft) {
         // if the new raft is already in the list, do not add it again, just select it
         var existingRaft = connectedRafts.find(function (connectedRaft_) { return connectedRaft_.id === connectedRaft.id; });
@@ -79,6 +88,6 @@ export var ConnectedRaftContentProvider = function (_a) {
         setConnectedRafts(function (prev) { return prev.map(function (connectedRaft) { return (__assign(__assign({}, connectedRaft), { isSelected: false })); }); });
         setConnectedRafts(function (prev) { return prev.map(function (connectedRaft) { return (__assign(__assign({}, connectedRaft), { isSelected: connectedRaft.id === connectedRaftId })); }); });
     };
-    return (_jsx(ConnectedRaftContext.Provider, __assign({ value: { connectedRafts: connectedRafts, addConnectedRaft: addConnectedRaft, removeConnectedRaft: removeConnectedRaft, setSelectedRaft: setSelectedRaft } }, { children: children })));
+    return (_jsx(ConnectedRaftContext.Provider, __assign({ value: { connectedRafts: connectedRafts, addConnectedRaft: addConnectedRaft, removeConnectedRaft: removeConnectedRaft, setSelectedRaft: setSelectedRaft, nameUpdated: nameUpdated, nameUpdatedState: nameUpdatedState } }, { children: children })));
 };
 export var useConnectedRafts = function () { return useContext(ConnectedRaftContext); };

package/dist-types/src/types/communication-between-apps/wrapper-communication.d.ts

@@ -28,7 +28,9 @@ export declare enum AppSentMessage {
     DELETE_FILE_FROM_DEVICE_LOCAL_STORAGE = "DELETE_FILE_FROM_DEVICE_LOCAL_STORAGE",
     LIST_FILES_FROM_DEVICE_LOCAL_STORAGE = "LIST_FILES_FROM_DEVICE_LOCAL_STORAGE",
     LOG = "LOG",
-    INJECT_JS = "INJECT_JS"
+    INJECT_JS = "INJECT_JS",
+    MARTY_GET_COMMS_STATS = "MARTY_GET_COMMS_STATS",
+    MARTY_CALIBRATE_COLOUR_SENSOR = "MARTY_CALIBRATE_COLOUR_SENSOR"
 }
 export declare enum WrapperSentMessage {
     RAFT_PUBLISHED_EVENT = "RAFT_PUBLISHED_EVENT",

package/dist-types/src/types/communication-between-apps/wrapper-communication.js

@@ -20,6 +20,8 @@ export var AppSentMessage;
     AppSentMessage["LIST_FILES_FROM_DEVICE_LOCAL_STORAGE"] = "LIST_FILES_FROM_DEVICE_LOCAL_STORAGE";
     AppSentMessage["LOG"] = "LOG";
     AppSentMessage["INJECT_JS"] = "INJECT_JS";
+    AppSentMessage["MARTY_GET_COMMS_STATS"] = "MARTY_GET_COMMS_STATS";
+    AppSentMessage["MARTY_CALIBRATE_COLOUR_SENSOR"] = "MARTY_CALIBRATE_COLOUR_SENSOR";
 })(AppSentMessage || (AppSentMessage = {}));
 export var WrapperSentMessage;
 (function (WrapperSentMessage) {

package/dist-types/src/utils/helpers/wifi-configuration-subtitle-gen.d.ts

@@ -1,3 +1,4 @@
 import RAFT from "../../application/RAFTs/RAFT";
+import { RaftWifiConnStatus } from "@robotical/raftjs";
 export declare const FW_VERSION_RSSI_WIFI = "1.2.0";
-export default function wifiConfigSub(raft: RAFT): "" | "Currently, wifi configuration only works in the phone application.";
+export default function wifiConfigSub(raft: RAFT | undefined, cachedStatus: RaftWifiConnStatus | undefined): string | undefined;

package/dist-types/src/utils/helpers/wifi-configuration-subtitle-gen.js

@@ -1,34 +1,31 @@
 import isVersionGreater from "./compare-version";
+import { RaftWifiConnState } from "@robotical/raftjs";
 export var FW_VERSION_RSSI_WIFI = "1.2.0"; // greater versions than this (1.1.17) have the wifi rssi logic
-export default function wifiConfigSub(raft) {
+export default function wifiConfigSub(raft, cachedStatus) {
+    if (!raft) {
+        return "No raft connected";
+    }
     if (!isVersionGreater(raft.getRaftVersion(), FW_VERSION_RSSI_WIFI)) {
         return "Currently, wifi configuration only works in the phone application.";
     }
-    return "";
-    // const isPaused = window.marty.getCachedWifiStatus().ssid ? true : false;
-    // const conInfo =
-    //   window.marty.getCachedWifiStatus().connState ===
-    //     RICWifiConnState.WIFI_CONN_CONNECTED ||
-    //   window.marty.getCachedWifiStatus().ssid
-    //     ? window.marty.getCachedWifiStatus().ipAddress +
-    //       " on " +
-    //       window.marty.getCachedWifiStatus().ssid
-    //     : null;
-    // const isConnected =
-    //   window.marty.getCachedWifiStatus().connState ===
-    //   RICWifiConnState.WIFI_CONN_CONNECTED;
-    // let subtitle;
-    // if (isConnected) {
-    //   subtitle = "Connected";
-    // }
-    // if (isPaused) {
-    //   subtitle = "Connected (Paused for BLE)";
-    // }
-    // if (!isConnected && !isPaused) {
-    //   subtitle = "Not Connected";
-    // }
-    // if (conInfo) {
-    //   subtitle += " | " + conInfo;
-    // }
-    // return subtitle;
+    var isPaused = cachedStatus === null || cachedStatus === void 0 ? void 0 : cachedStatus.isPaused;
+    var conInfo = (cachedStatus === null || cachedStatus === void 0 ? void 0 : cachedStatus.connState) === RaftWifiConnState.WIFI_CONN_CONNECTED ||
+        (cachedStatus === null || cachedStatus === void 0 ? void 0 : cachedStatus.ssid)
+        ? cachedStatus.ipAddress + (isPaused ? "" : " on " + cachedStatus.ssid)
+        : null;
+    var isConnected = (cachedStatus === null || cachedStatus === void 0 ? void 0 : cachedStatus.connState) === RaftWifiConnState.WIFI_CONN_CONNECTED && (cachedStatus === null || cachedStatus === void 0 ? void 0 : cachedStatus.ipAddress);
+    var subtitle;
+    if (isConnected) {
+        subtitle = "Connected";
+    }
+    if (isConnected && isPaused) {
+        subtitle = "Connected (Paused for BLE)";
+    }
+    if (!isConnected) {
+        subtitle = "Not Connected";
+    }
+    if (conInfo) {
+        subtitle += " | " + conInfo;
+    }
+    return subtitle;
 }

package/dist-types/src/wrapper-app/WrapperAppManager.d.ts

@@ -1,11 +1,16 @@
 import { RaftInfoEvents } from "../types/events/raft-info";
 import { ConnectionAttemptResults, RaftConnectionMethod } from "../types/raft";
+import Connector from "./connectors/Connector";
 import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
 import { RICLedLcdColours } from "@robotical/roboticaljs";
 export declare class WrapperAppManager {
     private connectors;
     private _observers;
     constructor();
+    /**
+     * Get connector
+     */
+    getConnector(raftId: string): Connector | undefined;
     /**
     * Connect to a RAFT
     *
@@ -15,10 +20,21 @@ export declare class WrapperAppManager {
     *
     */
     connect(method: RaftConnectionMethod, uuids: string[]): Promise<ConnectionAttemptResults>;
+    /**
+     * Get Marty Comms stats
+     */
+    getCommsStatsMarty(raftId: string): {
+        msgRxRate: number;
+        msgRoundtripWorstMs: number;
+        msgRoundtripLastMs: number;
+        msgRoundtripBestMs: number;
+        msgRetries: number;
+    } | undefined;
     /**
      * Re-triggers the connect event which was missed due to the connection logic
      */
     getMissedConnEvent(raftId: any): void;
+    calibrateColourSensorMarty(raftId: string): Promise<boolean>;
     /**
      * Get the RAFT Name
      */

package/dist-types/src/wrapper-app/WrapperAppManager.js

@@ -38,6 +38,7 @@ import { WrapperSentMessage } from "../types/communication-between-apps/wrapper-
 import Logger from "../services/logger/Logger";
 import { RaftConnEvent } from "@robotical/raftjs";
 import ConnectorFactory from "./connectors/ConnectorFactory";
+import ColourSensorManualCalibratorMarty from "./utils/ColourSensorManualCalibratorMarty";
 var SHOW_LOGS = true;
 var TAG = "WrapperAppManager";
 var WrapperAppManager = /** @class */ (function () {
@@ -47,6 +48,12 @@ var WrapperAppManager = /** @class */ (function () {
         // Observers
         this._observers = {};
     }
+    /**
+     * Get connector
+     */
+    WrapperAppManager.prototype.getConnector = function (raftId) {
+        return this.connectors[raftId];
+    };
     /**
     * Connect to a RAFT
     *
@@ -83,6 +90,23 @@ var WrapperAppManager = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Get Marty Comms stats
+     */
+    WrapperAppManager.prototype.getCommsStatsMarty = function (raftId) {
+        if (this.connectors[raftId]) {
+            var raftConnector = this.connectors[raftId].connManager.getConnector();
+            var commsStats = raftConnector.getCommsStats();
+            return {
+                msgRxRate: commsStats.getMsgRxRate(),
+                msgRoundtripWorstMs: commsStats.getRTWorstMs(),
+                msgRoundtripLastMs: commsStats.getRTLastMs(),
+                msgRoundtripBestMs: commsStats.getRTBestMs(),
+                msgRetries: commsStats.getRetries()
+            };
+        }
+        return undefined;
+    };
     /**
      * Re-triggers the connect event which was missed due to the connection logic
      */
@@ -92,6 +116,29 @@ var WrapperAppManager = /** @class */ (function () {
             this.connectors[raftId].publish("conn", RaftConnEvent.CONN_CONNECTED, "connect", {});
         }
     };
+    //=====================//
+    /* CALIBRATE MARTY  */
+    //=====================//
+    WrapperAppManager.prototype.calibrateColourSensorMarty = function (raftId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var raftConnector, didCalibrate;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.connectors[raftId]) return [3 /*break*/, 2];
+                        raftConnector = this.connectors[raftId].connManager.getConnector();
+                        return [4 /*yield*/, ColourSensorManualCalibratorMarty.calibrate(raftConnector)];
+                    case 1:
+                        didCalibrate = _a.sent();
+                        return [2 /*return*/, didCalibrate];
+                    case 2: return [2 /*return*/, false];
+                }
+            });
+        });
+    };
+    //=====================//
+    /* END CALIBRATE MARTY */
+    //=====================//
     /**
      * Get the RAFT Name
      */

package/dist-types/src/wrapper-app/communicators/WebAppCommunicator.js

@@ -115,7 +115,7 @@ var WebAppCommunicator = /** @class */ (function () {
 }());
 export default WebAppCommunicator;
 var receivedMessageHandler = function (receivedMessage, data, messagePromiseId) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connectionResults, error_1, ricName, error_2, verifyResults, error_3, stopVerifyResults, error_4, disconnectResults, error_5, restResults, error_6, missedConnEventResults, streamAudioResults;
+    var _a, connectionResults, error_1, ricName, error_2, verifyResults, error_3, stopVerifyResults, error_4, disconnectResults, error_5, restResults, error_6, missedConnEventResults, streamAudioResults, commsStats, calibrateColourSensorResults, error_7;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -130,8 +130,10 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                     case AppSentMessage.RAFT_SEND_REST: return [3 /*break*/, 22];
                     case AppSentMessage.GET_MISSED_CONN_EVENT: return [3 /*break*/, 26];
                     case AppSentMessage.RAFT_STREAM_AUDIO: return [3 /*break*/, 27];
+                    case AppSentMessage.MARTY_GET_COMMS_STATS: return [3 /*break*/, 28];
+                    case AppSentMessage.MARTY_CALIBRATE_COLOUR_SENSOR: return [3 /*break*/, 29];
                 }
-                return [3 /*break*/, 28];
+                return [3 /*break*/, 33];
             case 1:
                 try {
                     console.log("3");
@@ -143,7 +145,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 29];
+                return [3 /*break*/, 34];
             case 2:
                 _b.trys.push([2, 4, , 5]);
                 return [4 /*yield*/, wrapperAppManager.connect(data.method, data.uuids)];
@@ -155,7 +157,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_1 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_1.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 5];
-            case 5: return [3 /*break*/, 29];
+            case 5: return [3 /*break*/, 34];
             case 6:
                 _b.trys.push([6, 8, , 9]);
                 return [4 /*yield*/, wrapperAppManager.getRaftName(data.raftId)];
@@ -167,7 +169,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_2 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_2.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 9];
-            case 9: return [3 /*break*/, 29];
+            case 9: return [3 /*break*/, 34];
             case 10:
                 _b.trys.push([10, 12, , 13]);
                 return [4 /*yield*/, wrapperAppManager.verifyRaft(data.ledLcdColours, data.raftId)];
@@ -179,7 +181,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_3 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_3.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 13];
-            case 13: return [3 /*break*/, 29];
+            case 13: return [3 /*break*/, 34];
             case 14:
                 _b.trys.push([14, 16, , 17]);
                 return [4 /*yield*/, wrapperAppManager.stopVerifyingRaft(data.isCorrectRIC, data.raftId)];
@@ -191,7 +193,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_4 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_4.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 17];
-            case 17: return [3 /*break*/, 29];
+            case 17: return [3 /*break*/, 34];
             case 18:
                 _b.trys.push([18, 20, , 21]);
                 return [4 /*yield*/, wrapperAppManager.disconnect(data.raftId)];
@@ -203,7 +205,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_5 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_5.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 21];
-            case 21: return [3 /*break*/, 29];
+            case 21: return [3 /*break*/, 34];
             case 22:
                 _b.trys.push([22, 24, , 25]);
                 return [4 /*yield*/, wrapperAppManager.sendRestMessage(data.msg, data.params, data.raftId)];
@@ -215,7 +217,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_6 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_6.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 25];
-            case 25: return [3 /*break*/, 29];
+            case 25: return [3 /*break*/, 34];
             case 26:
                 try {
                     missedConnEventResults = wrapperAppManager.getMissedConnEvent(data.raftId);
@@ -224,7 +226,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 29];
+                return [3 /*break*/, 34];
             case 27:
                 try {
                     streamAudioResults = wrapperAppManager.streamAudio(data.raftId, data.streamContents, data.clearExisting, data.duration);
@@ -233,11 +235,32 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 29];
+                return [3 /*break*/, 34];
             case 28:
+                try {
+                    commsStats = wrapperAppManager.getCommsStatsMarty(data.raftId);
+                    window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: commsStats, messagePromiseId: messagePromiseId });
+                }
+                catch (error) {
+                    window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
+                }
+                return [3 /*break*/, 34];
+            case 29:
+                _b.trys.push([29, 31, , 32]);
+                return [4 /*yield*/, wrapperAppManager.calibrateColourSensorMarty(data.raftId)];
+            case 30:
+                calibrateColourSensorResults = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: calibrateColourSensorResults, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 32];
+            case 31:
+                error_7 = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: false, error: error_7.message, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 32];
+            case 32: return [3 /*break*/, 34];
+            case 33:
                 Logger.warn(SHOW_LOGS, TAG, "Unhandled message: ".concat(receivedMessage));
-                _b.label = 29;
-            case 29: return [2 /*return*/];
+                _b.label = 34;
+            case 34: return [2 /*return*/];
         }
     });
 }); };

package/dist-types/src/wrapper-app/utils/ColourSensorManualCalibratorMarty.d.ts

@@ -0,0 +1,19 @@
+import { RaftConnector } from "@robotical/raftjs";
+export default class ColourSensorManualCalibratorMarty {
+    private static _raftConnector;
+    private static _isCalibrating;
+    private static _calibrationValues;
+    private static _colourSensorReadings;
+    static calibrate(raftConnector: RaftConnector, retryTimes?: number): Promise<boolean>;
+    private static prepareForCalibration;
+    private static performCalibrationSequence;
+    private static handleCalibrationOutcome;
+    private static handleMaxAttempts;
+    private static almostEqual;
+    private static compareCalibrationValues;
+    private static turnOnServosIfRequired;
+    private static getColourSensorNames;
+    private static getCalibration;
+    private static getColourSensorReading;
+    private static calibrateCS;
+}