@robotical/webapp-types 3.25.8 → 3.25.9

package/dist-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marty-web-app",
-    "version": "3.25.8",
+    "version": "3.25.9",
     "private": true,
     "engines": {
         "node": ">=20"

package/dist-types/src/components/disposables/buttons/SimpleButton/index.d.ts

@@ -11,6 +11,7 @@ type SimpleButtonProps = {
     textColour?: string;
     ariaLabel?: string;
     buttonType?: "button" | "submit" | "reset";
+    className?: string;
 };
-export default function SimpleButton({ onClick, title, titleSize, disabled, colour, otherStyles, borderColour, textColour, ariaLabel, buttonType, }: SimpleButtonProps): import("react/jsx-runtime").JSX.Element;
+export default function SimpleButton({ onClick, title, titleSize, disabled, colour, otherStyles, borderColour, textColour, ariaLabel, buttonType, className, }: SimpleButtonProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist-types/src/components/disposables/buttons/SimpleButton/index.js

@@ -87,8 +87,8 @@ var getAccessibleTextColour = function (backgroundColour) {
     return blackContrast >= whiteContrast ? BLACK : WHITE;
 };
 export default function SimpleButton(_a) {
-    var onClick = _a.onClick, title = _a.title, titleSize = _a.titleSize, disabled = _a.disabled, colour = _a.colour, otherStyles = _a.otherStyles, borderColour = _a.borderColour, textColour = _a.textColour, ariaLabel = _a.ariaLabel, _b = _a.buttonType, buttonType = _b === void 0 ? "button" : _b;
+    var onClick = _a.onClick, title = _a.title, titleSize = _a.titleSize, disabled = _a.disabled, colour = _a.colour, otherStyles = _a.otherStyles, borderColour = _a.borderColour, textColour = _a.textColour, ariaLabel = _a.ariaLabel, _b = _a.buttonType, buttonType = _b === void 0 ? "button" : _b, _c = _a.className, className = _c === void 0 ? "" : _c;
     var resolvedTextColour = textColour || getAccessibleTextColour(colour);
     return (_jsx("button", __assign({ type: buttonType, className: "simple-button-component " +
-            (disabled ? "simple-button-component-disabled" : ""), disabled: disabled, "aria-label": ariaLabel, style: __assign(__assign({}, otherStyles), { fontSize: titleSize, backgroundColor: colour, border: borderColour && "1px solid ".concat(borderColour), color: resolvedTextColour }), onClick: onClick }, { children: title })));
+            (disabled ? "simple-button-component-disabled" : "") + " " + className, disabled: disabled, "aria-label": ariaLabel, style: __assign(__assign({}, otherStyles), { fontSize: titleSize, backgroundColor: colour, border: borderColour && "1px solid ".concat(borderColour), color: resolvedTextColour }), onClick: onClick }, { children: title })));
 }

package/dist-types/src/components/oneoffs/calibration-screens/ColourSensorCalibration/messages.d.ts

