scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "Attempting to fix #1492: WeDo2 use of should be backwards compatible."

Browse source 
This reverts commit ae28a0c1b86209c66dcdbe9b10e0df8c39be7e10.
This commit is contained in:
Evelyn Eastmond 2018-08-21 21:03:41 -04:00
parent bfa4dfaac2
commit 1f7d9d3b67
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/extensions/scratch3_wedo2/index.js
View file

@ -460,9 +460,8 @@ class WeDo2 {
// TODO: rename scan? // TODO: rename scan?
startDeviceScan () { startDeviceScan () {
this._ble = new BLESession(this._runtime, { this._ble = new BLESession(this._runtime, {
filters: [ filters: [{services: [UUID.DEVICE_SERVICE]}],
{services: [UUID.DEVICE_SERVICE, UUID.IO_SERVICE]} optionalServices: [UUID.IO_SERVICE]
]
}, this._onConnect); }, this._onConnect);
} }
@ -517,6 +516,10 @@ class WeDo2 {
}) })
.then(() => { .then(() => {
// register for attached io notifications // register for attached io notifications
// TODO: make backwards compatible with 'read':
// - try 'startNotifications'
// - then try 'read' with 'startNotifications' flag
// - then catch OSX and Windows errors
this._ble.startNotifications(UUID.DEVICE_SERVICE, UUID.ATTACHED_IO, this._onMessage); this._ble.startNotifications(UUID.DEVICE_SERVICE, UUID.ATTACHED_IO, this._onMessage);
}); });
} }
@ -626,6 +629,10 @@ class WeDo2 {
this._send(UUID.INPUT_COMMAND, Base64Util.uint8ArrayToBase64(cmd)) this._send(UUID.INPUT_COMMAND, Base64Util.uint8ArrayToBase64(cmd))
.then(() => { .then(() => {
// TODO: make backwards compatible with 'read':
// - try 'startNotifications'
// - then try 'read' with 'startNotifications' flag
// - then catch OSX and Windows errors
this._ble.startNotifications(UUID.IO_SERVICE, UUID.INPUT_VALUES, this._onMessage); this._ble.startNotifications(UUID.IO_SERVICE, UUID.INPUT_VALUES, this._onMessage);
}); });
} }

25
src/io/bleSession.js
View file

@ -1,5 +1,5 @@
const JSONRPCWebSocket = require('../util/jsonrpc-web-socket'); const JSONRPCWebSocket = require('../util/jsonrpc-web-socket');
const log = require('../util/log'); // const log = require('../util/log');
const ScratchLinkWebSocket = 'wss://device-manager.scratch.mit.edu:20110/scratch/ble'; const ScratchLinkWebSocket = 'wss://device-manager.scratch.mit.edu:20110/scratch/ble';
class BLESession extends JSONRPCWebSocket { class BLESession extends JSONRPCWebSocket {
@ -115,17 +115,7 @@ class BLESession extends JSONRPCWebSocket {
characteristicId characteristicId
}; };
this._characteristicDidChangeCallback = onCharacteristicChanged; this._characteristicDidChangeCallback = onCharacteristicChanged;
return this.sendRemoteRequest('startNotifications', params) return this.sendRemoteRequest('startNotifications', params);
.catch(() => {
// backwards compatibility: try read
this.read(serviceId, characteristicId, true, onCharacteristicChanged)
.catch(e => {
// if read not allowed, send error
if (e.data !== 'Reading is not permitted.') { // OSX error TODO: Windows error?
this._sendError(e);
}
});
});
} }
/** /**
@ -145,7 +135,12 @@ class BLESession extends JSONRPCWebSocket {
params.startNotifications = true; params.startNotifications = true;
} }
this._characteristicDidChangeCallback = onCharacteristicChanged; this._characteristicDidChangeCallback = onCharacteristicChanged;
return this.sendRemoteRequest('read', params); return this.sendRemoteRequest('read', params)
.catch(e => {
if (e.data !== 'Reading is not permitted.') { // TODO: move this error check to extension
this._sendError(e);
}
});
} }
/** /**
@ -171,9 +166,9 @@ class BLESession extends JSONRPCWebSocket {
}); });
} }
_sendError (e) { _sendError (/* e */) {
this._connected = false; this._connected = false;
log.error(`BLESession error: ${JSON.stringify(e)}`); // log.error(`BLESession error: ${JSON.stringify(e)}`);
this._runtime.emit(this._runtime.constructor.PERIPHERAL_ERROR); this._runtime.emit(this._runtime.constructor.PERIPHERAL_ERROR);
} }