@robotical/webapp-types 3.14.48 → 3.15.0

package/dist-types/src/services/logger/Logger.js

@@ -9,6 +9,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { AppSentMessage } from "../../types/communication-between-apps/wrapper-communication";
 var SHOW_LOGS_GLOBAL = true;
+var ONLY_SHOW_VIP_LOGS = false;
 var Logger = /** @class */ (function () {
     function Logger() {
     }
@@ -17,37 +18,46 @@ var Logger = /** @class */ (function () {
         for (var _i = 2; _i < arguments.length; _i++) {
             messages[_i - 2] = arguments[_i];
         }
-        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.log.apply(console, __spreadArray(['\x1b[34m%s\x1b[0m', "INFO: ".concat(tag)], messages, false)); // Blue color for info logs
+        SHOW_LOGS_GLOBAL && !ONLY_SHOW_VIP_LOGS && SHOW_LOGS && console.log.apply(console, __spreadArray(['\x1b[34m%s\x1b[0m', "INFO: ".concat(tag)], messages, false)); // Blue color for info logs
     };
     Logger.error = function (SHOW_LOGS, tag) {
         var messages = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             messages[_i - 2] = arguments[_i];
         }
-        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.error.apply(console, __spreadArray(['\x1b[31m%s\x1b[0m', "ERROR: ".concat(tag)], messages, false)); // Red color for error logs
+        SHOW_LOGS_GLOBAL && !ONLY_SHOW_VIP_LOGS && SHOW_LOGS && console.error.apply(console, __spreadArray(['\x1b[31m%s\x1b[0m', "ERROR: ".concat(tag)], messages, false)); // Red color for error logs
     };
     Logger.debug = function (SHOW_LOGS, tag) {
         var messages = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             messages[_i - 2] = arguments[_i];
         }
-        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.debug.apply(console, __spreadArray(['\x1b[35m%s\x1b[0m', "DEBUG: ".concat(tag)], messages, false)); // Magenta color for debug logs
+        SHOW_LOGS_GLOBAL && !ONLY_SHOW_VIP_LOGS && SHOW_LOGS && console.debug.apply(console, __spreadArray(['\x1b[35m%s\x1b[0m', "DEBUG: ".concat(tag)], messages, false)); // Magenta color for debug logs
     };
     Logger.warn = function (SHOW_LOGS, tag) {
         var messages = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             messages[_i - 2] = arguments[_i];
         }
-        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.warn.apply(console, __spreadArray(['\x1b[33m%s\x1b[0m', "WARN: ".concat(tag)], messages, false)); // Yellow color for warning logs
+        SHOW_LOGS_GLOBAL && !ONLY_SHOW_VIP_LOGS && SHOW_LOGS && console.warn.apply(console, __spreadArray(['\x1b[33m%s\x1b[0m', "WARN: ".concat(tag)], messages, false)); // Yellow color for warning logs
     };
     Logger.phoneAppLog = function (SHOW_LOGS, tag) {
         var messages = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             messages[_i - 2] = arguments[_i];
         }
-        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.log.apply(console, __spreadArray(['\x1b[32m%s\x1b[0m', "PHONE APP: ".concat(tag)], messages, false)); // Green color for phone app logs
+        SHOW_LOGS_GLOBAL && !ONLY_SHOW_VIP_LOGS && SHOW_LOGS && console.log.apply(console, __spreadArray(['\x1b[32m%s\x1b[0m', "PHONE APP: ".concat(tag)], messages, false)); // Green color for phone app logs
         SHOW_LOGS_GLOBAL && window.wrapperCommunicator.sendMessageNoWait(AppSentMessage.LOG, { showLogs: SHOW_LOGS, tag: tag, messages: messages });
     };
+    Logger.vipLog = function (SHOW_LOGS, tag) {
+        var messages = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            messages[_i - 2] = arguments[_i];
+        }
+        if (SHOW_LOGS && SHOW_LOGS_GLOBAL && (!ONLY_SHOW_VIP_LOGS || ONLY_SHOW_VIP_LOGS)) {
+            console.log.apply(console, __spreadArray(['\x1b[36m%s\x1b[0m', "VIP: ".concat(tag)], messages, false)); // Cyan color for VIP logs
+        }
+    };
     return Logger;
 }());
 window.Logger = Logger;

package/dist-types/src/types/colour-sensor-calibration.d.ts

