node-poweredup 7.0.0 → 8.0.2

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/nobleabstraction.ts

@@ -79,6 +79,8 @@ export class NobleDevice extends EventEmitter implements IBLEAbstraction {
     public disconnect () {
         return new Promise<void>((resolve) => {
             this._noblePeripheral.disconnect();
+            this._connecting = false;
+            this._connected = false;
             return resolve();
         });
     }

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,19 @@ 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.LPF2_HUB.replace(/-/g, ""),
+        Consts.BLEService.WEDO2_SMART_HUB,
+        Consts.BLEService.WEDO2_SMART_HUB.replace(/-/g, "")
+    ]);
 };
 
 noble.on("stateChange", (state: string) => {
@@ -168,6 +174,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/webbleabstraction.ts

@@ -68,6 +68,7 @@ export class WebBLEDevice extends EventEmitter implements IBLEAbstraction {
     public disconnect () {
         return new Promise<void>((resolve) => {
             this._webBLEServer.device.gatt.disconnect();
+            this._connected = false;
             return resolve();
         });
     }