Reverted accidental formatting changes to wedo2smarthub.ts
This commit is contained in:
parent
e5bba46b80
commit
a1026547cf
@ -10,132 +10,91 @@ import { IBLEDevice } from "./interfaces";
|
||||
import { isWebBluetooth } from "./utils";
|
||||
const debug = Debug("wedo2smarthub");
|
||||
|
||||
|
||||
/**
|
||||
* The WeDo2SmartHub is emitted if the discovered device is a WeDo 2.0 Smart Hub.
|
||||
* @class WeDo2SmartHub
|
||||
* @extends Hub
|
||||
*/
|
||||
export class WeDo2SmartHub extends Hub {
|
||||
|
||||
|
||||
public static IsWeDo2SmartHub (peripheral: Peripheral) {
|
||||
return (
|
||||
peripheral.advertisement &&
|
||||
return (peripheral.advertisement &&
|
||||
peripheral.advertisement.serviceUuids &&
|
||||
peripheral.advertisement.serviceUuids.indexOf(
|
||||
Consts.BLEService.WEDO2_SMART_HUB.replace(/-/g, "")
|
||||
) >= 0
|
||||
);
|
||||
peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.WEDO2_SMART_HUB.replace(/-/g, "")) >= 0);
|
||||
}
|
||||
|
||||
|
||||
private _lastTiltX: number = 0;
|
||||
private _lastTiltY: number = 0;
|
||||
|
||||
|
||||
constructor (device: IBLEDevice, autoSubscribe: boolean = true) {
|
||||
super(device, autoSubscribe);
|
||||
this.type = Consts.HubType.WEDO2_SMART_HUB;
|
||||
this._ports = {
|
||||
A: new Port("A", 1),
|
||||
B: new Port("B", 2)
|
||||
"A": new Port("A", 1),
|
||||
"B": new Port("B", 2)
|
||||
};
|
||||
debug("Discovered WeDo 2.0 Smart Hub");
|
||||
}
|
||||
|
||||
|
||||
public connect () {
|
||||
return new Promise(async (resolve, reject) => {
|
||||
debug("Connecting to WeDo 2.0 Smart Hub");
|
||||
await super.connect();
|
||||
await this._bleDevice.discoverCharacteristicsForService(
|
||||
Consts.BLEService.WEDO2_SMART_HUB
|
||||
);
|
||||
await this._bleDevice.discoverCharacteristicsForService(
|
||||
Consts.BLEService.WEDO2_SMART_HUB_2
|
||||
);
|
||||
await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB);
|
||||
await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_2);
|
||||
if (!isWebBluetooth) {
|
||||
await this._bleDevice.discoverCharacteristicsForService(
|
||||
Consts.BLEService.WEDO2_SMART_HUB_3
|
||||
);
|
||||
await this._bleDevice.discoverCharacteristicsForService(
|
||||
Consts.BLEService.WEDO2_SMART_HUB_4
|
||||
);
|
||||
await this._bleDevice.discoverCharacteristicsForService(
|
||||
Consts.BLEService.WEDO2_SMART_HUB_5
|
||||
);
|
||||
await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_3);
|
||||
await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_4);
|
||||
await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_5);
|
||||
} else {
|
||||
await this._bleDevice.discoverCharacteristicsForService(
|
||||
"battery_service"
|
||||
);
|
||||
await this._bleDevice.discoverCharacteristicsForService(
|
||||
"device_information"
|
||||
);
|
||||
await this._bleDevice.discoverCharacteristicsForService("battery_service");
|
||||
await this._bleDevice.discoverCharacteristicsForService("device_information");
|
||||
}
|
||||
this._activatePortDevice(0x03, 0x15, 0x00, 0x00); // Activate voltage reports
|
||||
this._activatePortDevice(0x04, 0x14, 0x00, 0x00); // Activate current reports
|
||||
debug("Connect completed");
|
||||
this.emit("connect");
|
||||
resolve();
|
||||
this._bleDevice.subscribeToCharacteristic(
|
||||
Consts.BLECharacteristic.WEDO2_PORT_TYPE,
|
||||
this._parsePortMessage.bind(this)
|
||||
);
|
||||
this._bleDevice.subscribeToCharacteristic(
|
||||
Consts.BLECharacteristic.WEDO2_SENSOR_VALUE,
|
||||
this._parseSensorMessage.bind(this)
|
||||
);
|
||||
this._bleDevice.subscribeToCharacteristic(
|
||||
Consts.BLECharacteristic.WEDO2_BUTTON,
|
||||
this._parseSensorMessage.bind(this)
|
||||
);
|
||||
this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_PORT_TYPE, this._parsePortMessage.bind(this));
|
||||
this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_SENSOR_VALUE, this._parseSensorMessage.bind(this));
|
||||
this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_BUTTON, this._parseSensorMessage.bind(this));
|
||||
if (!isWebBluetooth) {
|
||||
this._bleDevice.subscribeToCharacteristic(
|
||||
Consts.BLECharacteristic.WEDO2_BATTERY,
|
||||
this._parseBatteryMessage.bind(this)
|
||||
);
|
||||
this._bleDevice.readFromCharacteristic(
|
||||
Consts.BLECharacteristic.WEDO2_BATTERY,
|
||||
(err, data) => {
|
||||
this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_BATTERY, this._parseBatteryMessage.bind(this));
|
||||
this._bleDevice.readFromCharacteristic(Consts.BLECharacteristic.WEDO2_BATTERY, (err, data) => {
|
||||
if (data) {
|
||||
this._parseBatteryMessage(data);
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
} else {
|
||||
this._bleDevice.readFromCharacteristic(
|
||||
"00002a19-0000-1000-8000-00805f9b34fb",
|
||||
(err, data) => {
|
||||
this._bleDevice.readFromCharacteristic("00002a19-0000-1000-8000-00805f9b34fb", (err, data) => {
|
||||
if (data) {
|
||||
this._parseBatteryMessage(data);
|
||||
}
|
||||
});
|
||||
this._bleDevice.subscribeToCharacteristic("00002a19-0000-1000-8000-00805f9b34fb", this._parseHighCurrentAlert.bind(this));
|
||||
}
|
||||
);
|
||||
this._bleDevice.subscribeToCharacteristic(
|
||||
"00002a19-0000-1000-8000-00805f9b34fb",
|
||||
this._parseHighCurrentAlert.bind(this)
|
||||
);
|
||||
}
|
||||
this._bleDevice.subscribeToCharacteristic(
|
||||
Consts.BLECharacteristic.WEDO2_HIGH_CURRENT_ALERT,
|
||||
this._parseHighCurrentAlert.bind(this)
|
||||
);
|
||||
this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_HIGH_CURRENT_ALERT, this._parseHighCurrentAlert.bind(this));
|
||||
if (!isWebBluetooth) {
|
||||
this._bleDevice.readFromCharacteristic(
|
||||
Consts.BLECharacteristic.WEDO2_FIRMWARE_REVISION,
|
||||
(err, data) => {
|
||||
this._bleDevice.readFromCharacteristic(Consts.BLECharacteristic.WEDO2_FIRMWARE_REVISION, (err, data) => {
|
||||
if (data) {
|
||||
this._parseFirmwareRevisionString(data);
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
} else {
|
||||
this._bleDevice.readFromCharacteristic(
|
||||
"00002a26-0000-1000-8000-00805f9b34fb",
|
||||
(err, data) => {
|
||||
this._bleDevice.readFromCharacteristic("00002a26-0000-1000-8000-00805f9b34fb", (err, data) => {
|
||||
if (data) {
|
||||
this._parseFirmwareRevisionString(data);
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the name of the Hub.
|
||||
@ -157,6 +116,7 @@ export class WeDo2SmartHub extends Hub {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the color of the LED on the Hub via a color value.
|
||||
* @method WeDo2SmartHub#setLEDColor
|
||||
@ -171,14 +131,12 @@ export class WeDo2SmartHub extends Hub {
|
||||
color = 0;
|
||||
}
|
||||
data = Buffer.from([0x06, 0x04, 0x01, color]);
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE,
|
||||
data
|
||||
);
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE, data);
|
||||
return resolve();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Shutdown the Hub.
|
||||
* @method WeDo2SmartHub#shutdown
|
||||
@ -186,16 +144,13 @@ export class WeDo2SmartHub extends Hub {
|
||||
*/
|
||||
public shutdown () {
|
||||
return new Promise((resolve, reject) => {
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_DISCONNECT,
|
||||
Buffer.from([0x00]),
|
||||
() => {
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_DISCONNECT, Buffer.from([0x00]), () => {
|
||||
return resolve();
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the color of the LED on the Hub via RGB values.
|
||||
* @method WeDo2SmartHub#setLEDRGB
|
||||
@ -209,14 +164,12 @@ export class WeDo2SmartHub extends Hub {
|
||||
let data = Buffer.from([0x06, 0x17, 0x01, 0x02]);
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_PORT_TYPE_WRITE, data);
|
||||
data = Buffer.from([0x06, 0x04, 0x03, red, green, blue]);
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE,
|
||||
data
|
||||
);
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE, data);
|
||||
return resolve();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the motor speed on a given port.
|
||||
* @method WeDo2SmartHub#setMotorSpeed
|
||||
@ -238,16 +191,10 @@ export class WeDo2SmartHub extends Hub {
|
||||
portObj.cancelEventTimer();
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE,
|
||||
Buffer.from([portObj.value, 0x01, 0x02, this._mapSpeed(speed)])
|
||||
);
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE, Buffer.from([portObj.value, 0x01, 0x02, this._mapSpeed(speed)]));
|
||||
if (time && typeof time === "number") {
|
||||
const timeout = global.setTimeout(() => {
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE,
|
||||
Buffer.from([portObj.value, 0x01, 0x02, 0x00])
|
||||
);
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE, Buffer.from([portObj.value, 0x01, 0x02, 0x00]));
|
||||
return resolve();
|
||||
}, time);
|
||||
portObj.setEventTimer(timeout);
|
||||
@ -257,6 +204,7 @@ export class WeDo2SmartHub extends Hub {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Ramp the motor speed on a given port.
|
||||
* @method WeDo2SmartHub#rampMotorSpeed
|
||||
@ -266,12 +214,7 @@ export class WeDo2SmartHub extends Hub {
|
||||
* @param {number} time How long the ramp should last (in milliseconds).
|
||||
* @returns {Promise} Resolved upon successful completion of command.
|
||||
*/
|
||||
public rampMotorSpeed(
|
||||
port: string,
|
||||
fromSpeed: number,
|
||||
toSpeed: number,
|
||||
time: number
|
||||
) {
|
||||
public rampMotorSpeed (port: string, fromSpeed: number, toSpeed: number, time: number) {
|
||||
const portObj = this._portLookup(port);
|
||||
portObj.cancelEventTimer();
|
||||
return new Promise((resolve, reject) => {
|
||||
@ -283,6 +226,7 @@ export class WeDo2SmartHub extends Hub {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Fully (hard) stop the motor on a given port.
|
||||
* @method WeDo2SmartHub#brakeMotor
|
||||
@ -293,6 +237,7 @@ export class WeDo2SmartHub extends Hub {
|
||||
return this.setMotorSpeed(port, 127);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Play a tone on the Hub's in-built buzzer
|
||||
* @method WeDo2SmartHub#playTone
|
||||
@ -305,14 +250,12 @@ export class WeDo2SmartHub extends Hub {
|
||||
const data = Buffer.from([0x05, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00]);
|
||||
data.writeUInt16LE(frequency, 3);
|
||||
data.writeUInt16LE(time, 5);
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE,
|
||||
data
|
||||
);
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE, data);
|
||||
global.setTimeout(resolve, time);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the light brightness on a given port.
|
||||
* @method WeDo2SmartHub#setLightBrightness
|
||||
@ -326,17 +269,11 @@ export class WeDo2SmartHub extends Hub {
|
||||
portObj.cancelEventTimer();
|
||||
return new Promise((resolve, reject) => {
|
||||
const data = Buffer.from([portObj.value, 0x01, 0x02, brightness]);
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE,
|
||||
data
|
||||
);
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE, data);
|
||||
if (time) {
|
||||
const timeout = global.setTimeout(() => {
|
||||
const data = Buffer.from([portObj.value, 0x01, 0x02, 0x00]);
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE,
|
||||
data
|
||||
);
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE, data);
|
||||
return resolve();
|
||||
}, time);
|
||||
portObj.setEventTimer(timeout);
|
||||
@ -346,10 +283,8 @@ export class WeDo2SmartHub extends Hub {
|
||||
});
|
||||
}
|
||||
|
||||
public sendRaw(
|
||||
message: Buffer,
|
||||
characteristic: string = Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE
|
||||
) {
|
||||
|
||||
public sendRaw (message: Buffer, characteristic: string = Consts.BLECharacteristic.WEDO2_MOTOR_VALUE_WRITE) {
|
||||
return new Promise((resolve, reject) => {
|
||||
this._writeMessage(characteristic, message, () => {
|
||||
return resolve();
|
||||
@ -357,68 +292,25 @@ export class WeDo2SmartHub extends Hub {
|
||||
});
|
||||
}
|
||||
|
||||
protected _activatePortDevice(
|
||||
port: number,
|
||||
type: number,
|
||||
mode: number,
|
||||
format: number,
|
||||
callback?: () => void
|
||||
) {
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_PORT_TYPE_WRITE,
|
||||
Buffer.from([
|
||||
0x01,
|
||||
0x02,
|
||||
port,
|
||||
type,
|
||||
mode,
|
||||
0x01,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
format,
|
||||
0x01
|
||||
]),
|
||||
callback
|
||||
);
|
||||
|
||||
protected _activatePortDevice (port: number, type: number, mode: number, format: number, callback?: () => void) {
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_PORT_TYPE_WRITE, Buffer.from([0x01, 0x02, port, type, mode, 0x01, 0x00, 0x00, 0x00, format, 0x01]), callback);
|
||||
}
|
||||
|
||||
protected _deactivatePortDevice(
|
||||
port: number,
|
||||
type: number,
|
||||
mode: number,
|
||||
format: number,
|
||||
callback?: () => void
|
||||
) {
|
||||
this._writeMessage(
|
||||
Consts.BLECharacteristic.WEDO2_PORT_TYPE_WRITE,
|
||||
Buffer.from([
|
||||
0x01,
|
||||
0x02,
|
||||
port,
|
||||
type,
|
||||
mode,
|
||||
0x01,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
format,
|
||||
0x00
|
||||
]),
|
||||
callback
|
||||
);
|
||||
|
||||
protected _deactivatePortDevice (port: number, type: number, mode: number, format: number, callback?: () => void) {
|
||||
this._writeMessage(Consts.BLECharacteristic.WEDO2_PORT_TYPE_WRITE, Buffer.from([0x01, 0x02, port, type, mode, 0x01, 0x00, 0x00, 0x00, format, 0x00]), callback);
|
||||
}
|
||||
|
||||
|
||||
private _writeMessage (uuid: string, message: Buffer, callback?: () => void) {
|
||||
if (debug.enabled) {
|
||||
debug(
|
||||
`Sent Message (${this._getCharacteristicNameFromUUID(uuid)})`,
|
||||
message
|
||||
);
|
||||
debug(`Sent Message (${this._getCharacteristicNameFromUUID(uuid)})`, message);
|
||||
}
|
||||
this._bleDevice.writeToCharacteristic(uuid, message, callback);
|
||||
}
|
||||
|
||||
|
||||
private _getCharacteristicNameFromUUID (uuid: string) {
|
||||
const keys = Object.keys(Consts.BLECharacteristic);
|
||||
for (let i = 0; i < keys.length; i++) {
|
||||
@ -430,27 +322,27 @@ export class WeDo2SmartHub extends Hub {
|
||||
return "UNKNOWN";
|
||||
}
|
||||
|
||||
|
||||
private _parseHighCurrentAlert (data: Buffer) {
|
||||
debug("Received Message (WEDO2_HIGH_CURRENT_ALERT)", data);
|
||||
}
|
||||
|
||||
|
||||
private _parseBatteryMessage (data: Buffer) {
|
||||
debug("Received Message (WEDO2_BATTERY)", data);
|
||||
this._batteryLevel = data[0];
|
||||
}
|
||||
|
||||
|
||||
private _parseFirmwareRevisionString (data: Buffer) {
|
||||
debug("Received Message (WEDO2_FIRMWARE_REVISION)", data);
|
||||
const parts = data.toString().split(".");
|
||||
this._firmwareInfo = {
|
||||
major: parseInt(parts[0], 10),
|
||||
minor: parseInt(parts[1], 10),
|
||||
bugFix: parseInt(parts[2], 10),
|
||||
build: parseInt(parts[3], 10)
|
||||
};
|
||||
this._firmwareInfo = { major: parseInt(parts[0], 10), minor: parseInt(parts[1], 10), bugFix: parseInt(parts[2], 10), build: parseInt(parts[3], 10) };
|
||||
}
|
||||
|
||||
|
||||
private _parsePortMessage (data: Buffer) {
|
||||
|
||||
debug("Received Message (WEDO2_PORT_TYPE)", data);
|
||||
|
||||
const port = this._getPortForPortNumber(data[0]);
|
||||
@ -461,9 +353,12 @@ export class WeDo2SmartHub extends Hub {
|
||||
|
||||
port.connected = data[1] === 1 ? true : false;
|
||||
this._registerDeviceAttachment(port, data[3]);
|
||||
|
||||
}
|
||||
|
||||
|
||||
private _parseSensorMessage (data: Buffer) {
|
||||
|
||||
debug("Received Message (WEDO2_SENSOR_VALUE)", data);
|
||||
|
||||
if (data[0] === 0x01) {
|
||||
@ -565,5 +460,8 @@ export class WeDo2SmartHub extends Hub {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user