scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-11 10:39:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2710 from fsih/useCdm

Browse source 
Handle user did not pick peripheral
This commit is contained in:
DD Liu 2020-11-24 18:35:04 -05:00 committed by GitHub
commit a0c11d6d86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/io/ble.js
View file

@ -190,6 +190,14 @@ class BLE extends JSONRPC {
window.clearTimeout(this._discoverTimeoutID); window.clearTimeout(this._discoverTimeoutID);
} }
break; break;
case 'userDidNotPickPeripheral':
this._runtime.emit(
this._runtime.constructor.PERIPHERAL_SCAN_TIMEOUT
);
if (this._discoverTimeoutID) {
window.clearTimeout(this._discoverTimeoutID);
}
break;
case 'characteristicDidChange': case 'characteristicDidChange':
if (this._characteristicDidChangeCallback) { if (this._characteristicDidChangeCallback) {
this._characteristicDidChangeCallback(params.message); this._characteristicDidChangeCallback(params.message);

18
src/io/bt.js
View file

@ -128,6 +128,24 @@ class BT extends JSONRPC {
window.clearTimeout(this._discoverTimeoutID); window.clearTimeout(this._discoverTimeoutID);
} }
break; break;
case 'userDidPickPeripheral':
this._availablePeripherals[params.peripheralId] = params;
this._runtime.emit(
this._runtime.constructor.USER_PICKED_PERIPHERAL,
this._availablePeripherals
);
if (this._discoverTimeoutID) {
window.clearTimeout(this._discoverTimeoutID);
}
break;
case 'userDidNotPickPeripheral':
this._runtime.emit(
this._runtime.constructor.PERIPHERAL_SCAN_TIMEOUT
);
if (this._discoverTimeoutID) {
window.clearTimeout(this._discoverTimeoutID);
}
break;
case 'didReceiveMessage': case 'didReceiveMessage':
this._messageCallback(params); // TODO: refine? this._messageCallback(params); // TODO: refine?
break; break;