@@ -0,0 +1,16 @@
+export declare const COLOUR_SENSOR_CALIBRATION_STAGE: {
+    readonly OFFSET: "offset";
+    readonly WHITE: "white";
+};
+export type ColourSensorCalibrationStage = typeof COLOUR_SENSOR_CALIBRATION_STAGE[keyof typeof COLOUR_SENSOR_CALIBRATION_STAGE];
+export type ColourSensorReading = {
+    clear: number;
+    red: number;
+    green: number;
+    blue: number;
+};
+export type ColourSensorReadings = Record<string, ColourSensorReading>;
+export declare const COLOUR_SENSOR_CALIBRATION_ERROR: {
+    readonly NOT_IN_AIR: "COLOUR_SENSOR_NOT_IN_AIR";
+};
+export type ColourSensorCalibrationError = typeof COLOUR_SENSOR_CALIBRATION_ERROR[keyof typeof COLOUR_SENSOR_CALIBRATION_ERROR];

package/dist-types/src/types/colour-sensor-calibration.js

@@ -0,0 +1,7 @@
+export var COLOUR_SENSOR_CALIBRATION_STAGE = {
+    OFFSET: "offset",
+    WHITE: "white",
+};
+export var COLOUR_SENSOR_CALIBRATION_ERROR = {
+    NOT_IN_AIR: "COLOUR_SENSOR_NOT_IN_AIR",
+};

package/dist-types/src/types/communication-between-apps/wrapper-communication.d.ts

@@ -32,6 +32,7 @@ export declare enum AppSentMessage {
     SCAN_FOR_POTENTIAL_WARRANTY_DEVICE = "SCAN_FOR_POTENTIAL_WARRANTY_DEVICE",
     MARTY_GET_COMMS_STATS = "MARTY_GET_COMMS_STATS",
     MARTY_CALIBRATE_COLOUR_SENSOR = "MARTY_CALIBRATE_COLOUR_SENSOR",
+    MARTY_RESET_COLOUR_SENSOR_OFFSETS = "MARTY_RESET_COLOUR_SENSOR_OFFSETS",
     GET_DEVICE_INFO = "GET_DEVICE_INFO",
     SEND_ATOMIC_READ_OPERATION_TO_MARTY = "SEND_ATOMIC_READ_OPERATION_TO_MARTY"
 }

package/dist-types/src/types/communication-between-apps/wrapper-communication.js

@@ -23,6 +23,7 @@ export var AppSentMessage;
     AppSentMessage["SCAN_FOR_POTENTIAL_WARRANTY_DEVICE"] = "SCAN_FOR_POTENTIAL_WARRANTY_DEVICE";
     AppSentMessage["MARTY_GET_COMMS_STATS"] = "MARTY_GET_COMMS_STATS";
     AppSentMessage["MARTY_CALIBRATE_COLOUR_SENSOR"] = "MARTY_CALIBRATE_COLOUR_SENSOR";
+    AppSentMessage["MARTY_RESET_COLOUR_SENSOR_OFFSETS"] = "MARTY_RESET_COLOUR_SENSOR_OFFSETS";
     AppSentMessage["GET_DEVICE_INFO"] = "GET_DEVICE_INFO";
     AppSentMessage["SEND_ATOMIC_READ_OPERATION_TO_MARTY"] = "SEND_ATOMIC_READ_OPERATION_TO_MARTY";
 })(AppSentMessage || (AppSentMessage = {}));

package/dist-types/src/utils/helpers/ir-on-air.d.ts

@@ -0,0 +1,5 @@
+import type { RICStateInfo } from "@robotical/roboticaljs";
+import type { SimplifiedCogStateInfo } from "@robotical/roboticaljs/dist/SystemTypeCog/CogTypes";
+export type IRFootAirReadings = Record<string, boolean>;
+export declare const areIRFootAirReadingsInAir: (readings: IRFootAirReadings) => boolean;
+export declare const getIRFootAirReadingsFromStateInfo: (stateInfo: RICStateInfo | SimplifiedCogStateInfo | null | undefined, preferredNames?: string | string[]) => IRFootAirReadings | null;

package/dist-types/src/utils/helpers/ir-on-air.js

