scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removing busy flag again which was reintroduced via a un-rebased merge.

Browse source
This commit is contained in:
unknown 2019-03-06 12:53:17 -05:00
parent 47139426f2
commit fed43e1841
1 changed files with 1 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/extensions/scratch3_microbit/index.js
View file

@ -32,12 +32,6 @@ const BLECommand = {
*/ */
const BLETimeout = 4500; const BLETimeout = 4500;
/**
* A time interval to wait (in milliseconds) while a block that sends a BLE message is running.
* @type {number}
*/
const BLESendInterval = 100;
/** /**
* A string to report to the BLE socket when the micro:bit has stopped receiving data. * A string to report to the BLE socket when the micro:bit has stopped receiving data.
* @type {string} * @type {string}
@ -131,13 +125,6 @@ class MicroBit {
*/ */
this._timeoutID = null; this._timeoutID = null;
/**
* A flag that is true while we are busy sending data to the BLE socket.
* @type {boolean}
* @private
*/
this._busy = false;
/** /**
* A task queue to track communication tasks sent over the socket. * A task queue to track communication tasks sent over the socket.
* The bucket in this task queue holds 1 task at a time, and refills * The bucket in this task queue holds 1 task at a time, and refills
@ -148,12 +135,6 @@ class MicroBit {
*/ */
this._queue = new TaskQueue(1, 10, {maxTotalCost: 30}); this._queue = new TaskQueue(1, 10, {maxTotalCost: 30});
/**
* ID for a timeout which is used to clear the busy flag if it has been
* true for a long time.
*/
this._busyTimeoutID = null;
this.disconnect = this.disconnect.bind(this); this.disconnect = this.disconnect.bind(this);
this._onConnect = this._onConnect.bind(this); this._onConnect = this._onConnect.bind(this);
this._onMessage = this._onMessage.bind(this); this._onMessage = this._onMessage.bind(this);
@ -283,19 +264,6 @@ class MicroBit {
*/ */
send (command, message) { send (command, message) {
if (!this.isConnected()) return; if (!this.isConnected()) return;
if (this._busy) return;
// Set a busy flag so that while we are sending a message and waiting for
// the response, additional messages are ignored.
this._busy = true;
// Set a timeout after which to reset the busy flag. This is used in case
// a BLE message was sent for which we never received a response, because
// e.g. the peripheral was turned off after the message was sent. We reset
// the busy flag after a while so that it is possible to try again later.
this._busyTimeoutID = window.setTimeout(() => {
this._busy = false;
}, 5000);
const output = new Uint8Array(message.length + 1); const output = new Uint8Array(message.length + 1);
output[0] = command; // attach command to beginning of message output[0] = command; // attach command to beginning of message
@ -304,12 +272,7 @@ class MicroBit {
} }
const data = Base64Util.uint8ArrayToBase64(output); const data = Base64Util.uint8ArrayToBase64(output);
this._ble.write(BLEUUID.service, BLEUUID.txChar, data, 'base64', true).then( this._ble.write(BLEUUID.service, BLEUUID.txChar, data, 'base64', true);
() => {
this._busy = false;
window.clearTimeout(this._busyTimeoutID);
}
);
} }
/** /**