@robotical/webapp-types 3.24.4 → 3.25.0

package/dist-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marty-web-app",
-    "version": "3.24.4",
+    "version": "3.25.0",
     "private": true,
     "engines": {
         "node": ">=20"
@@ -15,7 +15,7 @@
         "@robotical/codewheel": "^0.1.10",
         "@robotical/cog-shooter-game": "^0.1.27",
         "@robotical/jumping-game": "^0.1.29",
-        "@robotical/martyblocks": "^4.0.76",
+        "@robotical/martyblocks": "^4.0.77",
         "@robotical/martyblocksjr": "^4.5.6",
         "@robotical/maze": "^0.1.22",
         "@robotical/rc-sequencer": "^1.1.15",

package/dist-types/src/screens/configuration/marty/Diagnostics/ColourSensorDiagnostics/messages.d.ts

@@ -12,19 +12,27 @@ declare const colourDiagnosticsEnglish: {
     yellow: string;
     blue: string;
     red: string;
+    air: string;
     prompt: string;
+    airPrompt: string;
     result: string;
+    withoutAir: string;
     waiting: string;
     capture: string;
+    captureAir: string;
     capturing: string;
     uploading: string;
     saved: string;
     complete: string;
+    setupIncomplete: string;
+    wrapperUpdate: string;
+    extraCollected: string;
     retry: string;
     download: string;
     newSession: string;
     storageWarning: string;
     sensorDisconnected: string;
+    sensorInitialising: string;
     staleReading: string;
     invalidReading: string;
     backgrounded: string;

package/dist-types/src/screens/configuration/marty/Diagnostics/ColourSensorDiagnostics/messages.js

@@ -1,26 +1,33 @@
 var colourDiagnosticsEnglish = {
     title: "Colour sensor diagnostics",
-    instructions: "Rest Marty's sensor flat on each card and keep the lighting steady. Hold still for the two-second snapshot.",
+    instructions: "Rest Marty's sensor flat on each card, then take a snapshot with Marty lifted in the air. Keep the lighting steady and hold still until the capture finishes. Sensor setup is read automatically before two seconds of readings are collected.",
     sessionId: "Session ID",
     copyId: "Copy ID",
     copied: "Copied",
     sensor: "Colour sensor",
     selectSensor: "Select a sensor",
     connect: "Connect and verify Marty with a colour sensor attached to begin.",
-    green: "green", purple: "purple", yellow: "yellow", blue: "blue", red: "red",
+    green: "green", purple: "purple", yellow: "yellow", blue: "blue", red: "red", air: "in air",
     prompt: "Place the selected sensor on the {{colour}} card.",
+    airPrompt: "Lift Marty so both feet are at least 10 cm above any card or surface, with the sensors facing down and uncovered. Keep the lighting the same and hold still.",
     result: "Blocks interpretation: {{result}}",
+    withoutAir: "Colour match before the air flag is applied: {{result}}",
     waiting: "Select a sensor and wait for fresh readings.",
     capture: "Take {{colour}} snapshot",
+    captureAir: "Take air snapshot",
     capturing: "Capturing… Hold still",
     uploading: "Uploading…",
     saved: "{{saved}} snapshots uploaded · {{pending}} waiting to upload",
-    complete: "All five cards captured. You can take more snapshots of any card.",
+    complete: "All five cards and the air check captured. You can take more snapshots of any step.",
+    setupIncomplete: "Some extra sensor details could not be read. The available readings are saved. Keep Marty connected and take another snapshot to retry collecting those details.",
+    wrapperUpdate: "Extra sensor details need an updated phone app. The normal colour readings are saved. You can also collect the full data using the updated browser app.",
+    extraCollected: "Sensor settings and {{count}} raw readings collected.",
     retry: "Retry uploads",
     download: "Download data",
     newSession: "New session",
     storageWarning: "This browser cannot keep a local backup. Download the data before closing this page.",
     sensorDisconnected: "The selected sensor disconnected. Reconnect Marty and select the sensor again.",
+    sensorInitialising: "Marty is still loading the sensor settings. Wait a few seconds and try again.",
     staleReading: "Waiting for fresh sensor data. Keep Marty connected and try again.",
     invalidReading: "The sensor reading is incomplete. Wait for fresh data and try again.",
     backgrounded: "Keep this window visible during the snapshot and try again.",

package/dist-types/src/wrapper-app/connectors/MartyConnector/MartyConnector.d.ts

@@ -2,10 +2,18 @@ import { RaftInfoEvents } from "../../../types/events/raft-info";
 import { ConnectionAttemptResults, RaftConnectionMethod, RaftTypeE } from "../../../types/raft";
 import Connector from "../Connector";
 import ConnectorInterface from "../ConnectorInterface";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, RaftOKFail } from "@robdobsn/raftjs";
 import { ConnManager } from "@robotical/roboticaljs";
+import type { RestMessageOptions } from "../../../types/communication-between-apps/wrapper-communication";
 declare class MartyConnector extends Connector implements ConnectorInterface {
     type: RaftTypeE;
+    private colourDiagnosticsReady;
+    private colourDiagnosticsGeneration;
+    private resetColourDiagnosticsReadiness;
+    sendRestMessage(msg: string, params?: object, options?: RestMessageOptions): Promise<RaftOKFail & {
+        colourDiagnosticsProtocol?: number;
+        ready?: boolean;
+    }>;
     constructor(raftId: string, connManager: ConnManager, connectionMethod: RaftConnectionMethod);
     /**
      * Publish an event to all observers

package/dist-types/src/wrapper-app/connectors/MartyConnector/MartyConnector.js

@@ -77,6 +77,8 @@ var MartyConnector = /** @class */ (function (_super) {
     function MartyConnector(raftId, connManager, connectionMethod) {
         var _this = _super.call(this, raftId, connManager) || this;
         _this.type = RaftTypeE.MARTY;
+        _this.colourDiagnosticsReady = false;
+        _this.colourDiagnosticsGeneration = 0;
         if (connectionMethod === RaftConnectionMethod.WEB_BLE) {
             var streamHandler = _this.connManager.getConnector().getStreamHandler();
             // RaftJS chunks logical stream blocks to the safe Web Bluetooth write size.
@@ -84,6 +86,21 @@ var MartyConnector = /** @class */ (function (_super) {
         }
         return _this;
     }
+    MartyConnector.prototype.resetColourDiagnosticsReadiness = function () {
+        this.colourDiagnosticsReady = false;
+        return ++this.colourDiagnosticsGeneration;
+    };
+    MartyConnector.prototype.sendRestMessage = function (msg, params, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                // Local capability query: older wrappers forward it and cannot confirm safe register access.
+                if (msg === "diagnostics/colourSensorReady") {
+                    return [2 /*return*/, { rslt: "ok", colourDiagnosticsProtocol: 1, ready: this.colourDiagnosticsReady }];
+                }
+                return [2 /*return*/, _super.prototype.sendRestMessage.call(this, msg, params, options)];
+            });
+        });
+    };
     /**
      * Publish an event to all observers
      * Set in RICConnector as an event listener callback
@@ -109,6 +126,7 @@ var MartyConnector = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        this.resetColourDiagnosticsReadiness();
                         raftSystemUtils = this.connManager.getConnector().getRaftSystemUtils();
                         return [4 /*yield*/, raftSystemUtils.getSystemInfo()];
                     case 1:
@@ -143,6 +161,7 @@ var MartyConnector = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        this.resetColourDiagnosticsReadiness();
                         raftChannel = this.connManager.getConnector().getRaftChannel();
                         if (raftChannel) {
                             raftChannel.ricRestCmdBeforeDisconnect = function () { return null; };
@@ -186,7 +205,7 @@ var MartyConnector = /** @class */ (function (_super) {
     MartyConnector.prototype.connectionEventHandler = function (eventEnum, eventName, data) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _b, addOnManager, raftSystemUtils, msgHandler, addonManager, ricSystemUtils, spu, spuTwo, shouldUseLegacySoktoMode;
+            var _b, diagnosticGeneration, addOnManager, raftSystemUtils, msgHandler, addonManager, ricSystemUtils, retrieved, spu, spuTwo, shouldUseLegacySoktoMode;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -194,13 +213,20 @@ var MartyConnector = /** @class */ (function (_super) {
                         _b = eventEnum;
                         switch (_b) {
                             case RaftConnEvent.CONN_CONNECTED: return [3 /*break*/, 1];
-                            case RaftConnEvent.CONN_VERIFIED_CORRECT: return [3 /*break*/, 2];
+                            case RaftConnEvent.CONN_DISCONNECTED: return [3 /*break*/, 2];
+                            case RaftConnEvent.CONN_REJECTED: return [3 /*break*/, 2];
+                            case RaftConnEvent.CONN_VERIFIED_CORRECT: return [3 /*break*/, 3];
                         }
-                        return [3 /*break*/, 4];
-                    case 1: 
-                    // ignore
-                    return [3 /*break*/, 5];
+                        return [3 /*break*/, 5];
+                    case 1:
+                        this.resetColourDiagnosticsReadiness();
+                        // ignore
+                        return [3 /*break*/, 6];
                     case 2:
+                        this.resetColourDiagnosticsReadiness();
+                        return [3 /*break*/, 6];
+                    case 3:
+                        diagnosticGeneration = this.resetColourDiagnosticsReadiness();
                         addOnManager = this.connManager.getSystemType().getAddOnManager();
                         RICRoboticalAddOns.registerAddOns(addOnManager);
                         raftSystemUtils = this.connManager.getConnector().getRaftSystemUtils();
@@ -208,8 +234,11 @@ var MartyConnector = /** @class */ (function (_super) {
                         addonManager = this.connManager.getSystemType().getAddOnManager();
                         ricSystemUtils = new RICSystemUtils(msgHandler, addonManager);
                         return [4 /*yield*/, ricSystemUtils.retrieveMartySystemInfo()];
-                    case 3:
-                        _c.sent();
+                    case 4:
+                        retrieved = _c.sent();
+                        if (diagnosticGeneration !== this.colourDiagnosticsGeneration)
+                            return [2 /*return*/];
+                        this.colourDiagnosticsReady = retrieved;
                         spu = RICServoParamUpdater.getSingletonInstance(msgHandler);
                         spu && spu.init();
                         spuTwo = RICServoParamUpdater.getSingletonInstance();
@@ -219,9 +248,9 @@ var MartyConnector = /** @class */ (function (_super) {
                         this.connManager.getConnector().setLegacySoktoMode(shouldUseLegacySoktoMode);
                         // checking for servo faults (this will trigger reportMsgCallback)
                         (_a = this.connManager.getConnector().getSystemType()) === null || _a === void 0 ? void 0 : _a.getRICServoFaultDetector().atomicReadOperation();
-                        return [3 /*break*/, 5];
-                    case 4: return [3 /*break*/, 5];
-                    case 5: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 5: return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/webapp-types",
-  "version": "3.24.4",
+  "version": "3.25.0",
   "description": "Type definitions for the Application Manager",
   "main": "dist/application-manager.d.ts",
   "types": "dist/application-manager.d.ts",