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

Adding extension ids to customize error alerts for extensions.

Browse source
This commit is contained in:
Evelyn Eastmond 2018-09-22 14:48:41 -04:00
parent ad3328197e
commit 3c905503b7
5 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/extensions/scratch3_ev3/index.js
View file

@ -408,6 +408,11 @@ class EV3 {
this._runtime = runtime;
this._runtime.on('PROJECT_STOP_ALL', this.stopAll.bind(this));
/**
* The id of the extension this peripheral belongs to.
*/
this._extensionId = extensionId;
/**
* A list of the names of the sensors connected in ports 1,2,3,4.
* @type {string[]}
@ -548,7 +553,7 @@ class EV3 {
* Called by the runtime when user wants to scan for an EV3 peripheral.
*/
scan () {
this._bt = new BT(this._runtime, 'EV3', {
this._bt = new BT(this._runtime, this._extensionId, {
majorDeviceClass: 8,
minorDeviceClass: 1
}, this._onConnect, this._onMessage);

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

@ -73,6 +73,9 @@ class MicroBit {
this._ble = null;
this._runtime.registerPeripheralExtension(extensionId, this);
/**
* The id of the extension this peripheral belongs to.
*/
this._extensionId = extensionId;
/**
@ -134,15 +137,6 @@ class MicroBit {
this.disconnect = this.disconnect.bind(this);
this._onConnect = this._onConnect.bind(this);
this._onMessage = this._onMessage.bind(this);
this._runtime.emit(this._runtime.constructor.PERIPHERAL_ERROR, {
message: `Scratch lost connection to peripheral.`,
extensionId: this._extensionId
});
this._runtime.emit(this._runtime.constructor.PERIPHERAL_ERROR, {
message: `Scratch lost connection to peripheral.`,
extensionId: 2
});
}
/**

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

@ -357,6 +357,11 @@ class WeDo2 {
this._runtime = runtime;
this._runtime.on('PROJECT_STOP_ALL', this.stopAll.bind(this));
/**
* The id of the extension this peripheral belongs to.
*/
this._extensionId = extensionId;
/**
* A list of the ids of the motors or sensors in ports 1 and 2.
* @type {string[]}
@ -549,7 +554,7 @@ class WeDo2 {
* Called by the runtime when user wants to scan for a WeDo 2.0 peripheral.
*/
scan () {
this._ble = new BLE(this._runtime, 'WeDo 2', {
this._ble = new BLE(this._runtime, this._extensionId, {
filters: [{
services: [BLEService.DEVICE_SERVICE]
}],

3
src/io/ble.js
View file

@ -174,8 +174,9 @@ class BLE extends JSONRPCWebSocket {
_sendError (/* e */) {
this.disconnect();
// log.error(`BLE error: ${JSON.stringify(e)}`);
console.log('extension id sending: ' + this._extensionId);
this._runtime.emit(this._runtime.constructor.PERIPHERAL_ERROR, {
message: `Scratch lost connection to ${this._peripheralType}.`,
message: `Scratch lost connection to`,
extensionId: this._extensionId
});
}

4
src/io/bt.js
View file

@ -117,8 +117,10 @@ class BT extends JSONRPCWebSocket {
_sendError (/* e */) {
this.disconnect();
// log.error(`BT error: ${JSON.stringify(e)}`);
console.log('extension id sending: ' + this._extensionId);
this._runtime.emit(this._runtime.constructor.PERIPHERAL_ERROR, {
message: `Scratch lost connection to ${this._peripheralType}.`
message: `Scratch lost connection to`,
extensionId: this._extensionId
});
}