Merge pull request #158 from cafjs/master
Fix for #157 (and possibly #131)
This commit is contained in:
commit
505bbdc648
@ -130,9 +130,9 @@ export class PoweredUP extends EventEmitter {
|
|||||||
|
|
||||||
|
|
||||||
private _determineLPF2HubType (device: IBLEAbstraction): Promise<Consts.HubType> {
|
private _determineLPF2HubType (device: IBLEAbstraction): Promise<Consts.HubType> {
|
||||||
return new Promise((resolve) => {
|
return new Promise(async (resolve) => {
|
||||||
let buf: Buffer = Buffer.alloc(0);
|
let buf: Buffer = Buffer.alloc(0);
|
||||||
device.subscribeToCharacteristic(Consts.BLECharacteristic.LPF2_ALL, (data: Buffer) => {
|
await device.subscribeToCharacteristic(Consts.BLECharacteristic.LPF2_ALL, (data: Buffer) => {
|
||||||
buf = Buffer.concat([buf, data]);
|
buf = Buffer.concat([buf, data]);
|
||||||
while (buf[0] <= buf.length) {
|
while (buf[0] <= buf.length) {
|
||||||
const len = buf[0];
|
const len = buf[0];
|
||||||
|
@ -85,7 +85,7 @@ export class WebBLEDevice extends EventEmitter implements IBLEAbstraction {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public subscribeToCharacteristic (uuid: string, callback: (data: Buffer) => void) {
|
public subscribeToCharacteristic (uuid: string, callback: (data: Buffer) => void): Promise<any> {
|
||||||
if (this._listeners[uuid]) {
|
if (this._listeners[uuid]) {
|
||||||
this._characteristics[uuid].removeEventListener("characteristicvaluechanged", this._listeners[uuid]);
|
this._characteristics[uuid].removeEventListener("characteristicvaluechanged", this._listeners[uuid]);
|
||||||
}
|
}
|
||||||
@ -108,7 +108,7 @@ export class WebBLEDevice extends EventEmitter implements IBLEAbstraction {
|
|||||||
callback(data);
|
callback(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
this._characteristics[uuid].startNotifications();
|
return this._characteristics[uuid].startNotifications();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user