@@ -0,0 +1,56 @@
+import { RIC_WHOAMI_TYPE_CODE_ADDON_IRFOOT } from "@robotical/ricjs-robotical-addons/dist/RICRoboticalAddOns";
+export var areIRFootAirReadingsInAir = function (readings) {
+    var values = Object.values(readings);
+    if (values.length === 0) {
+        return false;
+    }
+    return values.every(Boolean);
+};
+export var getIRFootAirReadingsFromStateInfo = function (stateInfo, preferredNames) {
+    var _a;
+    if (preferredNames === void 0) { preferredNames = []; }
+    var addons = stateInfo && "addOnInfo" in stateInfo ? ((_a = stateInfo.addOnInfo) === null || _a === void 0 ? void 0 : _a.addons) || [] : [];
+    if (addons.length === 0) {
+        return null;
+    }
+    var preferredList = Array.isArray(preferredNames) ? preferredNames : [preferredNames];
+    var normalizedPreferred = preferredList.map(function (name) { return name.trim().toLowerCase(); }).filter(Boolean);
+    var preferredMatches = normalizedPreferred.length > 0
+        ? addons.filter(function (addon) {
+            var addonName = typeof addon.name === "string" ? addon.name.toLowerCase() : "";
+            return normalizedPreferred.includes(addonName);
+        })
+        : [];
+    var candidates = preferredMatches.length > 0
+        ? preferredMatches
+        : addons.filter(function (addon) { return addon.whoAmI === RIC_WHOAMI_TYPE_CODE_ADDON_IRFOOT; });
+    var readings = {};
+    for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
+        var addon = candidates_1[_i];
+        var addonVals = addon.vals;
+        if (!addonVals) {
+            continue;
+        }
+        var airValue = null;
+        for (var addonValKey in addonVals) {
+            var addonVal = addonVals[addonValKey];
+            if (!addonValKey.includes("Air")) {
+                continue;
+            }
+            if (typeof addonVal === "boolean") {
+                airValue = addonVal;
+                break;
+            }
+            if (typeof addonVal === "number" && addonValKey.endsWith("Air")) {
+                airValue = addonVal !== 0;
+                break;
+            }
+        }
+        if (airValue === null) {
+            continue;
+        }
+        var addonLabel = typeof addon.name === "string" && addon.name.trim().length > 0 ? addon.name : "IRFoot";
+        readings[addonLabel] = airValue;
+    }
+    return Object.keys(readings).length > 0 ? readings : null;
+};

package/dist-types/src/wrapper-app/WrapperAppManager.d.ts

@@ -4,6 +4,7 @@ import Connector from "./connectors/Connector";
 import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
 import { RICLedLcdColours } from "@robotical/roboticaljs";
 import { CustomBluetoothItem, UserDeviceInfo } from "../types/userDeviceInfo";