@@ -6,13 +6,14 @@ declare const english: {
     readonly uploadPending: "Some calibration data is waiting to upload. It is saved on this device and will retry automatically when the connection is available.";
     readonly uploadStorageWarning: "Some calibration data could not be saved on this device yet. Keep the app open and retry uploading before closing it.";
     readonly phoneUploadPending: "Calibration data is waiting to upload. Keep the app open until uploading finishes so these readings are not lost.";
+    readonly phoneUploadsAutomatic: "Calibration readings upload automatically under this session ID. Keep the app open while calibrating.";
     readonly retryUpload: "Retry calibration upload";
     readonly introduction: "Keep Marty connected to USB power. We will collect {{count}} readings each for air and white, then save the calibration. Keep the lighting the same throughout.";
     readonly sensor: "Colour sensor";
     readonly selectSensor: "Select a colour sensor";
     readonly selectReplacementSensor: "The sensor selected in diagnostics is no longer attached. Select the colour sensor you want to calibrate.";
     readonly step: "Step {{number}} of 2";
-    readonly air: "Lift Marty about 30 cm above the surface with both feet clear. Hold it steady and capture the air readings.";
+    readonly air: "Leave USB power connected. Lift Marty about 30 cm above the surface with both feet clear. Hold it steady and capture the air readings.";
     readonly white: "Place the foot with the selected colour sensor flat on a matt white surface, with the sensor fully over it. Hold Marty steady and capture the white readings.";
     readonly duration: "Each capture takes about 3–4 seconds once sampling starts. Preparing or restoring sensor settings can take a few extra seconds.";
     readonly preparing: "Preparing the sensor…";
@@ -30,8 +31,8 @@ declare const english: {
     readonly calibrationRequired: "Calibrate the colour sensor";
     readonly saved: "Calibration saved on Marty: {{count}} readings each for air and white.";
     readonly reconnectStep: "Final step: reconnect Marty";
-    readonly reconnect: "Disconnect Marty below, then use Connect Marty to connect the same robot again. Your calibration is saved. Colour diagnostics will unlock once Marty has loaded the new sensor settings.";
-    readonly disconnectToFinish: "Disconnect Marty to finish calibration";
+    readonly reconnect: "Leave the USB cable plugged in. Use Disconnect in app below, then use Connect Marty to connect the same robot again. Your calibration is saved. Colour diagnostics will unlock once Marty has loaded the new sensor settings.";
+    readonly disconnectToFinish: "Disconnect in app";
     readonly disconnecting: "Disconnecting Marty…";
     readonly loadingCalibration: "Marty has reconnected. Waiting for the new sensor settings and fresh readings…";
     readonly calibrationCheckDelayed: "Marty is connected, but the sensor check is taking longer than expected. The app is retrying automatically. Keep the sensor attached and Marty on USB power. If this continues, disconnect and reconnect Marty.";
@@ -46,6 +47,7 @@ declare const english: {
     readonly notInAir: "Lift Marty so both feet are clear of the surface, then try again.";
     readonly sensorDisconnected: "Connect and verify Marty, with its colour sensor attached, to continue.";
     readonly unsupported: "This sensor or app connection does not support the new calibration yet. Update the app and reconnect Marty. Supported colour sensor firmware: type 97 / 1.3.1 and type 98 / 1.4.0–1.4.1.";
+    readonly sensorInitialising: "The colour sensor is still getting ready. Keep Marty connected, wait a few seconds and try this step again.";
     readonly readFailed: "A sensor reading could not be collected. Keep Marty connected and try this step again.";
     readonly unstable: "The readings varied too much. Keep Marty steady and the lighting constant, then capture this position again.";
     readonly saturated: "The air readings reached the sensor's limit of 255. Lift Marty clear of the surface and keep it away from direct bright light, then retry. No new calibration was saved.";

package/dist-types/src/components/oneoffs/calibration-screens/ColourSensorCalibration/messages.js

@@ -6,13 +6,14 @@ var english = {
     uploadPending: "Some calibration data is waiting to upload. It is saved on this device and will retry automatically when the connection is available.",
     uploadStorageWarning: "Some calibration data could not be saved on this device yet. Keep the app open and retry uploading before closing it.",
     phoneUploadPending: "Calibration data is waiting to upload. Keep the app open until uploading finishes so these readings are not lost.",
+    phoneUploadsAutomatic: "Calibration readings upload automatically under this session ID. Keep the app open while calibrating.",
     retryUpload: "Retry calibration upload",
     introduction: "Keep Marty connected to USB power. We will collect {{count}} readings each for air and white, then save the calibration. Keep the lighting the same throughout.",
     sensor: "Colour sensor",
     selectSensor: "Select a colour sensor",
     selectReplacementSensor: "The sensor selected in diagnostics is no longer attached. Select the colour sensor you want to calibrate.",
     step: "Step {{number}} of 2",
-    air: "Lift Marty about 30 cm above the surface with both feet clear. Hold it steady and capture the air readings.",
+    air: "Leave USB power connected. Lift Marty about 30 cm above the surface with both feet clear. Hold it steady and capture the air readings.",
     white: "Place the foot with the selected colour sensor flat on a matt white surface, with the sensor fully over it. Hold Marty steady and capture the white readings.",
     duration: "Each capture takes about 3–4 seconds once sampling starts. Preparing or restoring sensor settings can take a few extra seconds.",
     preparing: "Preparing the sensor…",
@@ -30,8 +31,8 @@ var english = {
     calibrationRequired: "Calibrate the colour sensor",
     saved: "Calibration saved on Marty: {{count}} readings each for air and white.",
     reconnectStep: "Final step: reconnect Marty",
-    reconnect: "Disconnect Marty below, then use Connect Marty to connect the same robot again. Your calibration is saved. Colour diagnostics will unlock once Marty has loaded the new sensor settings.",
-    disconnectToFinish: "Disconnect Marty to finish calibration",
+    reconnect: "Leave the USB cable plugged in. Use Disconnect in app below, then use Connect Marty to connect the same robot again. Your calibration is saved. Colour diagnostics will unlock once Marty has loaded the new sensor settings.",
+    disconnectToFinish: "Disconnect in app",
     disconnecting: "Disconnecting Marty…",
     loadingCalibration: "Marty has reconnected. Waiting for the new sensor settings and fresh readings…",
     calibrationCheckDelayed: "Marty is connected, but the sensor check is taking longer than expected. The app is retrying automatically. Keep the sensor attached and Marty on USB power. If this continues, disconnect and reconnect Marty.",
@@ -46,6 +47,7 @@ var english = {
     notInAir: "Lift Marty so both feet are clear of the surface, then try again.",
     sensorDisconnected: "Connect and verify Marty, with its colour sensor attached, to continue.",
     unsupported: "This sensor or app connection does not support the new calibration yet. Update the app and reconnect Marty. Supported colour sensor firmware: type 97 / 1.3.1 and type 98 / 1.4.0–1.4.1.",
+    sensorInitialising: "The colour sensor is still getting ready. Keep Marty connected, wait a few seconds and try this step again.",
     readFailed: "A sensor reading could not be collected. Keep Marty connected and try this step again.",
     unstable: "The readings varied too much. Keep Marty steady and the lighting constant, then capture this position again.",
     saturated: "The air readings reached the sensor's limit of 255. Lift Marty clear of the surface and keep it away from direct bright light, then retry. No new calibration was saved.",

package/dist-types/src/utils/colour-sensor-registers.js

@@ -250,9 +250,12 @@ export var readColourSensorReadiness = function (sensor, signal, checkActive) {
             var result = response;
             if ((result === null || result === void 0 ? void 0 : result.rslt) === "ok" && result.colourDiagnosticsProtocol === 1 && typeof result.ready === "boolean")
                 ok(result.ready);
-            else
+            // An older bridge forwards this local query to firmware and replies without the diagnostics protocol.
+            else if (((result === null || result === void 0 ? void 0 : result.rslt) === "ok" || (result === null || result === void 0 ? void 0 : result.rslt) === "fail") && result.colourDiagnosticsProtocol !== 1)
                 unavailable("unsupported");
-        }, function () { return unavailable("unsupported"); });
+            else
+                unavailable((result === null || result === void 0 ? void 0 : result.rslt) === "fail" ? "commandFailed" : "invalidResponse");
+        }, function () { return unavailable("commandFailed"); });
     });
 };
 export var collectColourSensorSetup = function (sensor, signal, checkActive) { return __awaiter(void 0, void 0, void 0, function () {

package/dist-types/src/utils/marty-colour-policy.json

@@ -5,7 +5,7 @@
     "boundaries": [
         { "hue": [0, 15], "chroma": [50, 200], "clear": [40, 150], "name": "red" },
         { "hue": [20, 65], "chroma": [40, 300], "clear": [100, 255], "name": "yellow" },
-        { "hue": [75, 160], "chroma": [5, 100], "clear": [25, 150], "name": "green" },
+        { "hue": [75, 170], "chroma": [5, 100], "clear": [25, 150], "name": "green" },
         { "hue": [180, 240], "chroma": [40, 260], "clear": [55, 255], "name": "blue" },
         { "hue": [240, 320], "chroma": [5, 100], "clear": [10, 150], "name": "purple" },
         { "hue": [345, 361], "chroma": [50, 200], "clear": [40, 150], "name": "red" }

package/package.json

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