@robotical/webapp-types 3.14.48 → 3.15.1

package/dist-types/src/application/ApplicationManager/ApplicationManager.d.ts

@@ -4,6 +4,7 @@ import RAFT from "../RAFTs/RAFT";
 import Marty from "../RAFTs/Marty/Marty";
 import Cog from "../RAFTs/Cog/Cog";
 import { FOUND_RAFT_ON_DISCOVERY_RESPONSE } from "../../types/phone-app-communicator";
+import { ColourSensorCalibrationStage } from "../../types/colour-sensor-calibration";
 import { RaftObserver } from "../RAFTs/RaftObserver";
 import { RaftInfoEvents } from "../../types/events/raft-info";
 import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, RaftWifiScanResults, RaftWifiConnStatus, RaftOKFail } from "@robotical/raftjs";
@@ -59,7 +60,8 @@ export default class ApplicationManager {
     getWiFiConnStatusMarty(martyId: string): Promise<boolean | null>;
     getWifiScanResultsMarty(martyId: string): Promise<RaftWifiScanResults | RaftOKFail | boolean>;
     calibrateMarty(martyId: string, cmd: string, joints: string): Promise<false | RaftOKFail | undefined>;
-    calibrateColourSensorsMarty(raftId: string): Promise<unknown>;
+    calibrateColourSensorsMarty(raftId: string, stage: ColourSensorCalibrationStage): Promise<unknown>;
+    resetColourSensorOffsetsMarty(raftId: string): Promise<unknown>;
     getCommsStatsMarty(martyId: string): Promise<{
         msgRxRate: number;
         msgRoundtripWorstMs: number;

package/dist-types/src/application/ApplicationManager/ApplicationManager.js

@@ -57,6 +57,7 @@ import SensorsDashboardModal from "../../components/modals/ SensorsDashboardModa
 import LEDLightsOrQRVerificationModal from "../../components/modals/LEDLightsOrQRVerificationModal";
 import { CarouselNavigatorManager } from "../../utils/CarouselNavigatorManager";
 import i18n from "../../i18n";
+import InUnpluggedModalContent from "../../components/modals/InUnplugged";
 var SHOW_LOGS = true;
 var TAG = "ApplicationManager";
 var ApplicationManager = /** @class */ (function () {
@@ -269,11 +270,22 @@ var ApplicationManager = /** @class */ (function () {
             });
         });
     };
-    ApplicationManager.prototype.calibrateColourSensorsMarty = function (raftId) {
+    ApplicationManager.prototype.calibrateColourSensorsMarty = function (raftId, stage) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 if (this.connectedRafts[raftId]) {
-                    return [2 /*return*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.MARTY_CALIBRATE_COLOUR_SENSOR, { raftId: raftId })];
+                    return [2 /*return*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.MARTY_CALIBRATE_COLOUR_SENSOR, { raftId: raftId, stage: stage })];
+                }
+                Logger.warn(SHOW_LOGS, TAG, "RAFT with id: ".concat(raftId, " doesn't exist or is not a Marty"));
+                return [2 /*return*/];
+            });
+        });
+    };
+    ApplicationManager.prototype.resetColourSensorOffsetsMarty = function (raftId) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (this.connectedRafts[raftId]) {
+                    return [2 /*return*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.MARTY_RESET_COLOUR_SENSOR_OFFSETS, { raftId: raftId })];
                 }
                 Logger.warn(SHOW_LOGS, TAG, "RAFT with id: ".concat(raftId, " doesn't exist or is not a Marty"));
                 return [2 /*return*/];
@@ -603,7 +615,12 @@ var ApplicationManager = /** @class */ (function () {
                         raft.stopVerifyingRaft(true);
                         _c.label = 5;
                     case 5: return [2 /*return*/, raft];
-                    case 6: return [2 /*return*/, null];
+                    case 6:
+                        if (wasConnectedObj.reason === 'unplugged') {
+                            modalState.setModal(createElement(InUnpluggedModalContent), i18n.t("calibration_screen.colour_calibration.unplugged_modal_title"));
+                        }
+                        _c.label = 7;
+                    case 7: return [2 /*return*/, null];
                 }
             });
         });

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

@@ -32,6 +32,10 @@ export declare class Marty extends RAFT implements RICInterface {
      * Gets the battery strength of the RAFT
      */
     getBatteryStrength(): number;
+    /**
+     * Gets if it's connected via USB
+     */
+    isConnectedViaUSB(): boolean;
     /**
      * Highlights Marty by flashing the LED and playing a tune
      */

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

@@ -127,8 +127,18 @@ var Marty = /** @class */ (function (_super) {
      */
     Marty.prototype.getBatteryStrength = function () {
         var _a;
+        if (this.isConnectedViaUSB()) {
+            return 0; // 0 indicates USB is connected
+        }
         return ((_a = this.raftStateInfo) === null || _a === void 0 ? void 0 : _a.power.powerStatus.battRemainCapacityPercent) || 0;
     };
+    /**
+     * Gets if it's connected via USB
+     */
+    Marty.prototype.isConnectedViaUSB = function () {
+        var _a;
+        return ((_a = this.raftStateInfo) === null || _a === void 0 ? void 0 : _a.power.powerStatus.powerUSBIsConnected) || false;
+    };
     /**
      * Highlights Marty by flashing the LED and playing a tune
      */

package/dist-types/src/components/modals/InUnplugged/index.js

@@ -3,10 +3,12 @@ import { CenteredView, StyledView, ModalText, ModalTitle, StyledImage, } from ".
 import imageAbutton from "../../../assets/marty-a-button.png";
 import modalState from "../../../state-observables/modal/ModalState";
 import SimpleButton from "../../disposables/buttons/SimpleButton";
+import { useTranslation } from "react-i18next";
 export default function InUnpluggedModalContent() {
+    var t = useTranslation().t;
     // disconnecting from marty as soon as
     // the modal comes up because some users might
     // try pressing A when the modal is still up.
     // window.marty.disconnect();
-    return (_jsxs(StyledView, { children: [_jsx(ModalTitle, { children: "Couldn't connect to your Marty!" }), _jsx(ModalText, { children: "Your Marty is currently in unplugged mode. If you want to dissconect Marty from unplugged mode, please press the \"MODE\"/\"A\" button on the back of Marty and try again!" }), _jsx(StyledImage, { src: imageAbutton }), _jsx(CenteredView, { children: _jsx(SimpleButton, { title: "Got it!", onClick: function () { return modalState.closeModal(); } }) })] }));
+    return (_jsxs(StyledView, { children: [_jsx(ModalTitle, { children: t("connection.unplugged_modal_heading", "Couldn't connect to your Marty!") }), _jsx(ModalText, { children: t("connection.unplugged_modal_body", 'Your Marty is currently in unplugged mode. If you want to dissconect Marty from unplugged mode, please press the "MODE"/"A" button on the back of Marty and try again!') }), _jsx(StyledImage, { src: imageAbutton }), _jsx(CenteredView, { children: _jsx(SimpleButton, { title: t("connection.unplugged_modal_button", "Got it!"), onClick: function () { return modalState.closeModal(); } }) })] }));
 }