@robotical/webapp-types 3.25.7 → 3.25.8

package/dist-types/package.json

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

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

@@ -10,6 +10,7 @@ declare const english: {
     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 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.";
@@ -25,7 +26,8 @@ declare const english: {
     readonly captureAir: "Capture air readings";
     readonly captureWhite: "Capture white and save calibration";
     readonly startAgain: "Start again";
-    readonly restartCalibration: "Calibrate this sensor again";
+    readonly restartCalibration: "Start air and white calibration";
+    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.";
@@ -33,8 +35,9 @@ declare const english: {
     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.";
-    readonly calibrationSensorChanged: "The attached colour sensor is different from the one that was calibrated. Reattach the original sensor to finish, or use the calibration screen to calibrate this sensor again.";
-    readonly calibrationSettingsChanged: "The sensor's stored white reference differs from the calibration that was saved. Reconnect Marty once; if this message remains, use the calibration screen to calibrate this sensor again.";
+    readonly calibrationSensorChanged: "A different colour sensor is attached. Start calibration for this sensor using air and white.";
+    readonly calibrationSettingsChanged: "Marty could not load the saved calibration. Start calibration again using air and white.";
+    readonly previousCalibrationChanged: "An earlier calibration no longer matches this sensor. Start a new calibration using air and white.";
     readonly disconnectFailed: "Marty could not be disconnected. Try the disconnect button again.";
     readonly reconnected: "Calibration complete. Marty has reconnected and loaded the saved sensor settings. Use Settings → Diagnostics to check all five cards and air.";
     readonly download: "Download a copy (optional)";

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

@@ -10,6 +10,7 @@ var english = {
     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.",
     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.",
@@ -25,7 +26,8 @@ var english = {
     captureAir: "Capture air readings",
     captureWhite: "Capture white and save calibration",
     startAgain: "Start again",
-    restartCalibration: "Calibrate this sensor again",
+    restartCalibration: "Start air and white calibration",
+    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.",
@@ -33,8 +35,9 @@ var english = {
     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.",
-    calibrationSensorChanged: "The attached colour sensor is different from the one that was calibrated. Reattach the original sensor to finish, or use the calibration screen to calibrate this sensor again.",
-    calibrationSettingsChanged: "The sensor's stored white reference differs from the calibration that was saved. Reconnect Marty once; if this message remains, use the calibration screen to calibrate this sensor again.",
+    calibrationSensorChanged: "A different colour sensor is attached. Start calibration for this sensor using air and white.",
+    calibrationSettingsChanged: "Marty could not load the saved calibration. Start calibration again using air and white.",
+    previousCalibrationChanged: "An earlier calibration no longer matches this sensor. Start a new calibration using air and white.",
     disconnectFailed: "Marty could not be disconnected. Try the disconnect button again.",
     reconnected: "Calibration complete. Marty has reconnected and loaded the saved sensor settings. Use Settings → Diagnostics to check all five cards and air.",
     download: "Download a copy (optional)",

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

@@ -30,7 +30,7 @@ var colourDiagnosticsEnglish = {
     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.",
     sensorBusy: "The sensor is completing another check. Wait a moment and take the snapshot again.",
-    calibrationReconnectRequired: "Reconnect Marty to finish calibration before taking more colour snapshots.",
+    calibrationReconnectRequired: "Complete colour sensor calibration before taking snapshots.",
     sensorAsleep: "Marty's sensor power is asleep. Taking a snapshot wakes the sensors before collecting readings.",
     sensorOffline: "The colour sensor is offline. Take a snapshot to wake it. If it stays offline, check the sensor connection.",
     sensorPowerFailed: "Marty's colour sensor did not wake up. No snapshot was saved. Check that Marty is powered on and the sensor is connected, then try again.",

package/dist-types/src/utils/colour-calibration-reconnect.d.ts

@@ -4,6 +4,7 @@ type PendingCalibration = {
     connectionInstanceId: string;
     serialNumber: string;
     whiteCalibrationHex: string;
+    savedAtMs?: number;
     calibrationRecord?: CalibrationRecordRef;
 };
 export declare class ColourCalibrationReconnectError extends Error {

package/dist-types/src/utils/colour-calibration-reconnect.js

@@ -88,7 +88,8 @@ export var getPendingColourCalibration = function (sensor) {
         }
         var parsed = JSON.parse(value);
         if (typeof parsed.connectionInstanceId !== "string" || typeof parsed.serialNumber !== "string" ||
-            !/^[a-f0-9]{16}$/.test(parsed.whiteCalibrationHex))
+            !/^[a-f0-9]{16}$/.test(parsed.whiteCalibrationHex) ||
+            (parsed.savedAtMs !== undefined && (!Number.isFinite(parsed.savedAtMs) || parsed.savedAtMs <= 0)))
             throw new Error("Invalid pending calibration");
         cached.set(key, parsed);
         return parsed;
@@ -99,7 +100,7 @@ export var getPendingColourCalibration = function (sensor) {
     }
 };
 export var markColourCalibrationPending = function (sensor, serialNumber, whiteCalibrationHex, calibrationRecord) {
-    var pending = { connectionInstanceId: sensor.raft.connectionInstanceId || "", serialNumber: serialNumber, whiteCalibrationHex: whiteCalibrationHex, calibrationRecord: calibrationRecord };
+    var pending = { connectionInstanceId: sensor.raft.connectionInstanceId || "", serialNumber: serialNumber, whiteCalibrationHex: whiteCalibrationHex, savedAtMs: Date.now(), calibrationRecord: calibrationRecord };
     restorePendingColourCalibration(sensor, pending);
 };
 export var restorePendingColourCalibration = function (sensor, pending) {

package/package.json

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