+import { ColourSensorCalibrationStage } from "../types/colour-sensor-calibration";
 export declare class WrapperAppManager {
     private connectors;
     private _observers;
@@ -42,7 +43,8 @@ export declare class WrapperAppManager {
      * Re-triggers the connect event which was missed due to the connection logic
      */
     getMissedConnEvent(raftId: any): void;
-    calibrateColourSensorMarty(raftId: string): Promise<boolean>;
+    calibrateColourSensorMarty(raftId: string, stage: ColourSensorCalibrationStage): Promise<boolean>;
+    resetColourSensorOffsetsMarty(raftId: string): Promise<boolean>;
     /**
      * Get the RAFT Name
      */

package/dist-types/src/wrapper-app/WrapperAppManager.js

@@ -186,7 +186,7 @@ var WrapperAppManager = /** @class */ (function () {
     //=====================//
     /* CALIBRATE MARTY  */
     //=====================//
-    WrapperAppManager.prototype.calibrateColourSensorMarty = function (raftId) {
+    WrapperAppManager.prototype.calibrateColourSensorMarty = function (raftId, stage) {
         return __awaiter(this, void 0, void 0, function () {
             var raftConnector, didCalibrate;
             return __generator(this, function (_a) {
@@ -194,7 +194,7 @@ var WrapperAppManager = /** @class */ (function () {
                     case 0:
                         if (!this.connectors[raftId]) return [3 /*break*/, 2];
                         raftConnector = this.connectors[raftId].connManager.getConnector();
-                        return [4 /*yield*/, ColourSensorManualCalibratorMarty.calibrate(raftConnector)];
+                        return [4 /*yield*/, ColourSensorManualCalibratorMarty.calibrate(raftConnector, stage)];
                     case 1:
                         didCalibrate = _a.sent();
                         return [2 /*return*/, didCalibrate];
@@ -203,6 +203,23 @@ var WrapperAppManager = /** @class */ (function () {
             });
         });
     };
+    WrapperAppManager.prototype.resetColourSensorOffsetsMarty = function (raftId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var raftConnector, didReset;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.connectors[raftId]) return [3 /*break*/, 2];
+                        raftConnector = this.connectors[raftId].connManager.getConnector();
+                        return [4 /*yield*/, ColourSensorManualCalibratorMarty.resetOffsets(raftConnector)];
+                    case 1:
+                        didReset = _a.sent();
+                        return [2 /*return*/, didReset];
+                    case 2: return [2 /*return*/, false];
+                }
+            });
+        });
+    };
     //=====================//
     /* END CALIBRATE MARTY */
     //=====================//

package/dist-types/src/wrapper-app/communicators/WebAppCommunicator.js

@@ -116,7 +116,7 @@ var WebAppCommunicator = /** @class */ (function () {
 }());
 export default WebAppCommunicator;
 var receivedMessageHandler = function (receivedMessage, data, messagePromiseId) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connectionResults, error_1, ricName, error_2, verifyResults, error_3, stopVerifyResults, error_4, disconnectResults, error_5, restResults, error_6, missedConnEventResults, streamAudioResults, commsStats, calibrateColourSensorResults, error_7, deviceInfoResults, wasSaved, wasSaved, fileContents, existingDevices, devices, error_8, wasSent, error_9;
+    var _a, connectionResults, error_1, ricName, error_2, verifyResults, error_3, stopVerifyResults, error_4, disconnectResults, error_5, restResults, error_6, missedConnEventResults, streamAudioResults, commsStats, calibrateColourSensorResults, error_7, resetColourSensorResults, error_8, deviceInfoResults, wasSaved, wasSaved, fileContents, existingDevices, devices, error_9, wasSent, error_10;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -133,14 +133,15 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                     case AppSentMessage.RAFT_STREAM_AUDIO: return [3 /*break*/, 27];
                     case AppSentMessage.MARTY_GET_COMMS_STATS: return [3 /*break*/, 28];
                     case AppSentMessage.MARTY_CALIBRATE_COLOUR_SENSOR: return [3 /*break*/, 29];
-                    case AppSentMessage.GET_DEVICE_INFO: return [3 /*break*/, 33];
-                    case AppSentMessage.SAVE_FILE_ON_DEVICE: return [3 /*break*/, 34];
-                    case AppSentMessage.SAVE_FILE_ON_DEVICE_LOCAL_STORAGE: return [3 /*break*/, 35];
-                    case AppSentMessage.LOAD_FILE_FROM_DEVICE_LOCAL_STORAGE: return [3 /*break*/, 36];
-                    case AppSentMessage.SCAN_FOR_POTENTIAL_WARRANTY_DEVICE: return [3 /*break*/, 37];
-                    case AppSentMessage.SEND_ATOMIC_READ_OPERATION_TO_MARTY: return [3 /*break*/, 41];
+                    case AppSentMessage.MARTY_RESET_COLOUR_SENSOR_OFFSETS: return [3 /*break*/, 33];
+                    case AppSentMessage.GET_DEVICE_INFO: return [3 /*break*/, 37];
+                    case AppSentMessage.SAVE_FILE_ON_DEVICE: return [3 /*break*/, 38];
+                    case AppSentMessage.SAVE_FILE_ON_DEVICE_LOCAL_STORAGE: return [3 /*break*/, 39];
+                    case AppSentMessage.LOAD_FILE_FROM_DEVICE_LOCAL_STORAGE: return [3 /*break*/, 40];
+                    case AppSentMessage.SCAN_FOR_POTENTIAL_WARRANTY_DEVICE: return [3 /*break*/, 41];
+                    case AppSentMessage.SEND_ATOMIC_READ_OPERATION_TO_MARTY: return [3 /*break*/, 45];
                 }
-                return [3 /*break*/, 45];
+                return [3 /*break*/, 49];
             case 1:
                 try {
                     console.log("3");
@@ -152,7 +153,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 46];
+                return [3 /*break*/, 50];
             case 2:
                 _b.trys.push([2, 4, , 5]);
                 return [4 /*yield*/, wrapperAppManager.connect(data.method, data.uuids)];
@@ -164,7 +165,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_1 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_1.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 5];
-            case 5: return [3 /*break*/, 46];
+            case 5: return [3 /*break*/, 50];
             case 6:
                 _b.trys.push([6, 8, , 9]);
                 return [4 /*yield*/, wrapperAppManager.getRaftName(data.raftId)];
@@ -176,7 +177,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_2 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_2.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 9];
-            case 9: return [3 /*break*/, 46];
+            case 9: return [3 /*break*/, 50];
             case 10:
                 _b.trys.push([10, 12, , 13]);
                 return [4 /*yield*/, wrapperAppManager.verifyRaft(data.ledLcdColours, data.raftId)];
