@robotical/webapp-types 3.25.6 → 3.25.8

package/dist-types/package.json

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

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

@@ -7,14 +7,13 @@ declare const english: {
     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 retryUpload: "Retry calibration upload";
-    readonly introduction: "Keep Marty connected to USB power. We will collect {{count}} readings each for air and white. If you have a purple colour card, you can also use it for an optional step. Keep the lighting the same throughout.";
+    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 optionalStep: "Optional step: purple colour card";
     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.";
-    readonly purple: "If you have a purple colour card, place the foot with the selected sensor flat on it and capture the readings. This helps the sensor tell a dark card from air. This step is optional: choose Skip and save calibration to finish using your air and white readings and keep the current ground threshold.";
     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…";
     readonly warmingUp: "Waking the colour sensor…";
@@ -25,22 +24,20 @@ declare const english: {
     readonly restoring: "Restoring the previous settings…";
     readonly working: "Please wait…";
     readonly captureAir: "Capture air readings";
-    readonly captureWhite: "Capture white readings";
-    readonly capturePurple: "Capture purple and save calibration";
-    readonly skipPurple: "Skip and save calibration";
+    readonly captureWhite: "Capture white and save calibration";
     readonly startAgain: "Start again";
-    readonly restartCalibration: "Calibrate this sensor again";
-    readonly saved: "Calibration saved on Marty: {{count}} readings for each position. This sensor's ground threshold is {{threshold}}.";
-    readonly savedWithoutPurple: "Calibration saved on Marty: {{count}} readings each for air and white. Purple was skipped, so the current ground threshold was kept.";
-    readonly savedWithRGB: "Calibration saved: {{count}} readings for air, white and purple. Purple's colour signal is usable, but its brightness overlaps air. The app will use the calibrated colour signal and keep Marty's current ground threshold.";
+    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.";
     readonly disconnectToFinish: "Disconnect Marty to finish calibration";
     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)";
@@ -51,10 +48,8 @@ declare const english: {
     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 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 or purple reference reached the sensor's reporting limit of 255. Check Marty's placement for this step and retry. No new calibration was saved.";
+    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.";
     readonly weakWhite: "The white reading is too weak. Use a matt white surface with the sensor close to it, then start again.";
-    readonly overlap: "Air and purple readings are too close to choose a reliable ground threshold. Check the sensor position and lighting, then start again. No new calibration was saved.";
-    readonly overlapDetails: "Air Clear maximum: {{airClearMax}}. Purple Clear minimum: {{purpleClearMin}}. Purple must be at least {{minimumGap}} counts above air. You can retry purple, start again with the same lighting, or skip purple to keep the current ground threshold.";
     readonly settingsChanged: "The sensor settings changed during calibration. Start again to collect a consistent set of readings.";
     readonly writeFailed: "The new calibration could not be saved and verified. The previous settings were restored. Try again.";
     readonly verificationFailed: "The sensor did not return the expected reading after calibration. The previous settings were restored. Keep Marty steady and try again.";

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

@@ -7,14 +7,13 @@ var english = {
     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.",
     retryUpload: "Retry calibration upload",
-    introduction: "Keep Marty connected to USB power. We will collect {{count}} readings each for air and white. If you have a purple colour card, you can also use it for an optional step. Keep the lighting the same throughout.",
+    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",
-    optionalStep: "Optional step: purple colour card",
     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.",
-    purple: "If you have a purple colour card, place the foot with the selected sensor flat on it and capture the readings. This helps the sensor tell a dark card from air. This step is optional: choose Skip and save calibration to finish using your air and white readings and keep the current ground threshold.",
     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…",
     warmingUp: "Waking the colour sensor…",
@@ -25,22 +24,20 @@ var english = {
     restoring: "Restoring the previous settings…",
     working: "Please wait…",
     captureAir: "Capture air readings",
-    captureWhite: "Capture white readings",
-    capturePurple: "Capture purple and save calibration",
-    skipPurple: "Skip and save calibration",
+    captureWhite: "Capture white and save calibration",
     startAgain: "Start again",
-    restartCalibration: "Calibrate this sensor again",
-    saved: "Calibration saved on Marty: {{count}} readings for each position. This sensor's ground threshold is {{threshold}}.",
-    savedWithoutPurple: "Calibration saved on Marty: {{count}} readings each for air and white. Purple was skipped, so the current ground threshold was kept.",
-    savedWithRGB: "Calibration saved: {{count}} readings for air, white and purple. Purple's colour signal is usable, but its brightness overlaps air. The app will use the calibrated colour signal and keep Marty's current ground threshold.",
+    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.",
     disconnectToFinish: "Disconnect Marty to finish calibration",
     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)",
@@ -51,10 +48,8 @@ var english = {
     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.",
     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 or purple reference reached the sensor's reporting limit of 255. Check Marty's placement for this step and retry. No new calibration was saved.",
+    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.",
     weakWhite: "The white reading is too weak. Use a matt white surface with the sensor close to it, then start again.",
-    overlap: "Air and purple readings are too close to choose a reliable ground threshold. Check the sensor position and lighting, then start again. No new calibration was saved.",
-    overlapDetails: "Air Clear maximum: {{airClearMax}}. Purple Clear minimum: {{purpleClearMin}}. Purple must be at least {{minimumGap}} counts above air. You can retry purple, start again with the same lighting, or skip purple to keep the current ground threshold.",
     settingsChanged: "The sensor settings changed during calibration. Start again to collect a consistent set of readings.",
     writeFailed: "The new calibration could not be saved and verified. The previous settings were restored. Try again.",
     verificationFailed: "The sensor did not return the expected reading after calibration. The previous settings were restored. Keep Marty steady and try again.",

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.6",
+  "version": "3.25.8",
   "description": "Type definitions for the Application Manager",
   "main": "dist/application-manager.d.ts",
   "types": "dist/application-manager.d.ts",