nkellenicki/node-poweredup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged timer cancellation

Browse Source
This commit is contained in:
Nathan Kellenicki 2018-08-29 10:26:52 -07:00
parent 7468d52cda
commit bec809ceaf
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
duplotrainhub.ts
View File

@ -55,8 +55,7 @@ export class DuploTrainHub extends LPF2Hub {
super(peripheral, autoSubscribe); super(peripheral, autoSubscribe);
this.type = Consts.Hubs.DUPLO_TRAIN_HUB; this.type = Consts.Hubs.DUPLO_TRAIN_HUB;
this._ports = { this._ports = {
"MOTOR": new Port("MOTOR", 0), "MOTOR": new Port("MOTOR", 0)
"LIGHT": new Port("LIGHT", 1)
}; };
debug("Discovered Duplo Train Hub"); debug("Discovered Duplo Train Hub");
} }
@ -92,6 +91,16 @@ export class DuploTrainHub extends LPF2Hub {
throw new Error(`Port ${portObj.id} requires both motors be of the same type`); throw new Error(`Port ${portObj.id} requires both motors be of the same type`);
} }
} }
let cancelEventTimer = true;
if (typeof time === "boolean") {
if (time === true) {
cancelEventTimer = false;
}
time = undefined;
}
if (cancelEventTimer) {
portObj.cancelEventTimer();
}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (time) { if (time) {
let data = null; let data = null;
@ -102,7 +111,7 @@ export class DuploTrainHub extends LPF2Hub {
data = Buffer.from([0x81, portObj.value, 0x11, 0x60, 0x00, this._mapSpeed(speed), 0x00, 0x00]); data = Buffer.from([0x81, portObj.value, 0x11, 0x60, 0x00, this._mapSpeed(speed), 0x00, 0x00]);
} }
this._writeMessage(Consts.BLECharacteristics.LPF2_ALL, data); this._writeMessage(Consts.BLECharacteristics.LPF2_ALL, data);
setTimeout(() => { const timeout = global.setTimeout(() => {
let data = null; let data = null;
if (portObj.id === "AB") { if (portObj.id === "AB") {
data = Buffer.from([0x81, portObj.value, 0x11, 0x02, 0x00, 0x00]); data = Buffer.from([0x81, portObj.value, 0x11, 0x02, 0x00, 0x00]);
@ -112,6 +121,7 @@ export class DuploTrainHub extends LPF2Hub {
this._writeMessage(Consts.BLECharacteristics.LPF2_ALL, data); this._writeMessage(Consts.BLECharacteristics.LPF2_ALL, data);
return resolve(); return resolve();
}, time); }, time);
portObj.setEventTimer(timeout);
} else { } else {
let data = null; let data = null;
if (portObj.id === "AB") { if (portObj.id === "AB") {
@ -137,8 +147,10 @@ export class DuploTrainHub extends LPF2Hub {
* @returns {Promise} Resolved upon successful completion of command. * @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) => { return new Promise((resolve, reject) => {
this._calculateRamp(fromSpeed, toSpeed, time) this._calculateRamp(fromSpeed, toSpeed, time, portObj)
.on("changeSpeed", (speed) => { .on("changeSpeed", (speed) => {
this.setMotorSpeed(port, speed); this.setMotorSpeed(port, speed);
}) })