node-poweredup 6.10.0 → 8.0.0

package/src/devices/technicsmallangularmotor.ts

@@ -0,0 +1,17 @@
+import { AbsoluteMotor } from "./absolutemotor";
+
+import { IDeviceInterface } from "../interfaces";
+
+import * as Consts from "../consts";
+
+/**
+ * @class TechnicSmallAngularMotor
+ * @extends AbsoluteMotor
+ */
+export class TechnicSmallAngularMotor extends AbsoluteMotor {
+
+    constructor (hub: IDeviceInterface, portId: number, modeMap: {[event: string]: number} = {}, type: Consts.DeviceType = Consts.DeviceType.TECHNIC_SMALL_ANGULAR_MOTOR) {
+        super(hub, portId, {}, type);
+    }
+
+}

package/src/hubs/basehub.ts

@@ -28,6 +28,7 @@ import { TechnicDistanceSensor } from "../devices/technicdistancesensor";
 import { TechnicForceSensor } from "../devices/technicforcesensor";
 import { TechnicLargeAngularMotor } from "../devices/techniclargeangularmotor";
 import { TechnicLargeLinearMotor } from "../devices/techniclargelinearmotor";
+import { TechnicSmallAngularMotor } from "../devices/technicsmallangularmotor";
 import { TechnicMediumAngularMotor } from "../devices/technicmediumangularmotor";
 import { TechnicMediumHubAccelerometerSensor } from "../devices/technicmediumhubaccelerometersensor";
 import { TechnicMediumHubGyroSensor } from "../devices/technicmediumhubgyrosensor";
@@ -40,6 +41,7 @@ import { VoltageSensor } from "../devices/voltagesensor";
 import * as Consts from "../consts";
 
 import Debug = require("debug");
+import { Technic3x3ColorLightMatrix } from "../devices/technic3x3colorlightmatrix";
 const debug = Debug("basehub");
 
 
