From 7a1367d81a9ac743575b6e2fb09d57a5e7148013 Mon Sep 17 00:00:00 2001 From: Evelyn Eastmond Date: Fri, 22 Feb 2019 12:29:24 -0500 Subject: [PATCH 1/2] Change from setInterval to setTimeout for auto disconnect feature. --- src/extensions/scratch3_microbit/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extensions/scratch3_microbit/index.js b/src/extensions/scratch3_microbit/index.js index f18c5e3c..ce951c71 100644 --- a/src/extensions/scratch3_microbit/index.js +++ b/src/extensions/scratch3_microbit/index.js @@ -299,7 +299,7 @@ class MicroBit { */ _onConnect () { this._ble.read(BLEUUID.service, BLEUUID.rxChar, true, this._onMessage); - this._timeoutID = window.setInterval( + this._timeoutID = window.setTimeout( () => this._ble.handleDisconnectError(BLEDataStoppedError), BLETimeout ); @@ -330,7 +330,7 @@ class MicroBit { // cancel disconnect timeout and start a new one window.clearInterval(this._timeoutID); - this._timeoutID = window.setInterval( + this._timeoutID = window.setTimeout( () => this._ble.handleDisconnectError(BLEDataStoppedError), BLETimeout ); From 59ab3b717d385e1fbfff0781594f8a61f080a3a8 Mon Sep 17 00:00:00 2001 From: Evelyn Eastmond Date: Fri, 1 Mar 2019 10:04:56 -0500 Subject: [PATCH 2/2] Fixing clearInterval > clearTimeout. --- src/extensions/scratch3_microbit/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extensions/scratch3_microbit/index.js b/src/extensions/scratch3_microbit/index.js index ce951c71..29b5d790 100644 --- a/src/extensions/scratch3_microbit/index.js +++ b/src/extensions/scratch3_microbit/index.js @@ -239,7 +239,7 @@ class MicroBit { * Disconnect from the micro:bit. */ disconnect () { - window.clearInterval(this._timeoutID); + window.clearTimeout(this._timeoutID); if (this._ble) { this._ble.disconnect(); } @@ -329,7 +329,7 @@ class MicroBit { this._sensors.gestureState = data[9]; // cancel disconnect timeout and start a new one - window.clearInterval(this._timeoutID); + window.clearTimeout(this._timeoutID); this._timeoutID = window.setTimeout( () => this._ble.handleDisconnectError(BLEDataStoppedError), BLETimeout