diff --git a/app.ts b/app.ts index c18144c..4598d38 100644 --- a/app.ts +++ b/app.ts @@ -25,8 +25,11 @@ namespace microcode { const arcadeShieldConnected = shieldhelpers.shieldPresent(); if (arcadeShieldConnected) this.pushScene(new microcode.Home(this)) - else - new DistributedLoggingProtocol(this, false); + + // Temp disabled elements relating to callbackObj (no mem) + // else + // new DistributedLoggingProtocol(this, false); + // new NoArcadeShieldMode(this); } public pushScene(scene: Scene) { diff --git a/home.ts b/home.ts index 7fbd07c..9b28d9c 100644 --- a/home.ts +++ b/home.ts @@ -52,7 +52,7 @@ namespace microcode { y, onClick: () => { this.app.popScene() - this.app.pushScene(new DistributedLoggingScreen(this.app)) + // this.app.pushScene(new DistributedLoggingScreen(this.app)) // Temp disabled elements relating to callbackObj (no mem) }, }) diff --git a/loggingConfig.ts b/loggingConfig.ts index 2914a8d..7d29310 100644 --- a/loggingConfig.ts +++ b/loggingConfig.ts @@ -142,7 +142,7 @@ namespace microcode { this.app.popScene() if (this.nextSceneEnum == CursorSceneEnum.DistributedLogging) { - this.app.pushScene(new DistributedLoggingScreen(this.app, this.sensors, this.sensorConfigs)); + // this.app.pushScene(new DistributedLoggingScreen(this.app, this.sensors, this.sensorConfigs)); // Temp disabled with Distributedlogging (no mem) } else { // All sensors are configured, pass them their config and move to the DataRecording screen: diff --git a/noArcadeShieldMode.ts b/noArcadeShieldMode.ts index 02082f0..c906d6d 100644 --- a/noArcadeShieldMode.ts +++ b/noArcadeShieldMode.ts @@ -369,8 +369,8 @@ namespace microcode { case UI_SENSOR_SELECT_STATE.MAGNET: return [new MagnetSensor()] - case UI_SENSOR_SELECT_STATE.RADIO: - new DistributedLoggingProtocol(this.app, false); + // case UI_SENSOR_SELECT_STATE.RADIO: + // new DistributedLoggingProtocol(this.app, false); return [] default: diff --git a/pxt.json b/pxt.json index d747aa0..ad25491 100644 --- a/pxt.json +++ b/pxt.json @@ -48,8 +48,7 @@ "sensorSelect.ts", "dataRecorder.ts", "tabularDataViewer.ts", - "generateGraph.ts", - "distributedLogging.ts" + "generateGraph.ts" ], "testFiles": [], "targetVersions": { diff --git a/sensors.ts b/sensors.ts index 91941d0..7cc9497 100644 --- a/sensors.ts +++ b/sensors.ts @@ -255,10 +255,11 @@ namespace microcode { * Time it takes for this algorithm to run is accounted for when calculating how long to wait inbetween logs * Mutates this.schedule * + * Temp disabled elements relating to callbackObj (no mem) * @param callbackObj is used by the DistributedLoggingProtocol; after each log & after the algorithm finishes a callback will be made */ - start(callbackObj?: ITargetDataLoggedCallback) { - const callbackAfterLog: boolean = (callbackObj == null) ? false : true + start() {//callbackObj?: ITargetDataLoggedCallback) { + // const callbackAfterLog: boolean = (callbackObj == null) ? false : true control.inBackground(() => { let currentTime = 0; @@ -272,8 +273,8 @@ namespace microcode { const logAsCSV = this.schedule[i].sensor.log(0) // Optionally inform the caller of the log (In the case of the DistributedLoggingProtocol this information can be forwarded to the Commander over radio) - if (callbackAfterLog) - callbackObj.callback(logAsCSV) + // if (callbackAfterLog) + // callbackObj.callback(logAsCSV) // Clear from schedule (A sensor may only have 1 reading): if (!this.schedule[i].sensor.hasMeasurements()) @@ -321,8 +322,8 @@ namespace microcode { const logAsCSV = this.schedule[i].sensor.log(currentTime) // Optionally inform the caller of the log (In the case of the DistributedLoggingProtocol this information can be forwarded to the Commander over radio) - if (callbackAfterLog) - callbackObj.callback(logAsCSV) + // if (callbackAfterLog) + // callbackObj.callback(logAsCSV) // Update schedule with when they should next be logged: if (this.schedule[i].sensor.hasMeasurements()) { @@ -349,10 +350,11 @@ namespace microcode { . # # # . `) } - if (callbackAfterLog) { - DistributedLoggingProtocol.finishedLogging = true - callbackObj.callback("") - } + + // if (callbackAfterLog) { + // DistributedLoggingProtocol.finishedLogging = true + // callbackObj.callback("") + // } }) } }