@@ -188,7 +189,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_3 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_3.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 13];
-            case 13: return [3 /*break*/, 46];
+            case 13: return [3 /*break*/, 50];
             case 14:
                 _b.trys.push([14, 16, , 17]);
                 return [4 /*yield*/, wrapperAppManager.stopVerifyingRaft(data.isCorrectRIC, data.raftId)];
@@ -200,7 +201,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_4 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_4.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 17];
-            case 17: return [3 /*break*/, 46];
+            case 17: return [3 /*break*/, 50];
             case 18:
                 _b.trys.push([18, 20, , 21]);
                 return [4 /*yield*/, wrapperAppManager.disconnect(data.raftId)];
@@ -212,7 +213,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_5 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_5.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 21];
-            case 21: return [3 /*break*/, 46];
+            case 21: return [3 /*break*/, 50];
             case 22:
                 _b.trys.push([22, 24, , 25]);
                 return [4 /*yield*/, wrapperAppManager.sendRestMessage(data.msg, data.params, data.raftId)];
@@ -224,7 +225,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_6 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_6.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 25];
-            case 25: return [3 /*break*/, 46];
+            case 25: return [3 /*break*/, 50];
             case 26:
                 try {
                     missedConnEventResults = wrapperAppManager.getMissedConnEvent(data.raftId);
@@ -233,7 +234,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 46];
+                return [3 /*break*/, 50];
             case 27:
                 try {
                     streamAudioResults = wrapperAppManager.streamAudio(data.raftId, data.streamContents, data.clearExisting, data.duration);
@@ -242,7 +243,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 46];
+                return [3 /*break*/, 50];
             case 28:
                 try {
                     commsStats = wrapperAppManager.getCommsStatsMarty(data.raftId);
@@ -251,10 +252,10 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 46];
+                return [3 /*break*/, 50];
             case 29:
                 _b.trys.push([29, 31, , 32]);
-                return [4 /*yield*/, wrapperAppManager.calibrateColourSensorMarty(data.raftId)];
+                return [4 /*yield*/, wrapperAppManager.calibrateColourSensorMarty(data.raftId, data.stage)];
             case 30:
                 calibrateColourSensorResults = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: calibrateColourSensorResults, messagePromiseId: messagePromiseId });
@@ -263,8 +264,20 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_7 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_7.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 32];
-            case 32: return [3 /*break*/, 46];
+            case 32: return [3 /*break*/, 50];
             case 33:
+                _b.trys.push([33, 35, , 36]);
+                return [4 /*yield*/, wrapperAppManager.resetColourSensorOffsetsMarty(data.raftId)];
+            case 34:
+                resetColourSensorResults = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: resetColourSensorResults, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 36];
+            case 35:
+                error_8 = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: false, error: error_8.message, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 36];
+            case 36: return [3 /*break*/, 50];
+            case 37:
                 try {
                     deviceInfoResults = wrapperAppManager.getDeviceInfo();
                     window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: deviceInfoResults, messagePromiseId: messagePromiseId });
@@ -272,8 +285,8 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 46];
-            case 34:
+                return [3 /*break*/, 50];
+            case 38:
                 try {
                     wasSaved = saveItemOnDevice(data.fileName, data.base64);
                     window.wrapperCommunicator.onMessageResponse({ success: wasSaved, error: "", results: wasSaved, messagePromiseId: messagePromiseId });
@@ -281,8 +294,8 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 46];
-            case 35:
+                return [3 /*break*/, 50];
+            case 39:
                 try {
                     wasSaved = saveItemOnDevice(data.fileName, data.base64);
                     window.wrapperCommunicator.onMessageResponse({ success: wasSaved, error: "", results: wasSaved, messagePromiseId: messagePromiseId });
@@ -290,8 +303,8 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 46];
-            case 36:
+                return [3 /*break*/, 50];
+            case 40:
                 try {
                     fileContents = loadItem(data.fileName);
                     if (fileContents) {
@@ -304,36 +317,36 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 46];
-            case 37:
-                _b.trys.push([37, 39, , 40]);
+                return [3 /*break*/, 50];
+            case 41:
+                _b.trys.push([41, 43, , 44]);
                 existingDevices = data.existingDevices;
                 return [4 /*yield*/, wrapperAppManager.scanForPotentialWarrantyDevice(existingDevices)];
-            case 38:
+            case 42:
                 devices = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: devices, messagePromiseId: messagePromiseId });