@@ -407,6 +409,7 @@ export class BaseHub extends EventEmitter {
             [Consts.DeviceType.TECHNIC_MEDIUM_HUB_GYRO_SENSOR]: TechnicMediumHubGyroSensor,
             [Consts.DeviceType.TECHNIC_MEDIUM_HUB_ACCELEROMETER]: TechnicMediumHubAccelerometerSensor,
             [Consts.DeviceType.MEDIUM_LINEAR_MOTOR]: MediumLinearMotor,
+            [Consts.DeviceType.TECHNIC_SMALL_ANGULAR_MOTOR]: TechnicSmallAngularMotor,
             [Consts.DeviceType.TECHNIC_MEDIUM_ANGULAR_MOTOR]: TechnicMediumAngularMotor,
             [Consts.DeviceType.TECHNIC_LARGE_ANGULAR_MOTOR]: TechnicLargeAngularMotor,
             [Consts.DeviceType.TECHNIC_LARGE_LINEAR_MOTOR]: TechnicLargeLinearMotor,
@@ -425,6 +428,7 @@ export class BaseHub extends EventEmitter {
             [Consts.DeviceType.MARIO_PANTS_SENSOR]: MarioPantsSensor,
             [Consts.DeviceType.TECHNIC_MEDIUM_ANGULAR_MOTOR_GREY]: TechnicMediumAngularMotor,
             [Consts.DeviceType.TECHNIC_LARGE_ANGULAR_MOTOR_GREY]: TechnicLargeAngularMotor,
+            [Consts.DeviceType.TECHNIC_3X3_COLOR_LIGHT_MATRIX]: Technic3x3ColorLightMatrix,
         };
 
         constructor = deviceConstructors[deviceType as Consts.DeviceType];

package/src/hubs/lpf2hub.ts

@@ -238,7 +238,7 @@ export class LPF2Hub extends BaseHub {
         const event = message[4];
         const deviceType = event ? message.readUInt16LE(5) : 0;
 
-        if (event === Consts.AlertPayload.ATTACHED_IO) {
+        if (event === Consts.Event.ATTACHED_IO) {
 
             if (modeInfoDebug.enabled) {
                 const deviceTypeName = Consts.DeviceTypeNames[message[5]] || "Unknown";
@@ -252,7 +252,7 @@ export class LPF2Hub extends BaseHub {
             const device = this._createDevice(deviceType, portId);
             this._attachDevice(device);
 
-        } else if (event === Consts.AlertPayload.DETACHED_IO) {
+        } else if (event === Consts.Event.DETACHED_IO) {
             const device = this._getDeviceByPortId(portId);
             if (device) {
                 this._detachDevice(device);
@@ -265,7 +265,7 @@ export class LPF2Hub extends BaseHub {
                 }
             }
 
-        } else if (event === Consts.AlertPayload.ATTACHED_VIRTUAL_IO) {
+        } else if (event === Consts.Event.ATTACHED_VIRTUAL_IO) {
             const firstPortName = this.getPortNameForPortId(message[7]);
             const secondPortName = this.getPortNameForPortId(message[8]);
             // @ts-ignore NK These should never be undefined
@@ -348,17 +348,13 @@ export class LPF2Hub extends BaseHub {
 
 
     private _parsePortAction (message: Buffer) {
+        for (let offset = 3; offset < message.length; offset += 2) {
+            const device = this._getDeviceByPortId(message[offset]);
 
-        const portId = message[3];
-        const device = this._getDeviceByPortId(portId);
-
-        if (device) {
-            const finished = (message[4] === 0x0a);
-            if (finished) {
-                device.finish();
+            if (device) {
+                device.finish(message[offset+1]);
             }
         }
-
     }
 
 

package/src/hubs/technicmediumhub.ts

@@ -26,7 +26,7 @@ export class TechnicMediumHub extends LPF2Hub {
             peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &&
             peripheral.advertisement.manufacturerData &&
             peripheral.advertisement.manufacturerData.length > 3 &&
-            peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.TECHNIC_MEDIUM_HUB
+            peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.TECHNIC_MEDIUM_HUB_ID
         );
     }
 

package/src/hubs/technicsmallhub.ts

@@ -0,0 +1,60 @@
+import { Peripheral } from "@abandonware/noble";
+import compareVersion from "compare-versions";
+
+import { IBLEAbstraction } from "../interfaces";
+
+import { LPF2Hub } from "./lpf2hub";
+
+import * as Consts from "../consts";
+
+import Debug = require("debug");
+const debug = Debug("hub");
+
+
+/**
+ * The TechnicSmallHub is emitted if the discovered device is a Technic Small Hub.
+ * @class Hub
+ * @extends LPF2Hub
+ * @extends BaseHub
+ */
+export class TechnicSmallHub extends LPF2Hub {
+
+
+    public static IsTechnicSmallHub (peripheral: Peripheral) {
+        return (
+            peripheral.advertisement &&
+            peripheral.advertisement.serviceUuids &&
+            peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &&
+            peripheral.advertisement.manufacturerData &&
+            peripheral.advertisement.manufacturerData.length > 3 &&
+            peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.TECHNIC_SMALL_HUB_ID
+        );
+    }
+
+    protected _currentPort = 0x3b;
+
+    constructor (device: IBLEAbstraction) {
+        super(device, PortMap, Consts.HubType.TECHNIC_SMALL_HUB);
+        debug("Discovered Spike Essential Hub");
+    }
+
+
+    public async connect () {
+        debug("Connecting to Spike Essential Hub");
+        await super.connect();
+        debug("Connect completed");
+    }
+
+
+}
+
+export const PortMap: {[portName: string]: number} = {
+    "A": 0,
+    "B": 1,
+    "HUB_LED": 49,
+    "CURRENT_SENSOR": 59,
+    "VOLTAGE_SENSOR": 60,
+    "ACCELEROMETER": 97,
+    "GYRO_SENSOR": 98,
+    "TILT_SENSOR": 99
+};

package/src/index-browser.ts

@@ -1,6 +1,7 @@
 import * as Consts from "./consts";
 
 import { PoweredUP } from "./poweredup-browser";
+import { Color } from "./color";
 
 import { BaseHub } from "./hubs/basehub";
 import { DuploTrainBase } from "./hubs/duplotrainbase";
@@ -32,11 +33,13 @@ import { TechnicDistanceSensor } from "./devices/technicdistancesensor";
 import { TechnicForceSensor } from "./devices/technicforcesensor";
 import { TechnicLargeAngularMotor } from "./devices/techniclargeangularmotor";
 import { TechnicLargeLinearMotor } from "./devices/techniclargelinearmotor";
+import { TechnicSmallAngularMotor } from "./devices/technicsmallangularmotor";
 import { TechnicMediumAngularMotor } from "./devices/technicmediumangularmotor";
 import { TechnicMediumHubAccelerometerSensor } from "./devices/technicmediumhubaccelerometersensor";
 import { TechnicMediumHubGyroSensor } from "./devices/technicmediumhubgyrosensor";
 import { TechnicMediumHubTiltSensor } from "./devices/technicmediumhubtiltsensor";
 import { TechnicXLargeLinearMotor } from "./devices/technicxlargelinearmotor";
+import { Technic3x3ColorLightMatrix } from "./devices/technic3x3colorlightmatrix";
 import { TiltSensor } from "./devices/tiltsensor";
 import { TrainMotor } from "./devices/trainmotor";
 import { VoltageSensor } from "./devices/voltagesensor";
@@ -56,6 +59,7 @@ window.PoweredUP = {
     RemoteControl,
     DuploTrainBase,
     Consts,
+    Color,
     ColorDistanceSensor,
     Device,
     DuploTrainBaseColorSensor,
@@ -79,10 +83,12 @@ window.PoweredUP = {
     TechnicMediumHubAccelerometerSensor,
     TechnicMediumHubGyroSensor,
     TechnicMediumHubTiltSensor,
+    TechnicSmallAngularMotor,
     TechnicMediumAngularMotor,
     TechnicLargeAngularMotor,
     TechnicLargeLinearMotor,
     TechnicXLargeLinearMotor,
+    Technic3x3ColorLightMatrix,
     TiltSensor,
     TrainMotor,
     VoltageSensor,

package/src/index-node.ts

@@ -1,6 +1,7 @@
 import * as Consts from "./consts";
 
 import { PoweredUP } from "./poweredup-node";
+import { Color } from "./color";
 
 import { BaseHub } from "./hubs/basehub";
 import { DuploTrainBase } from "./hubs/duplotrainbase";
@@ -32,11 +33,13 @@ import { TechnicDistanceSensor } from "./devices/technicdistancesensor";
 import { TechnicForceSensor } from "./devices/technicforcesensor";
 import { TechnicLargeAngularMotor } from "./devices/techniclargeangularmotor";
 import { TechnicLargeLinearMotor } from "./devices/techniclargelinearmotor";
+import { TechnicSmallAngularMotor } from "./devices/technicsmallangularmotor";
 import { TechnicMediumAngularMotor } from "./devices/technicmediumangularmotor";
 import { TechnicMediumHubAccelerometerSensor } from "./devices/technicmediumhubaccelerometersensor";
 import { TechnicMediumHubGyroSensor } from "./devices/technicmediumhubgyrosensor";
 import { TechnicMediumHubTiltSensor } from "./devices/technicmediumhubtiltsensor";
 import { TechnicXLargeLinearMotor } from "./devices/technicxlargelinearmotor";
+import { Technic3x3ColorLightMatrix } from "./devices/technic3x3colorlightmatrix";
 import { TiltSensor } from "./devices/tiltsensor";
 import { TrainMotor } from "./devices/trainmotor";
 import { VoltageSensor } from "./devices/voltagesensor";
@@ -56,6 +59,7 @@ export {
     RemoteControl,
     DuploTrainBase,
     Consts,
+    Color,
     ColorDistanceSensor,
     Device,
     DuploTrainBaseColorSensor,
@@ -79,10 +83,12 @@ export {
     TechnicMediumHubAccelerometerSensor,
     TechnicMediumHubGyroSensor,
     TechnicMediumHubTiltSensor,
+    TechnicSmallAngularMotor,
     TechnicMediumAngularMotor,
     TechnicLargeAngularMotor,
     TechnicLargeLinearMotor,
     TechnicXLargeLinearMotor,
+    Technic3x3ColorLightMatrix,
     TiltSensor,
     TrainMotor,
     VoltageSensor,

package/src/poweredup-browser.ts

@@ -15,6 +15,7 @@ import { EventEmitter } from "events";
 
 import Debug = require("debug");
 import { IBLEAbstraction } from "./interfaces";
+import { TechnicSmallHub } from "./hubs/technicsmallhub";
 const debug = Debug("poweredup");
 
 
@@ -151,7 +152,10 @@ export class PoweredUP extends EventEmitter {
                             case Consts.BLEManufacturerData.DUPLO_TRAIN_BASE_ID:
                                 resolve(Consts.HubType.DUPLO_TRAIN_BASE);
                                 break;
-                            case Consts.BLEManufacturerData.TECHNIC_MEDIUM_HUB:
+                            case Consts.BLEManufacturerData.TECHNIC_SMALL_HUB_ID:
+                                resolve(Consts.HubType.TECHNIC_SMALL_HUB);
+                                break;
+                            case Consts.BLEManufacturerData.TECHNIC_MEDIUM_HUB_ID:
                                 resolve(Consts.HubType.TECHNIC_MEDIUM_HUB);
                                 break;
                         }
@@ -208,6 +212,9 @@ export class PoweredUP extends EventEmitter {
             case Consts.HubType.DUPLO_TRAIN_BASE:
                 hub = new DuploTrainBase(device);
                 break;
+            case Consts.HubType.TECHNIC_SMALL_HUB:
+                hub = new TechnicSmallHub(device);
+                break;
             case Consts.HubType.TECHNIC_MEDIUM_HUB:
                 hub = new TechnicMediumHub(device);
                 break;

package/src/poweredup-node.ts

@@ -18,13 +18,17 @@ import { EventEmitter } from "events";
 import Debug = require("debug");
 const debug = Debug("poweredup");
 import noble = require("@abandonware/noble");
+import { TechnicSmallHub } from "./hubs/technicsmallhub";
 
 let ready = false;
 let wantScan = false;
 let discoveryEventAttached = false;
 
 const startScanning = () => {
-    noble.startScanning();
+    noble.startScanning([
+        Consts.BLEService.LPF2_HUB,
+        Consts.BLEService.WEDO2_SMART_HUB
+    ]);
 };
 
 noble.on("stateChange", (state: string) => {
@@ -168,6 +172,8 @@ export class PoweredUP extends EventEmitter {
             hub = new RemoteControl(device);
         } else if (DuploTrainBase.IsDuploTrainBase(peripheral)) {
             hub = new DuploTrainBase(device);
+        } else if (TechnicSmallHub.IsTechnicSmallHub(peripheral)) {
+            hub = new TechnicSmallHub(device);
         } else if (TechnicMediumHub.IsTechnicMediumHub(peripheral)) {
             hub = new TechnicMediumHub(device);
         } else if (Mario.IsMario(peripheral)) {

package/src/utils.ts

@@ -88,3 +88,10 @@ export const calculateRamp = (device: Device, fromPower: number, toPower: number
     device.setEventTimer(interval);
     return emitter;
 };
+
+export const parseColor = (color: number) => {
+    if (color === 1 || color === 5) {
+        color = color + 1;
+    }
+    return color;
+}