@robotical/webapp-types 3.25.2 → 3.25.4

package/dist-types/package.json

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

package/dist-types/src/application/RAFTs/Marty/PublishedDataAnalyser.js

@@ -14,6 +14,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import EventEmitter from "events";
+import colourPolicy from "../../../utils/marty-colour-policy.json";
 import { createRaftPubSubscriptionHelper } from "../raft-subscription-helpers";
 import { getColourSensor, getLightSensor, getObjectSensor, getNoiseSensor, getRGBFromColourSensorVals, getHueChroma, getLightSenseValues, getObjectIsTouchingFromVals, getNoiseSenseValue, } from "./published-data-helpers";
 var PublishedDataAnalyser = /** @class */ (function (_super) {
@@ -118,14 +119,7 @@ var PublishedDataAnalyser = /** @class */ (function (_super) {
 }(EventEmitter));
 var ColourSensedDetection = /** @class */ (function () {
     function ColourSensedDetection() {
-        this.thresholds = [
-            { hue: [0, 10], chroma: [50, 200], clear: [40, 150], name: "red" },
-            { hue: [20, 50], chroma: [40, 300], clear: [100, 255], name: "yellow" },
-            { hue: [85, 160], chroma: [5, 100], clear: [25, 150], name: "green" },
-            { hue: [180, 220], chroma: [40, 230], clear: [55, 255], name: "blue" },
-            { hue: [200, 320], chroma: [0, 40], clear: [25, 150], name: "purple" },
-            { hue: [345, 361], chroma: [50, 200], clear: [40, 150], name: "red" },
-        ];
+        this.thresholds = colourPolicy.boundaries;
     }
     ColourSensedDetection.prototype.detectColourSensed = function (_a, analyser) {
         var r = _a.r, g = _a.g, b = _a.b, clear = _a.clear, air = _a.air;

package/dist-types/src/application/RAFTs/RAFT.d.ts

@@ -18,6 +18,7 @@ export default class RAFT implements RICInterface {
     systemInfo: RaftSystemInfo | null;
     raftStateInfo: RICStateInfo | SimplifiedCogStateInfo | null;
     isVerified: boolean;
+    readonly connectionInstanceId: string;
     /**
      * Transport metadata belongs to the host RAFT entity so every embedded
      * platform sees the same connection, regardless of how it was established.

package/dist-types/src/application/RAFTs/RAFT.js

@@ -91,6 +91,8 @@ var RAFT = /** @class */ (function () {
         // RAFT State Info
         this.raftStateInfo = null;
         this.isVerified = false;
+        // A new host entity is created after each browser connection or native selection.
+        this.connectionInstanceId = randomHashGenerator(24);
         /**
          * Transport metadata belongs to the host RAFT entity so every embedded
          * platform sees the same connection, regardless of how it was established.

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

@@ -0,0 +1,59 @@
+declare const english: {
+    readonly title: "Colour sensor calibration";
+    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 sensor: "Colour sensor";
+    readonly selectSensor: "Select a colour sensor";
+    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…";
+    readonly sensorPowerFailed: "The colour sensor did not wake up. Check its connection, reconnect Marty and try again.";
+    readonly settling: "Hold Marty steady. Sampling starts in 1 second…";
+    readonly sampling: "Hold Marty steady. Reading {{count}} of {{total}}…";
+    readonly saving: "Saving and verifying the calibration…";
+    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 startAgain: "Start 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 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 calibrationReloadFailed: "The saved calibration could not be confirmed for this sensor. Keep the same sensor attached, disconnect Marty and reconnect it 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 calibration results";
+    readonly back: "Back to calibration";
+    readonly usbRequired: "Connect Marty to USB power and keep it connected until calibration finishes.";
+    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 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 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 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.";
+    readonly restoreFailed: "The previous sensor settings could not be restored. Keep Marty on USB power, reconnect it and complete calibration again before using colour detection.";
+    readonly storageUnavailable: "The app could not back up the current sensor settings. Allow storage for this app or free some space, then try again. No new calibration was saved.";
+    readonly busy: "A previous calibration is still finishing or restoring settings. Wait a few seconds, then try again.";
+    readonly sampleTimeout: "Collecting the readings took too long. Keep Marty connected and try this step again.";
+    readonly sensorAsleep: "The colour sensor is asleep. Reconnect Marty and try again.";
+    readonly sensorOffline: "The colour sensor is offline. Check its connection and try again.";
+    readonly staleReading: "Sensor readings stopped updating. Reconnect Marty and try again.";
+    readonly backgrounded: "Calibration stopped when the app left the foreground. Keep this screen open and try again.";
+    readonly cancelled: "Calibration was cancelled. Start again when Marty is ready.";
+    readonly failed: "Calibration could not finish. Keep Marty connected and try again.";
+};
+export default english;

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

@@ -0,0 +1,59 @@
+var english = {
+    title: "Colour sensor calibration",
+    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.",
+    sensor: "Colour sensor",
+    selectSensor: "Select a colour sensor",
+    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…",
+    sensorPowerFailed: "The colour sensor did not wake up. Check its connection, reconnect Marty and try again.",
+    settling: "Hold Marty steady. Sampling starts in 1 second…",
+    sampling: "Hold Marty steady. Reading {{count}} of {{total}}…",
+    saving: "Saving and verifying the calibration…",
+    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",
+    startAgain: "Start 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.",
+    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…",
+    calibrationReloadFailed: "The saved calibration could not be confirmed for this sensor. Keep the same sensor attached, disconnect Marty and reconnect it 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 calibration results",
+    back: "Back to calibration",
+    usbRequired: "Connect Marty to USB power and keep it connected until calibration finishes.",
+    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.",
+    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.",
+    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.",
+    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.",
+    restoreFailed: "The previous sensor settings could not be restored. Keep Marty on USB power, reconnect it and complete calibration again before using colour detection.",
+    storageUnavailable: "The app could not back up the current sensor settings. Allow storage for this app or free some space, then try again. No new calibration was saved.",
+    busy: "A previous calibration is still finishing or restoring settings. Wait a few seconds, then try again.",
+    sampleTimeout: "Collecting the readings took too long. Keep Marty connected and try this step again.",
+    sensorAsleep: "The colour sensor is asleep. Reconnect Marty and try again.",
+    sensorOffline: "The colour sensor is offline. Check its connection and try again.",
+    staleReading: "Sensor readings stopped updating. Reconnect Marty and try again.",
+    backgrounded: "Calibration stopped when the app left the foreground. Keep this screen open and try again.",
+    cancelled: "Calibration was cancelled. Start again when Marty is ready.",
+    failed: "Calibration could not finish. Keep Marty connected and try again.",
+};
+export default english;

package/dist-types/src/i18n.js

@@ -11,12 +11,14 @@ import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import Logger from './services/logger/Logger';
 import colourDiagnosticsEnglish from './screens/configuration/marty/Diagnostics/ColourSensorDiagnostics/messages';
+import colourCalibrationEnglish from './components/oneoffs/calibration-screens/ColourSensorCalibration/messages';
 var SHOW_LOGS = true;
 var TAG = "i18n";
 var resources = {
     "en": {
         "translation": {
             "colour_diagnostics": colourDiagnosticsEnglish,
+            "colour_calibration": colourCalibrationEnglish,
             "activities": {
                 "adventure_story_subtitle": "We'll make an interactive narrative adventure!",
                 "adventure_story_title": "13. Adventure Story",

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

@@ -33,6 +33,7 @@ declare const colourDiagnosticsEnglish: {
     storageWarning: string;
     sensorDisconnected: string;
     sensorInitialising: string;
+    calibrationReconnectRequired: string;
     sensorAsleep: string;
     sensorOffline: string;
     sensorPowerFailed: string;

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

@@ -28,6 +28,7 @@ var colourDiagnosticsEnglish = {
     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.",
+    calibrationReconnectRequired: "Reconnect Marty to finish calibration before taking more colour 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/marty-colour-policy.json

@@ -0,0 +1,11 @@
+{
+    "source": "Marty web app colour boundaries v3",
+    "boundaries": [
+        { "hue": [0, 15], "chroma": [50, 200], "clear": [40, 150], "name": "red" },
+        { "hue": [20, 65], "chroma": [40, 300], "clear": [100, 255], "name": "yellow" },
+        { "hue": [85, 160], "chroma": [5, 100], "clear": [25, 150], "name": "green" },
+        { "hue": [180, 240], "chroma": [40, 230], "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.2",
+  "version": "3.25.4",
   "description": "Type definitions for the Application Manager",
   "main": "dist/application-manager.d.ts",
   "types": "dist/application-manager.d.ts",