-                return [3 /*break*/, 40];
-            case 39:
-                error_8 = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: false, error: error_8.message, messagePromiseId: messagePromiseId });
-                return [3 /*break*/, 40];
-            case 40: return [3 /*break*/, 46];
-            case 41:
-                _b.trys.push([41, 43, , 44]);
-                return [4 /*yield*/, wrapperAppManager.sendAtomicReadOperationToMarty(data.raftId)];
-            case 42:
-                wasSent = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: wasSent, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 44];
             case 43:
                 error_9 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_9.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 44];
-            case 44: return [3 /*break*/, 46];
+            case 44: return [3 /*break*/, 50];
             case 45:
+                _b.trys.push([45, 47, , 48]);
+                return [4 /*yield*/, wrapperAppManager.sendAtomicReadOperationToMarty(data.raftId)];
+            case 46:
+                wasSent = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: wasSent, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 48];
+            case 47:
+                error_10 = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: false, error: error_10.message, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 48];
+            case 48: return [3 /*break*/, 50];
+            case 49:
                 Logger.warn(SHOW_LOGS, TAG, "Unhandled message: ".concat(receivedMessage));
-                _b.label = 46;
-            case 46: return [2 /*return*/];
+                _b.label = 50;
+            case 50: return [2 /*return*/];
         }
     });
 }); };

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

@@ -102,13 +102,13 @@ var MartyConnector = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.sendRestMessage("pystatus")];
                     case 2:
                         pystatus = _a.sent();
-                        // if it's in unplugged mode update the relevant state
-                        // that shows a modal
-                        if (pystatus && pystatus.running === "screenfree.py") {
-                            Logger.warn(SHOW_LOGS, TAG, "Marty is in unplugged mode");
-                            return [2 /*return*/, { success: false, reason: 'unplugged' }];
-                        }
-                        return [2 /*return*/, { success: true, reason: 'success' }];
+                        if (!(pystatus && pystatus.running === "screenfree.py")) return [3 /*break*/, 4];
+                        Logger.warn(SHOW_LOGS, TAG, "Marty is in unplugged mode");
+                        return [4 /*yield*/, this.disconnect()];
+                    case 3:
+                        _a.sent();
+                        return [2 /*return*/, { success: false, reason: 'unplugged' }];
+                    case 4: return [2 /*return*/, { success: true, reason: 'success' }];
                 }
             });
         });

package/dist-types/src/wrapper-app/utils/ColourSensorManualCalibratorMarty.d.ts

@@ -1,19 +1,34 @@
 import { RaftConnector } from "@robotical/raftjs";
+import { ColourSensorCalibrationStage } from "../../types/colour-sensor-calibration";
 export default class ColourSensorManualCalibratorMarty {
     private static _raftConnector;
     private static _isCalibrating;
-    private static _calibrationValues;
-    private static _colourSensorReadings;
-    static calibrate(raftConnector: RaftConnector, retryTimes?: number): Promise<boolean>;
+    private static _reportMsgKeyCounter;
+    private static _recentOffsetResetAt;
+    private static readonly OFFSET_RESET_WINDOW_MS;
+    static calibrate(raftConnector: RaftConnector, stage: ColourSensorCalibrationStage, retryTimes?: number): Promise<boolean>;
+    static resetOffsets(raftConnector: RaftConnector): Promise<boolean>;
     private static prepareForCalibration;
     private static performCalibrationSequence;
-    private static handleCalibrationOutcome;
+    private static selectPreferredColourSensorNames;
     private static handleMaxAttempts;
     private static almostEqual;
-    private static compareCalibrationValues;
+    private static compareValues;
     private static turnOnServosIfRequired;
+    private static getIRFootAirReadings;
+    private static toHexByte;
+    private static validateCalibrationByte;
+    private static collectReports;
+    private static nextReportMsgKeyBase;
     private static getColourSensorNames;
-    private static getCalibration;
-    private static getColourSensorReading;
-    private static calibrateCS;
+    private static getCalibrationValues;
+    private static getOffsetValues;
+    private static getColourSensorReadings;
+    private static setOffsets;
+    private static setCalibrationValues;
+    private static setCalibrationForSensor;
+    private static calibrateOffsets;
+    private static calibrateWhite;
+    private static wait;
+    private static ensureColourSensorPowerOn;
 }