@robotical/webapp-types 1.1.0 → 1.1.2

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

@@ -13,15 +13,59 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { raftPubSubscriptionHelper } from "../raft-subscription-helpers";
 import { isVersionGreater_errorCatching } from "../../../utils/helpers/compare-version";
-import PublishedDataGetter from "./PublishedDataGetter";
 import EventEmitter from "events";
+import Logger from "../../../services/logger/Logger";
+var SHOW_LOGS = true;
+var TAG = "PublishedDataAnalyser";
 var PublishedDataAnalyser = /** @class */ (function (_super) {
     __extends(PublishedDataAnalyser, _super);
     function PublishedDataAnalyser(cog) {
         var _this = _super.call(this) || this;
         _this.cog = cog;
+        _this.rotationDetection = new RotationDetection();
+        _this.shakeDetector = new ShakeDetector();
+        _this.buttonClickDetection = new ButtonClickDetection();
+        _this.tiltDetection = new TiltDetection();
+        _this.objectSenseDetection = new ObjectSenseDetection();
+        _this.lightSenseDetection = new LightSenseDetection();
         _this.eventsMap = {
             tilt: {
                 forward: "tiltForward",
@@ -58,7 +102,6 @@ var PublishedDataAnalyser = /** @class */ (function (_super) {
             },
         };
         _this.TiltDetection = TiltDetection;
-        _this.PublishedDataGetter = PublishedDataGetter;
         _this.cog = cog;
         _this.cogState = {
             tilt: "none",
@@ -84,20 +127,19 @@ var PublishedDataAnalyser = /** @class */ (function (_super) {
         (_a = this.pubSub) === null || _a === void 0 ? void 0 : _a.unsubscribe();
     };
     PublishedDataAnalyser.prototype.analyse = function (data) {
-        //@ts-ignore
-        var accelData = PublishedDataGetter.getAccelerometerData(data.deviceManager);
-        //@ts-ignore
-        var gyroData = PublishedDataGetter.getGyroscopeData(data.deviceManager);
-        //@ts-ignore
-        var lightData = PublishedDataGetter.getLightData(data.deviceManager);
+        if (!data)
+            return;
+        var accelData = data.accelerometer;
+        var gyroData = data.gyroscope;
+        var lightData = data.light;
         var isMoving;
         if (accelData)
-            isMoving = shakeDetector.detectShake(accelData.ax, accelData.ay, accelData.az, Date.now(), this);
-        accelData && tiltDetection.detectTilt(accelData.ax, accelData.ay, accelData.az, isMoving, this, this.cog.getRaftVersion());
-        gyroData && rotationDetection.detectRotation(gyroData.gz, isMoving, this);
-        lightData && buttonClickDetection.detectButtonClick(lightData.ir2, this, this.cog.getRaftVersion());
-        lightData && objectSenseDetection.detectObjectSense([lightData.ir0, lightData.ir1], this);
-        lightData && lightSenseDetection.detectLightSense(lightData.amb0, this);
+            isMoving = this.shakeDetector.detectShake(accelData.ax, accelData.ay, accelData.az, Date.now(), this);
+        accelData && this.tiltDetection.detectTilt(accelData.ax, accelData.ay, accelData.az, isMoving, this, this.cog.getRaftVersion());
+        gyroData && this.rotationDetection.detectRotation(gyroData.gz, isMoving, this);
+        lightData && this.buttonClickDetection.detectButtonClick(lightData.ir2, this, this.cog.getRaftVersion());
+        lightData && this.objectSenseDetection.detectObjectSense([lightData.ir0, lightData.ir1], this);
+        lightData && this.lightSenseDetection.detectLightSense(lightData.amb0, this);
     };
     PublishedDataAnalyser.prototype.setTilt = function (tilt) {
         this.cogState.tilt = tilt;
@@ -157,7 +199,7 @@ var TiltDetection = /** @class */ (function () {
         if (isVersionGreater_errorCatching(cogVersion, correctionCutOffVersion)) {
             tiltCorrection = tiltCorrectionForNewerCog;
         }
-        var _a = TiltDetection.rotateAccelData(ax, ay, az, tiltCorrection), x = _a.x, y = _a.y, z = _a.z;
+        var _a = TiltDetection.rotateAccelData(ax, ay, az * -1, tiltCorrection), x = _a.x, y = _a.y, z = _a.z;
         var pitch = Math.atan2(x, this.distance(y, z));
         var roll = Math.atan2(y, this.distance(x, z));
         var yaw = Math.atan2(z, this.distance(x, y));
@@ -275,7 +317,7 @@ var ShakeDetector = /** @class */ (function () {
             this.gravityVector = [xAcc, yAcc, zAcc];
             if (this.moveInProgress) {
                 // console.log("move detected");
-                analyser.setMovementType("move");
+                // analyser.setMovementType("move");
             }
             else {
                 // console.log("no move detected");
@@ -284,7 +326,7 @@ var ShakeDetector = /** @class */ (function () {
             this.moveInProgress = false;
             this.shakeInProgress = false;
             this.sensorBundles = [];
-            return this.moveInProgress;
+            return this.shakeInProgress;
         }
         else {
             //console.log("move in progrss. prev state: ", this.moveInProgress);
@@ -309,7 +351,7 @@ var ShakeDetector = /** @class */ (function () {
                         if (this.sensorBundles.length > this.thresholdShakeNumber) {
                             // console.log("Shake detected!");
                             this.sensorBundles = [];
-                            this.shakeInProgress = false;
+                            this.shakeInProgress = true;
                             analyser.setMovementType("shake");
                         }
                     }
@@ -321,11 +363,11 @@ var ShakeDetector = /** @class */ (function () {
                         this.sensorBundles = [];
                         // console.log("resetting shake detector. Move detected");
                         // fire move detector
-                        analyser.setMovementType("move");
+                        analyser.setMovementType("none");
                     }
                 }
             }
-            return this.moveInProgress;
+            return this.shakeInProgress;
             /*
             if (this.sensorBundles.length === 0 || timestamp - this.lastTime > this.interval) {
                 // Check if we should reset based on time since last recorded shake
@@ -392,27 +434,18 @@ var ButtonClickDetection = /** @class */ (function () {
         this.buttonClicked = false;
     }
     ButtonClickDetection.prototype.detectButtonClick = function (buttonValue, analyser, cogVersion) {
-        var correctionCutOffVersion = "1.2.0";
-        var clickThreshold = 1600;
-        if (isVersionGreater_errorCatching(cogVersion, correctionCutOffVersion)) {
-            clickThreshold = 1500;
-        }
-        var releaseThreshold = 1590;
-        if (isVersionGreater_errorCatching(cogVersion, correctionCutOffVersion)) {
-            releaseThreshold = 1490;
-        }
-        this.clickThreshold = clickThreshold;
-        this.releaseThreshold = releaseThreshold;
         var currentTime = Date.now();
         if (buttonValue > this.clickThreshold && !this.buttonClicked) {
             // console.log("Button clicked", buttonValue);
             this.buttonClicked = true;
             this.lastTime = currentTime;
+            Logger.info(SHOW_LOGS, TAG, "Button clicked");
             analyser.setButtonClick("click");
         }
         else if (buttonValue < this.releaseThreshold && this.buttonClicked) {
             // console.log("Button released", buttonValue);
             this.buttonClicked = false;
+            Logger.info(SHOW_LOGS, TAG, "Button released");
             analyser.setButtonClick("release");
         }
         // } else {
@@ -422,6 +455,7 @@ var ButtonClickDetection = /** @class */ (function () {
     };
     return ButtonClickDetection;
 }());
+export { ButtonClickDetection };
 var ObjectSenseDetection = /** @class */ (function () {
     function ObjectSenseDetection() {
         this.objectSensed0Threshold = 2500; // left of the arrow
@@ -463,10 +497,37 @@ var LightSenseDetection = /** @class */ (function () {
     };
     return LightSenseDetection;
 }());
-var rotationDetection = new RotationDetection();
-var shakeDetector = new ShakeDetector();
-var buttonClickDetection = new ButtonClickDetection();
-var tiltDetection = new TiltDetection();
-var objectSenseDetection = new ObjectSenseDetection();
-var lightSenseDetection = new LightSenseDetection();
+export var setButtonThresholdsUtil = function (connectedCog) { return __awaiter(void 0, void 0, void 0, function () {
+    var lightResponse, irMin, irMax, buttonClickDetection, error_1;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                Logger.info(SHOW_LOGS, TAG, "Setting button thresholds");
+                _a.label = 1;
+            case 1:
+                _a.trys.push([1, 3, , 4]);
+                return [4 /*yield*/, connectedCog.sendRestMessage('light')];
+            case 2:
+                lightResponse = _a.sent();
+                if (lightResponse && lightResponse.rslt === "ok" && lightResponse.light.irMax4) {
+                    irMin = lightResponse.light.irMin4;
+                    irMax = lightResponse.light.irMax4;
+                    Logger.info(SHOW_LOGS, TAG, "Got button thresholds: irMin: ".concat(irMin, ", irMax: ").concat(irMax));
+                    buttonClickDetection = connectedCog.publishedDataAnalyser.buttonClickDetection;
+                    buttonClickDetection.clickThreshold = irMin + (irMax - irMin) / 2;
+                    buttonClickDetection.releaseThreshold = buttonClickDetection.clickThreshold - 10;
+                    Logger.info(SHOW_LOGS, TAG, "Set button thresholds: clickThreshold: ".concat(buttonClickDetection.clickThreshold, ", releaseThreshold: ").concat(buttonClickDetection.releaseThreshold));
+                }
+                else {
+                    Logger.warn(SHOW_LOGS, TAG, "Couldn't get button thresholds, probably older fw version");
+                }
+                return [3 /*break*/, 4];
+            case 3:
+                error_1 = _a.sent();
+                Logger.warn(SHOW_LOGS, TAG, "Couldn't get button thresholds, probably older fw version");
+                return [3 /*break*/, 4];
+            case 4: return [2 /*return*/];
+        }
+    });
+}); };
 export default PublishedDataAnalyser;

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

@@ -102,7 +102,7 @@ var Marty = /** @class */ (function (_super) {
         }
         this.rssiValues.push(newRssi);
         var rssiAverage = this.rssiValues.reduce(function (sum, val) { return sum + val; }, 0) / this.rssiValues.length;
-        return this.rssiValues.reduce(function (sum, val) { return sum + val; }, 0) / this.rssiValues.length;
+        return rssiAverage;
     };
     /**
      * Gets the battery strength of the RAFT

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

@@ -4,7 +4,8 @@ import { FOUND_RAFT_ON_DISCOVERY_RESPONSE } from "../../types/phone-app-communic
 import RICInterface from "./RAFTInterface";
 import { RaftObserver } from "./RaftObserver";
 import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, RaftOKFail, RaftSystemInfo } from "@robotical/raftjs";
-import { CogStateInfo, RICLedLcdColours, RICStateInfo } from "@robotical/roboticaljs";
+import { RICLedLcdColours, RICStateInfo } from "@robotical/roboticaljs";
+import { SimplifiedCogStateInfo } from "@robotical/roboticaljs/dist/SystemTypeCog/CogTypes";
 export default class RAFT implements RICInterface {
     id: string;
     type: RaftTypeE;
@@ -14,7 +15,7 @@ export default class RAFT implements RICInterface {
     };
     isSerialNoRegisteredInWarranty: boolean | null;
     systemInfo: RaftSystemInfo | null;
-    raftStateInfo: RICStateInfo | CogStateInfo | null;
+    raftStateInfo: RICStateInfo | SimplifiedCogStateInfo | null;
     /**
      * Method to get ledLcdColours, to be implemented in child classes.
      */
@@ -29,7 +30,7 @@ export default class RAFT implements RICInterface {
     * Connect to a RAFT
     * We first connect, then we discover the raft type, and then we create the appopriate raft instance
     */
-    static connect(method: RaftConnectionMethod, uuid: string): Promise<ConnectionAttemptResults>;
+    static connect(method: RaftConnectionMethod, uuids: string[]): Promise<ConnectionAttemptResults>;
     /**
      * Disconnect from a RAFT
      */
@@ -41,7 +42,7 @@ export default class RAFT implements RICInterface {
     /**
     * Verify correct RAFT is selected for phone app
     */
-    verifyRaftPhoneApp(discoveredRIC: FOUND_RAFT_ON_DISCOVERY_RESPONSE['foundRIC']): Promise<boolean>;
+    verifyRaftPhoneApp(discoveredDevice: FOUND_RAFT_ON_DISCOVERY_RESPONSE['foundRIC']): Promise<boolean>;
     /**
     * Verify correct RAFT is selected
     */

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

@@ -84,12 +84,12 @@ var RAFT = /** @class */ (function () {
     * Connect to a RAFT
     * We first connect, then we discover the raft type, and then we create the appopriate raft instance
     */
-    RAFT.connect = function (method, uuid) {
+    RAFT.connect = function (method, uuids) {
         return __awaiter(this, void 0, void 0, function () {
             var connectResults;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_CONNECT, { method: method, uuid: uuid })];
+                    case 0: return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_CONNECT, { method: method, uuids: uuids })];
                     case 1:
                         connectResults = _a.sent();
                         return [2 /*return*/, connectResults];
@@ -126,10 +126,10 @@ var RAFT = /** @class */ (function () {
     /**
     * Verify correct RAFT is selected for phone app
     */
-    RAFT.prototype.verifyRaftPhoneApp = function (discoveredRIC) {
+    RAFT.prototype.verifyRaftPhoneApp = function (discoveredDevice) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_VERIFY_PHONE, { ledLcdColours: this.ledLcdColours, discoveredRIC: discoveredRIC, raftId: this.id })];
+                return [2 /*return*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_VERIFY_PHONE, { ledLcdColours: this.ledLcdColours, discoveredDevice: discoveredDevice, raftId: this.id })];
             });
         });
     };

package/dist-types/src/application/communicators/SelfdestructiveMessagePromise.js

@@ -13,7 +13,7 @@ var SelfdestructiveMessagePromise = /** @class */ (function () {
             delete messagePromises[id];
         };
         this.reject = function (reason) {
-            reject(reason);
+            resolve(reason); // on purpose resolving instead of rejecting
             clearTimeout(_this.timeout);
             delete messagePromises[id];
         };

package/dist-types/src/components/modals/ConnectingLoadingSpinnerModal/index.d.ts

@@ -0,0 +1,3 @@
+type Props = {};
+export default function ConnectingLoadingSpinnerModal({}: Props): import("react/jsx-runtime").JSX.Element;
+export {};

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

@@ -0,0 +1,16 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx } from "react/jsx-runtime";
+import styles from "./styles.module.css";
+export default function ConnectingLoadingSpinnerModal(_a) {
+    return (_jsx("div", __assign({ className: styles.container }, { children: "This shouldn't take long!" })));
+}

package/dist-types/src/components/modals/DisconnectConfirmation/index.d.ts

@@ -1,6 +1 @@
-import RAFT from "../../../application/RAFTs/RAFT";
-type Props = {
-    connectedRaft?: RAFT;
-};
-export default function DisconnectConfirmationModal({ connectedRaft }: Props): import("react/jsx-runtime").JSX.Element;
-export {};
+export default function DisconnectConfirmationModal(): import("react/jsx-runtime").JSX.Element;

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

@@ -1,65 +1,8 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import modalState from "../../../state-observables/modal/ModalState";
-import { useConnectedRafts } from "../../../store/SelectedRaftContext";
 import { RED } from "../../../styles/colors";
 import SimpleButton from "../../disposables/buttons/SimpleButton";
 import { Container } from "./styles";
-export default function DisconnectConfirmationModal(_a) {
-    var _this = this;
-    var connectedRaft = _a.connectedRaft;
-    var removeConnectedRaft = useConnectedRafts().removeConnectedRaft;
-    var disconnectHandler = function () { return __awaiter(_this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!connectedRaft) {
-                        console.warn("No connected raft found", connectedRaft);
-                        return [2 /*return*/];
-                    }
-                    return [4 /*yield*/, window.applicationManager.disconnectFromRaft(connectedRaft.id)];
-                case 1:
-                    _a.sent();
-                    removeConnectedRaft(connectedRaft.id);
-                    modalState.closeModal();
-                    return [2 /*return*/];
-            }
-        });
-    }); };
-    return (_jsxs(Container, { children: [_jsx(SimpleButton, { onClick: function () { return modalState.closeModal(); }, title: "Cancel" }), _jsx(SimpleButton, { onClick: disconnectHandler, title: "Disconnect", colour: RED })] }));
+export default function DisconnectConfirmationModal() {
+    return (_jsxs(Container, { children: [_jsx(SimpleButton, { onClick: function () { return modalState.closeModal(false); }, title: "Cancel" }), _jsx(SimpleButton, { onClick: function () { return modalState.closeModal(true); }, title: "Disconnect", colour: RED })] }));
 }

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

@@ -71,7 +71,7 @@ function VerificationModal(_a) {
             return;
         var signalUpdateTimout = setInterval(function () {
             setRSSI(connectedRaft.getRSSI());
-        }, 200);
+        }, 1000);
         return function () { return clearInterval(signalUpdateTimout); };
     }, [connectedRaft]);
     var onCancel = function () { return __awaiter(_this, void 0, void 0, function () {

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

@@ -61,6 +61,7 @@ import isPhoneApp from "../../../utils/phone-app-communication/is-phone-app";
 import LoadingSpinner from "../../disposables/LoadingSpinner";
 import { RaftConnectionMethod } from "../../../types/raft";
 import { useConnectedRafts } from "../../../store/SelectedRaftContext";
+import { ConnManager } from "@robotical/roboticaljs";
 var SHOW_LOGS = true;
 var TAG = "VerificationModalPhone";
 function VerificationModalPhoneApp(_a) {
@@ -92,8 +93,12 @@ function VerificationModalPhoneApp(_a) {
                 case 2:
                     _a.sent();
                     removeConnectedRaft(connectedRaft.id);
-                    _a.label = 3;
-                case 3:
+                    return [3 /*break*/, 5];
+                case 3: return [4 /*yield*/, window.applicationManager.stopDiscovery()];
+                case 4:
+                    _a.sent();
+                    _a.label = 5;
+                case 5:
                     modalState.closeModal();
                     return [2 /*return*/];
             }
@@ -115,7 +120,7 @@ function VerificationModalPhoneApp(_a) {
                     setSelectedRICIdx(-1);
                     setConnectedRaft(undefined);
                     if (!window.applicationManager.ricSelectedCb) return [3 /*break*/, 5];
-                    return [4 /*yield*/, window.applicationManager.startDiscovery(window.applicationManager.ricSelectedCb)];
+                    return [4 /*yield*/, window.applicationManager.startDiscovery(window.applicationManager.ricSelectedCb, [ConnManager.COGUUID, ConnManager.RICUUID])];
                 case 4:
                     _a.sent();
                     _a.label = 5;
@@ -144,7 +149,7 @@ function VerificationModalPhoneApp(_a) {
             raftConnectingSubscriptionHelper(connectedRaft).unsubscribe();
         };
     }, [connectedRaft]);
-    var onselectRaft = function (raftIdx) { return __awaiter(_this, void 0, void 0, function () {
+    var onSelectRaft = function (raftIdx) { return __awaiter(_this, void 0, void 0, function () {
         var foundRaft, newRaft;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -178,11 +183,11 @@ function VerificationModalPhoneApp(_a) {
     }); };
     var contentJSX = null;
     if (foundRICs.length === 0) {
-        contentJSX = _jsxs("div", __assign({ className: "verification-modal-container" }, { children: [!isScanning && _jsx("p", __assign({ style: { alignSelf: 'center' } }, { children: "No Martys Found" })), _jsx("div", __assign({ className: "verification-modal-martys-container" }, { children: isScanning && _jsxs("div", __assign({ style: { margin: "auto", width: "50px", height: "50px" } }, { children: [" ", _jsx(LoadingSpinner, {}), " "] })) })), _jsxs("div", __assign({ className: "verification-modal-bottom-btns-container" }, { children: [_jsx(SVGImageButton, { onClick: onScanAgain, title: "SCAN AGAIN", SVGImage: RefreshSVG, backgroundColour: MAIN_BLUE, titleColour: WHITE, SVGColour: WHITE }), _jsx("div", { className: "dummy-gap" }), _jsx(SimpleButton, { onClick: onCancel, title: "CANCEL" })] }))] }));
+        contentJSX = _jsxs("div", __assign({ className: "verification-modal-container" }, { children: [!isScanning && _jsx("p", __assign({ style: { alignSelf: 'center' } }, { children: "No Robots Found" })), _jsx("div", __assign({ className: "verification-modal-martys-container" }, { children: isScanning && _jsxs("div", __assign({ style: { margin: "auto", width: "50px", height: "50px" } }, { children: [" ", _jsx(LoadingSpinner, {}), " "] })) })), _jsxs("div", __assign({ className: "verification-modal-bottom-btns-container" }, { children: [_jsx(SVGImageButton, { onClick: onScanAgain, title: "SCAN AGAIN", SVGImage: RefreshSVG, backgroundColour: MAIN_BLUE, titleColour: WHITE, SVGColour: WHITE }), _jsx("div", { className: "dummy-gap" }), _jsx(SimpleButton, { onClick: onCancel, title: "CANCEL" })] }))] }));
     }
     else {
         contentJSX = _jsxs("div", __assign({ className: "verification-modal-container" }, { children: [_jsxs("div", __assign({ className: "verification-modal-martys-container" }, { children: [isScanning && _jsxs("div", __assign({ style: { margin: "auto", width: "50px", height: "50px" } }, { children: [" ", _jsx(LoadingSpinner, {}), " "] })), foundRICs.map(function (raftObj, raftIdx) {
-                            return _jsxs(Fragment, { children: [_jsxs("div", __assign({ className: "verification-modal-marty-name-row-container", onClick: function () { return onselectRaft(raftIdx); } }, { children: [_jsx("p", __assign({ className: "verification-modal-marty-name" }, { children: raftObj._localName })), _jsx("div", __assign({ className: "verification-modal-marty-signal-container" }, { children: _jsx(RICSignal, { signalStrength: raftObj._rssi }) })), _jsx(BluetoothSVG, { fill: MAIN_BLUE })] })), selectedRICIdx === raftIdx && _jsxs("div", { children: [_jsx("p", __assign({ className: "verification-modal-martys-back-hint" }, { children: isLoading ? "Loading..." : "Look on ".concat(connectedRaft === null || connectedRaft === void 0 ? void 0 : connectedRaft.type, "'s back, is it displaying these lights?") })), _jsxs("div", __assign({ className: "verification-modal-led-row-container" }, { children: [_jsx(LEDs, { coloursArr: randomColours, connectedRaft: connectedRaft }), !isLoading && _jsx(SimpleButton, { onClick: onCancel, title: "No", borderColour: "red", colour: "white", textColour: "red" }), !isLoading && _jsx(SimpleButton, { onClick: onYes, title: "YES" })] }))] })] }, raftIdx);
+                            return _jsxs(Fragment, { children: [_jsxs("div", __assign({ className: "verification-modal-marty-name-row-container", onClick: function () { return onSelectRaft(raftIdx); } }, { children: [_jsx("p", __assign({ className: "verification-modal-marty-name" }, { children: raftObj._localName })), _jsx("div", __assign({ className: "verification-modal-marty-signal-container" }, { children: _jsx(RICSignal, { signalStrength: raftObj._rssi }) })), _jsx(BluetoothSVG, { fill: MAIN_BLUE })] })), selectedRICIdx === raftIdx && _jsxs("div", { children: [_jsx("p", __assign({ className: "verification-modal-martys-back-hint" }, { children: isLoading ? "Loading..." : "Look on ".concat(connectedRaft === null || connectedRaft === void 0 ? void 0 : connectedRaft.type, "'s back, is it displaying these lights?") })), _jsxs("div", __assign({ className: "verification-modal-led-row-container" }, { children: [_jsx(LEDs, { coloursArr: randomColours, connectedRaft: connectedRaft }), !isLoading && _jsx(SimpleButton, { onClick: onCancel, title: "No", borderColour: "red", colour: "white", textColour: "red" }), !isLoading && _jsx(SimpleButton, { onClick: onYes, title: "YES" })] }))] })] }, raftIdx);
                         })] })), _jsxs("div", __assign({ className: "verification-modal-bottom-btns-container" }, { children: [_jsx(SVGImageButton, { onClick: onScanAgain, title: "SCAN AGAIN", SVGImage: RefreshSVG, backgroundColour: MAIN_BLUE, titleColour: WHITE, SVGColour: WHITE, disabled: isScanning }), _jsx("div", { className: "dummy-gap" }), _jsx(SimpleButton, { onClick: onCancel, title: "CANCEL" })] }))] }));
     }
     return contentJSX;

package/dist-types/src/services/logger/Logger.d.ts

@@ -3,5 +3,6 @@ declare class Logger {
     static error(SHOW_LOGS: boolean, tag: string, message: string): void;
     static debug(SHOW_LOGS: boolean, tag: string, message: string): void;
     static warn(SHOW_LOGS: boolean, tag: string, message: string): void;
+    static phoneAppLog(SHOW_LOGS: boolean, tag: string, message: string): void;
 }
 export default Logger;

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

@@ -1,17 +1,23 @@
+import { AppSentMessage } from "../../types/communication-between-apps/wrapper-communication";
+var SHOW_LOGS_GLOBAL = true;
 var Logger = /** @class */ (function () {
     function Logger() {
     }
     Logger.info = function (SHOW_LOGS, tag, message) {
-        SHOW_LOGS && console.log('\x1b[34m%s\x1b[0m', "INFO: ".concat(tag), message); // Blue color for info logs
+        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.log('\x1b[34m%s\x1b[0m', "INFO: ".concat(tag), message); // Blue color for info logs
     };
     Logger.error = function (SHOW_LOGS, tag, message) {
-        SHOW_LOGS && console.error('\x1b[31m%s\x1b[0m', "ERROR: ".concat(tag), message); // Red color for error logs
+        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.error('\x1b[31m%s\x1b[0m', "ERROR: ".concat(tag), message); // Red color for error logs
     };
     Logger.debug = function (SHOW_LOGS, tag, message) {
-        SHOW_LOGS && console.debug('\x1b[35m%s\x1b[0m', "DEBUG: ".concat(tag), message); // Magenta color for debug logs
+        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.debug('\x1b[35m%s\x1b[0m', "DEBUG: ".concat(tag), message); // Magenta color for debug logs
     };
     Logger.warn = function (SHOW_LOGS, tag, message) {
-        SHOW_LOGS && console.warn('\x1b[33m%s\x1b[0m', "WARN: ".concat(tag), message); // Yellow color for warning logs
+        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.warn('\x1b[33m%s\x1b[0m', "WARN: ".concat(tag), message); // Yellow color for warning logs
+    };
+    Logger.phoneAppLog = function (SHOW_LOGS, tag, message) {
+        SHOW_LOGS_GLOBAL && SHOW_LOGS && console.log('\x1b[32m%s\x1b[0m', "PHONE APP: ".concat(tag), message); // Green color for phone app logs
+        SHOW_LOGS_GLOBAL && window.wrapperCommunicator.sendMessageNoWait(AppSentMessage.LOG, { showLogs: SHOW_LOGS, tag: tag, message: message });
     };
     return Logger;
 }());

package/dist-types/src/state-observables/modal/ModalObserver.d.ts

@@ -6,6 +6,7 @@ export type ModalStateData = {
     modalTitle?: string;
     newWindowLink?: string;
     withCloseButton?: boolean;
+    withLogo?: boolean;
 };
 export interface ModalObservable {
     subscribe(observer: ModalObserver, topics: Array<ModalEventTopics>): void;

package/dist-types/src/state-observables/modal/ModalState.d.ts

@@ -8,7 +8,7 @@ declare class ModalState implements ModalObservable {
     private _modalResolve;
     private _modalReject;
     constructor();
-    setModal(modalContent: ModalContentType, modalTitle: string): Promise<ModalReturnValue>;
+    setModal(modalContent: ModalContentType, modalTitle: string, withLogo?: boolean): Promise<ModalReturnValue>;
     closeModal(modalReturnValue?: ModalReturnValue, onCloseCb?: () => void): void;
     updateModalProps(updatedProps: {
         modalTitle?: string;

package/dist-types/src/state-observables/modal/ModalState.js

@@ -5,14 +5,15 @@ var ModalState = /** @class */ (function () {
         this._modalResolve = function () { };
         this._modalReject = function () { };
     }
-    ModalState.prototype.setModal = function (modalContent, modalTitle) {
+    ModalState.prototype.setModal = function (modalContent, modalTitle, withLogo) {
         var _this = this;
+        if (withLogo === void 0) { withLogo = true; }
         this._modalPromise = new Promise(function (resolve, reject) {
             _this._modalResolve = resolve;
             _this._modalReject = reject;
             _this.modalContent = modalContent;
             _this.modalTitle = modalTitle;
-            _this.publish("SetModal", { modalContent: modalContent, modalTitle: modalTitle });
+            _this.publish("SetModal", { modalContent: modalContent, modalTitle: modalTitle, withLogo: withLogo });
         });
         return this._modalPromise;
     };

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

@@ -17,6 +17,7 @@ export declare enum AppSentMessage {
     RAFT_STOP_VERIFY = "RAFT_STOP_VERIFY",
     RAFT_DISCONNECT = "RAFT_DISCONNECT",
     RAFT_START_DISCOVERY = "RAFT_START_DISCOVERY",
+    RAFT_STOP_DISCOVERY = "RAFT_STOP_DISCOVERY",
     RAFT_SELECT = "RAFT_SELECT",
     RAFT_SEND_REST = "RAFT_SEND_REST",
     GET_MISSED_CONN_EVENT = "GET_MISSED_CONN_EVENT",
@@ -25,7 +26,9 @@ export declare enum AppSentMessage {
     SAVE_FILE_ON_DEVICE_LOCAL_STORAGE = "SAVE_FILE_ON_DEVICE_LOCAL_STORAGE",
     LOAD_FILE_FROM_DEVICE_LOCAL_STORAGE = "LOAD_FILE_FROM_DEVICE_LOCAL_STORAGE",
     DELETE_FILE_FROM_DEVICE_LOCAL_STORAGE = "DELETE_FILE_FROM_DEVICE_LOCAL_STORAGE",
-    LIST_FILES_FROM_DEVICE_LOCAL_STORAGE = "LIST_FILES_FROM_DEVICE_LOCAL_STORAGE"
+    LIST_FILES_FROM_DEVICE_LOCAL_STORAGE = "LIST_FILES_FROM_DEVICE_LOCAL_STORAGE",
+    LOG = "LOG",
+    INJECT_JS = "INJECT_JS"
 }
 export declare enum WrapperSentMessage {
     RAFT_PUBLISHED_EVENT = "RAFT_PUBLISHED_EVENT",

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

@@ -8,6 +8,7 @@ export var AppSentMessage;
     AppSentMessage["RAFT_STOP_VERIFY"] = "RAFT_STOP_VERIFY";
     AppSentMessage["RAFT_DISCONNECT"] = "RAFT_DISCONNECT";
     AppSentMessage["RAFT_START_DISCOVERY"] = "RAFT_START_DISCOVERY";
+    AppSentMessage["RAFT_STOP_DISCOVERY"] = "RAFT_STOP_DISCOVERY";
     AppSentMessage["RAFT_SELECT"] = "RAFT_SELECT";
     AppSentMessage["RAFT_SEND_REST"] = "RAFT_SEND_REST";
     AppSentMessage["GET_MISSED_CONN_EVENT"] = "GET_MISSED_CONN_EVENT";
@@ -17,6 +18,8 @@ export var AppSentMessage;
     AppSentMessage["LOAD_FILE_FROM_DEVICE_LOCAL_STORAGE"] = "LOAD_FILE_FROM_DEVICE_LOCAL_STORAGE";
     AppSentMessage["DELETE_FILE_FROM_DEVICE_LOCAL_STORAGE"] = "DELETE_FILE_FROM_DEVICE_LOCAL_STORAGE";
     AppSentMessage["LIST_FILES_FROM_DEVICE_LOCAL_STORAGE"] = "LIST_FILES_FROM_DEVICE_LOCAL_STORAGE";
+    AppSentMessage["LOG"] = "LOG";
+    AppSentMessage["INJECT_JS"] = "INJECT_JS";
 })(AppSentMessage || (AppSentMessage = {}));
 export var WrapperSentMessage;
 (function (WrapperSentMessage) {

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

@@ -14,7 +14,7 @@ export declare class WrapperAppManager {
     * @returns Promise<ConnectionAttemptResults>
     *
     */
-    connect(method: RaftConnectionMethod, uuid: string): Promise<ConnectionAttemptResults>;
+    connect(method: RaftConnectionMethod, uuids: string[]): Promise<ConnectionAttemptResults>;
     /**
      * Re-triggers the connect event which was missed due to the connection logic
      */

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

@@ -55,12 +55,12 @@ var WrapperAppManager = /** @class */ (function () {
     * @returns Promise<ConnectionAttemptResults>
     *
     */
-    WrapperAppManager.prototype.connect = function (method, uuid) {
+    WrapperAppManager.prototype.connect = function (method, uuids) {
         return __awaiter(this, void 0, void 0, function () {
             var connector, connectionResults;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, ConnectorFactory.connectToRaftHelper(method, uuid)];
+                    case 0: return [4 /*yield*/, ConnectorFactory.connectToRaftHelper(method, uuids)];
                     case 1:
                         connector = _a.sent();
                         if (!connector) {