diff --git a/package-lock.json b/package-lock.json index 9bc1c11..f116237 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "node-poweredup", - "version": "1.1.7", + "version": "1.4.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -10,26 +10,19 @@ "integrity": "sha512-LS1MCPaQKqspg7FvexuhmDbWUhE2yIJ+4AgVIyObfc06/UKZ8REgxGNjZc82wPLWmbeOm7S+gSsLgo75TanG4A==", "dev": true }, - "@types/events": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz", - "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==", - "dev": true - }, "@types/noble": { - "version": "0.0.37", - "resolved": "https://registry.npmjs.org/@types/noble/-/noble-0.0.37.tgz", - "integrity": "sha512-1g/UifUgJXLaVv/7Q4YE1ppXYpkpafdTtgaZ9NubL6zzMXXaFrD+KAliyDnLh0Vur6f/JkxhB7i3kx4yD5hWKA==", + "version": "0.0.38", + "resolved": "https://registry.npmjs.org/@types/noble/-/noble-0.0.38.tgz", + "integrity": "sha512-d5wuIsv9BkoUZF1c8i94R5i3Wg6qO2l3CK6vEmRyv2kvBLolEJf5DgNoKizQyEpmAy3ch9V35VA/KECJcxr2Vw==", "dev": true, "requires": { - "@types/events": "*", "@types/node": "*" } }, "@types/node": { - "version": "10.12.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.9.tgz", - "integrity": "sha512-eajkMXG812/w3w4a1OcBlaTwsFPO5F7fJ/amy+tieQxEMWBlbV1JGSjkFM+zkHNf81Cad+dfIRA+IBkvmvdAeA==", + "version": "10.12.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz", + "integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==", "dev": true }, "abbrev": { @@ -121,7 +114,7 @@ "dependencies": { "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -381,9 +374,9 @@ } }, "debug": { - "version": "4.1.0", - "resolved": "https://npm-registry.rancher.sie.sony.com/d/debug/_attachments/debug-4.1.0.tgz", - "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { "ms": "^2.1.1" } @@ -787,7 +780,7 @@ }, "ms": { "version": "2.1.1", - "resolved": "https://npm-registry.rancher.sie.sony.com/m/ms/_attachments/ms-2.1.1.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" }, "nan": { @@ -1126,12 +1119,12 @@ } }, "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz", + "integrity": "sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "^1.0.6" } }, "rimraf": { @@ -1215,7 +1208,7 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, @@ -1278,7 +1271,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true }, @@ -1338,9 +1331,9 @@ "dev": true }, "tslint": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz", - "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.0.tgz", + "integrity": "sha512-CKEcH1MHUBhoV43SA/Jmy1l24HJJgI0eyLbBNSRyFlsQvb9v6Zdq+Nz2vEOH00nC5SUx4SneJ59PZUS/ARcokQ==", "dev": true, "requires": { "babel-code-frame": "^6.22.0", @@ -1367,9 +1360,9 @@ } }, "typescript": { - "version": "3.1.6", - "resolved": "https://npm-registry.rancher.sie.sony.com/t/typescript/_attachments/typescript-3.1.6.tgz", - "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz", + "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==", "dev": true }, "typical": { diff --git a/package.json b/package.json index 929f2bb..6f642c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-poweredup", - "version": "1.4.7", + "version": "1.4.8", "description": "A Node.js module to interface with LEGO Powered UP components.", "homepage": "https://github.com/nathankellenicki/node-poweredup/", "main": "dist/index.js", @@ -15,17 +15,17 @@ "author": "Nathan Kellenicki ", "license": "MIT", "dependencies": { - "debug": "^4.1.0", + "debug": "^4.1.1", "noble": "1.9.1", "noble-mac": "https://github.com/Timeular/noble-mac.git#af4418e" }, "devDependencies": { "jsdoc-to-markdown": "^4.0.1", - "typescript": "^3.1.6", - "tslint": "^5.11.0", + "typescript": "^3.2.2", + "tslint": "^5.12.0", "@types/debug": "0.0.31", - "@types/noble": "0.0.37", - "@types/node": "^10.12.9" + "@types/noble": "0.0.38", + "@types/node": "^10.12.18" }, "resolutions": { "xpc-connection": "sandeepmistry/node-xpc-connection#pull/26/head" diff --git a/src/lpf2hub.ts b/src/lpf2hub.ts index 9cf1ed1..71f4b6c 100644 --- a/src/lpf2hub.ts +++ b/src/lpf2hub.ts @@ -148,23 +148,19 @@ export class LPF2Hub extends Hub { this._messageBuffer = this._messageBuffer.slice(len); switch (message[2]) { - case 0x01: - { + case 0x01: { this._parseDeviceInfo(message); break; } - case 0x04: - { + case 0x04: { this._parsePortMessage(message); break; } - case 0x45: - { + case 0x45: { this._parseSensorMessage(message); break; } - case 0x82: - { + case 0x82: { this._parsePortAction(message); break; } @@ -267,8 +263,7 @@ export class LPF2Hub extends Hub { if (port && port.connected) { switch (port.type) { - case Consts.DeviceType.WEDO2_DISTANCE: - { + case Consts.DeviceType.WEDO2_DISTANCE: { let distance = data[4]; if (data[5] === 1) { distance = data[4] + 255; @@ -282,8 +277,7 @@ export class LPF2Hub extends Hub { this.emit("distance", port.id, distance * 10); break; } - case Consts.DeviceType.BOOST_DISTANCE: - { + case Consts.DeviceType.BOOST_DISTANCE: { /** * Emits when a color sensor is activated. @@ -318,8 +312,7 @@ export class LPF2Hub extends Hub { } break; } - case Consts.DeviceType.WEDO2_TILT: - { + case Consts.DeviceType.WEDO2_TILT: { const tiltX = data[4] > 160 ? data[4] - 255 : data[4] - (data[4] * 2); const tiltY = data[5] > 160 ? 255 - data[5] : data[5] - (data[5] * 2); this._lastTiltX = tiltX; @@ -334,8 +327,7 @@ export class LPF2Hub extends Hub { this.emit("tilt", port.id, this._lastTiltX, this._lastTiltY); break; } - case Consts.DeviceType.BOOST_TACHO_MOTOR: - { + case Consts.DeviceType.BOOST_TACHO_MOTOR: { const rotation = data.readInt32LE(4); /** * Emits when a rotation sensor is activated. @@ -346,54 +338,45 @@ export class LPF2Hub extends Hub { this.emit("rotate", port.id, rotation); break; } - case Consts.DeviceType.BOOST_MOVE_HUB_MOTOR: - { + case Consts.DeviceType.BOOST_MOVE_HUB_MOTOR: { const rotation = data.readInt32LE(4); this.emit("rotate", port.id, rotation); break; } - case Consts.DeviceType.BOOST_TILT: - { + case Consts.DeviceType.BOOST_TILT: { const tiltX = data[4] > 160 ? data[4] - 255 : data[4]; const tiltY = data[5] > 160 ? 255 - data[5] : data[5] - (data[5] * 2); this.emit("tilt", port.id, tiltX, tiltY); break; } - case Consts.DeviceType.POWERED_UP_REMOTE_BUTTON: - { + case Consts.DeviceType.POWERED_UP_REMOTE_BUTTON: { switch (data[4]) { - case 0x01: - { + case 0x01: { this.emit("button", port.id, Consts.ButtonState.UP); break; } - case 0xff: - { + case 0xff: { this.emit("button", port.id, Consts.ButtonState.DOWN); break; } - case 0x7f: - { + case 0x7f: { this.emit("button", port.id, Consts.ButtonState.STOP); break; } - case 0x00: - { + case 0x00: { this.emit("button", port.id, Consts.ButtonState.RELEASED); break; } } break; } - case Consts.DeviceType.DUPLO_TRAIN_BASE_COLOR: - { + case Consts.DeviceType.DUPLO_TRAIN_BASE_COLOR: { if (data[4] <= 10) { this.emit("color", port.id, data[4]); } break; } - case Consts.DeviceType.DUPLO_TRAIN_BASE_SPEEDOMETER: - { + case Consts.DeviceType.DUPLO_TRAIN_BASE_SPEEDOMETER: { /** * Emits on a speed change. * @event LPF2Hub#speed diff --git a/src/wedo2smarthub.ts b/src/wedo2smarthub.ts index 22d1b68..946535f 100644 --- a/src/wedo2smarthub.ts +++ b/src/wedo2smarthub.ts @@ -293,8 +293,7 @@ export class WeDo2SmartHub extends Hub { if (port && port.connected) { switch (port.type) { - case Consts.DeviceType.WEDO2_DISTANCE: - { + case Consts.DeviceType.WEDO2_DISTANCE: { let distance = data[2]; if (data[3] === 1) { distance = data[2] + 255; @@ -308,8 +307,7 @@ export class WeDo2SmartHub extends Hub { this.emit("distance", port.id, distance * 10); break; } - case Consts.DeviceType.BOOST_DISTANCE: - { + case Consts.DeviceType.BOOST_DISTANCE: { const distance = data[2]; /** * Emits when a color sensor is activated. @@ -320,8 +318,7 @@ export class WeDo2SmartHub extends Hub { this.emit("color", port.id, distance); break; } - case Consts.DeviceType.WEDO2_TILT: - { + case Consts.DeviceType.WEDO2_TILT: { this._lastTiltX = data[2]; if (this._lastTiltX > 100) { this._lastTiltX = -(255 - this._lastTiltX); @@ -340,8 +337,7 @@ export class WeDo2SmartHub extends Hub { this.emit("tilt", port.id, this._lastTiltX, this._lastTiltY); break; } - case Consts.DeviceType.BOOST_TACHO_MOTOR: - { + case Consts.DeviceType.BOOST_TACHO_MOTOR: { const rotation = data.readInt32LE(2); /** * Emits when a rotation sensor is activated.