.drone.yml

@@ -1,15 +1,14 @@
 pipeline:
 
   install:
-    image: node:20.12.2
+    image: node:10.15.1
     commands:
       - apt-get update
       - apt-get install -y bluetooth bluez libbluetooth-dev libudev-dev
-      - git submodule update --init --recursive
       - npm install
 
   build:
-    image: node:20.12.2
+    image: node:10.15.1
     commands:
       - npm run all
 

.npmignore

@@ -1,5 +1,17 @@
+boostmovehub.ts
+consts.ts
+duplotrainbase.ts
+hub.ts
+index.ts
+lpf2hub.ts
+port.ts
+poweredup.ts
+puphub.ts
+pupremote.ts
 package-lock.json
 tsconfig.json
 tslint.json
+utils.ts
+wedo2smarthub.ts
 .vscode/
 examples/

README.md

@@ -1,79 +1,25 @@
 [![Drone](https://drone.kellenicki.com/api/badges/nkellenicki/node-poweredup/status.svg)](https://drone.kellenicki.com/nkellenicki/node-poweredup)
 [![NPM Version](https://img.shields.io/npm/v/node-poweredup.svg?style=flat)](https://www.npmjs.com/package/node-poweredup)
-[![Docs](https://img.shields.io/badge/docs-start%20here-yellowgreen.svg)](https://nathan.kellenicki.com/node-poweredup/)
 
 # **node-poweredup** - A Javascript module to interface with LEGO Powered Up components.
 
-### Announcements
-
-* v7.1.0 adds support for SPIKE Essential, including the Technic Small Hub, Technic Small Angular Motor, and Technic 3x3 Color Matrix.
-
 ### Introduction
 
-LEGO Powered Up is the successor to Power Functions, the system for adding electronics to LEGO models. Powered Up is a collection of ranges, all of which are compatible with each other:
-
-* LEGO Education WeDo 2.0
-* LEGO Boost
-* LEGO Powered Up
-* LEGO Technic CONTROL+
-* LEGO Education SPIKE Prime
-* LEGO Education SPIKE Essential
-* LEGO Mindstorms Robot Inventor
-
-Other products that speak the Powered Up protocol include the Duplo App-Controlled trains and LEGO Super Mario, both of which are compatible with this library.
+LEGO Powered Up is the successor to Power Functions, the system for adding electronics to LEGO models. Powered Up is a collection of ranges - starting with LEGO WeDo 2.0 released in 2016, LEGO Boost released in 2017, LEGO Powered Up released in 2018, and LEGO Technic CONTROL+ released in 2019. It also includes the 2018 Duplo App-Controlled Train sets.
 
 This library allows communication and control of Powered Up devices and peripherals via Javascript, both from Node.js and from the browser using Web Bluetooth.
 
-### Sample Usage
-
-```javascript
-const PoweredUP = require("node-poweredup");
-const poweredUP = new PoweredUP.PoweredUP();
-
-poweredUP.on("discover", async (hub) => { // Wait to discover a Hub
-    console.log(`Discovered ${hub.name}!`);
-    await hub.connect(); // Connect to the Hub
-    const motorA = await hub.waitForDeviceAtPort("A"); // Make sure a motor is plugged into port A
-    const motorB = await hub.waitForDeviceAtPort("B"); // Make sure a motor is plugged into port B
-    console.log("Connected");
-
-    while (true) { // Repeat indefinitely
-        console.log("Running motor B at speed 50");
-        motorB.setPower(50); // Start a motor attached to port B to run a 3/4 speed (75) indefinitely
-        console.log("Running motor A at speed 100 for 2 seconds");
-        motorA.setPower(100); // Run a motor attached to port A for 2 seconds at maximum speed (100) then stop
-        await hub.sleep(2000);
-        motorA.brake();
-        await hub.sleep(1000); // Do nothing for 1 second
-        console.log("Running motor A at speed -30 for 1 second");
-        motorA.setPower(-30); // Run a motor attached to port A for 2 seconds at 1/2 speed in reverse (-50) then stop
-        await hub.sleep(2000);
-        motorA.brake();
-        await hub.sleep(1000); // Do nothing for 1 second
-    }
-});
-
-poweredUP.scan(); // Start scanning for Hubs
-console.log("Scanning for Hubs...");
-```
-
-More examples are available in the "examples" directory.
-
-### Documentation
-
-[Full documentation is available here.](https://nathankellenicki.github.io/node-poweredup/)
-
 ### Node.js Installation
 
-Node.js v12.0+ required.
+Node.js v8.0 required.
 
 ```javascript
 npm install node-poweredup --save
 ```
 
-node-poweredup uses the Noble BLE library by Sandeep Mistry. On macOS everything should function out of the box. On Linux and Windows there are [certain dependencies which may need installed first](https://github.com/abandonware/noble#prerequisites).
+node-poweredup uses the Noble BLE library by Sandeep Mistry. On macOS everything should function out of the box. On Linux and Windows there are [certain dependencies which may need installed first](https://github.com/noble/noble#prerequisites).
 
-Note: node-poweredup has been tested on macOS 11.0 and Debian/Raspbian on the Raspberry Pi 3 Model B.
+Note: node-poweredup has been tested on macOS 10.13 and Debian/Raspbian on the Raspberry Pi 3 Model B.
 
 ### Compatibility
 
@@ -88,16 +34,8 @@ While most Powered Up components and Hubs are compatible with each other, there
 | Boost Tacho Motor               | <a href="https://brickset.com/sets/88008-1/">88008</a>        | Motor/Sensor  |     *Partial*    |       Yes      |       Yes      | Yes | <a href="https://brickset.com/sets/17101-1/">17101</a> |
 | Powered Up Train Motor          | <a href="https://brickset.com/sets/88011-1/">88011</a>        | Motor         |         Yes        |       Yes      |       Yes      | Yes | <a href="https://brickset.com/sets/60197-1/">60197</a><br /><a href="https://brickset.com/sets/60198-1/">60198</a> |
 | Powered Up LED Lights           | <a href="https://brickset.com/sets/88005-1/">88005</a>        | Light         |       Yes      |     Yes    |     Yes    | Yes | <a href="https://brickset.com/sets/88005-1/">88005</a> |
-| Control+ Large Motor            | 22169        | Motor/Sensor  |       *Partial*      |     No    |     Yes    | Yes | <a href="https://brickset.com/sets/42099-1/">42099</a><br /><a href="https://brickset.com/sets/42100-1/">42100</a> |
+| Control+ Large Motor            | 22169        | Motor/Sensor  |       *Partial*      |     No    |     Yes    | Yes | <a href="https://brickset.com/sets/42099-1/">42099</a> |
 | Control+ XLarge Motor            | 22172        | Motor/Sensor  |       *Partial*      |     No    |     Yes    | Yes | <a href="https://brickset.com/sets/42099-1/">42099</a><br /><a href="https://brickset.com/sets/42100-1/">42100</a> |
-| SPIKE Prime Medium Motor            | 45678        | Motor/Sensor  |       *Partial*      |     No    |     Yes    | Yes | <a href="https://brickset.com/sets/45678-1/">45678</a> |
-| SPIKE Prime Large Motor            | 45678        | Motor/Sensor  |       *Partial*      |     No    |     Yes    | Yes | <a href="https://brickset.com/sets/45678-1/">45678</a> |
-| SPIKE Prime Color Sensor            | 45678        | Sensor  |       No      |     No    |     Yes    | Yes | <a href="https://brickset.com/sets/45678-1/">45678</a> |
-| SPIKE Prime Distance Sensor            | 45678        | Sensor  |       No      |     No    |     Yes    | Yes | <a href="https://brickset.com/sets/45678-1/">45678</a> |
-| SPIKE Prime Force Sensor            | 45678        | Sensor  |       *Partial*      |     Yes    |     Yes    | Yes | <a href="https://brickset.com/sets/45678-1/">45678</a> |
-| SPIKE Essential Small Motor            | 45607        | Motor/Sensor  |       *Partial*      |     No    |     Yes    | Yes | <a href="https://brickset.com/sets/45345-1/">45345</a> |
-| SPIKE Essential 3x3 Color Matrix            | 45608        | Motor/Sensor  |       *Partial*      |     No    |     Yes    | Yes | <a href="https://brickset.com/sets/45345-1/">45345</a> |
-
 
 In addition, the Hubs themselves have certain built-in features which this library exposes.
 
@@ -109,18 +47,48 @@ In addition, the Hubs themselves have certain built-in features which this libra
 | Powered Up Remote  | <a href="https://brickset.com/sets/88010-1/">88010</a> | RGB LED<br />Left and Right Control Buttons<br />Button                 | <a href="https://brickset.com/sets/60197-1/">60197</a><br /><a href="https://brickset.com/sets/60198-1/">60198</a> |
 | Duplo Train Base   | 28743 | RGB LED/Headlights<br />Speaker<br />Speedometer<br />Motor<br />Color and Distance Sensor<br />Button | <a href="https://brickset.com/sets/10874-1/">10874</a><br /><a href="https://brickset.com/sets/10875-1/">10875</a> |
 | Control+ Hub     | 22127 | RGB LED<br />Button<br />Tilt Sensor<br />Accelerometer                                                     | <a href="https://brickset.com/sets/42099-1/">42099</a><br /><a href="https://brickset.com/sets/42100-1/">42100</a> |
-| Super Mario     | 71360 | Pants Sensor<br />Barcode and Color Sensor | <a href="https://brickset.com/sets/71360-1/">71360</a> |
-| SPIKE Essential Hub     | 45609 | RGB LED<br />Button<br />Tilt Sensor<br />Accelerometer                                                     | <a href="https://brickset.com/sets/45345-1/">45345</a> |
 
 ### Known Issues and Limitations
 
-* The WeDo 2.0 Smart Hub uses an older firmware which is no longer being updated. As a result, only certain motors and sensors work with it. See the table above.
+* The Boost Color and Distance sensor only works in color mode with the WeDo 2.0 Smart Hub.
 
-* When used with the Boost Move Hub, the Control+ Motors and SPIKE Prime Motors/Sensors do not currently accept commands (This is a known bug which requires a firmware update from Lego to fix)
+* When used with the WeDo 2.0 Smart Hub, the Boost Tacho Motor and Control+ Motors do not support rotating the motor by angle.
 
-* The SPIKE Prime Hub does not use Bluetooth Low Energy, so is not supported via this library. It is recommended you use MicroPython to develop for this Hub using the officially provided tools and software. The SPIKE Essential Hub however is supported, as it uses Bluetooth Low Energy.
+* When used with the Boost Move Hub, the Control+ Motors do not currently accept commands.
 
-* On most Unix systems, you need root permissions to access Bluetooth devices. You may want to [grant the node executable access to the Bluetooth adapter](https://github.com/abandonware/noble#running-without-rootsudo-linux-specific)
+### Documentation
+
+[Full documentation is available here.](https://nathankellenicki.github.io/node-poweredup/)
+
+### Node.js Sample Usage
+
+```javascript
+const PoweredUP = require("node-poweredup");
+const poweredUP = new PoweredUP.PoweredUP();
+
+poweredUP.on("discover", async (hub) => { // Wait to discover a Hub
+    console.log(`Discovered ${hub.name}!`);
+    await hub.connect(); // Connect to the Hub
+    console.log("Connected");
+    await hub.sleep(3000); // Sleep for 3 seconds before starting
+
+    while (true) { // Repeat indefinitely
+        console.log("Running motor B at speed 75");
+        hub.setMotorSpeed("B", 75); // Start a motor attached to port B to run a 3/4 speed (75) indefinitely
+        console.log("Running motor A at speed 100 for 2 seconds");
+        await hub.setMotorSpeed("A", 100,  2000); // Run a motor attached to port A for 2 seconds at maximum speed (100) then stop
+        await hub.sleep(1000); // Do nothing for 1 second
+        console.log("Running motor A at speed -50 for 1 seconds");
+        await hub.setMotorSpeed("A", -50,  1000); // Run a motor attached to port A for 1 second at 1/2 speed in reverse (-50) then stop
+        await hub.sleep(1000); // Do nothing for 1 second
+    }
+});
+
+poweredUP.scan(); // Start scanning for Hubs
+console.log("Scanning for Hubs...");
+```
+
+More examples are available in the "examples" directory.
 
 ### Credits
 

abandonware-noble.d.ts

@@ -1,129 +0,0 @@
-declare module "@abandonware/noble" {
-    // Type definitions for noble
-    // Project: https://github.com/sandeepmistry/noble
-    // Definitions by: Seon-Wook Park <https://github.com/swook>
-    //                 Shantanu Bhadoria <https://github.com/shantanubhadoria>
-    //                 Luke Libraro <https://github.com/lukel99>
-    //                 Dan Chao <https://github.com/bioball>
-    //                 Michal Lower <https://github.com/keton>
-    //                 Rob Moran <https://github.com/thegecko>
-    // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-    /// <reference types="node" />
-
-    import events = require("events");
-
-    export function startScanning(callback?: (error?: Error) => void): void;
-    export function startScanning(serviceUUIDs: string[], callback?: (error?: Error) => void): void;
-    export function startScanning(serviceUUIDs: string[], allowDuplicates: boolean, callback?: (error?: Error) => void): void;
-    export function stopScanning(callback?: () => void): void;
-
-    export function on(event: "stateChange", listener: (state: string) => void): events.EventEmitter;
-    export function on(event: "scanStart", listener: () => void): events.EventEmitter;
-    export function on(event: "scanStop", listener: () => void): events.EventEmitter;
-    export function on(event: "discover", listener: (peripheral: Peripheral) => void): events.EventEmitter;
-    export function on(event: string, listener: Function): events.EventEmitter;
-
-    export function removeListener(event: "stateChange", listener: (state: string) => void): events.EventEmitter;
-    export function removeListener(event: "scanStart", listener: () => void): events.EventEmitter;
-    export function removeListener(event: "scanStop", listener: () => void): events.EventEmitter;
-    export function removeListener(event: "discover", listener: (peripheral: Peripheral) => void): events.EventEmitter;
-    export function removeListener(event: string, listener: Function): events.EventEmitter;
-
-    export var state:string;
-
-    export class Peripheral extends events.EventEmitter {
-        id:            string;
-        uuid:          string;
-        address:       string;
-        addressType:   string;
-        connectable:   boolean;
-        advertisement: Advertisement;
-        rssi:          number;
-        services:      Service[];
-        state:         'error' | 'connecting' | 'connected' | 'disconnecting' | 'disconnected';
-
-        connect(callback?: (error: string) => void): void;
-        disconnect(callback?: () => void): void;
-        updateRssi(callback?: (error: string, rssi: number) => void): void;
-        discoverServices(serviceUUIDs: string[], callback?: (error: string, services: Service[]) => void): void;
-        discoverAllServicesAndCharacteristics(callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
-        discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[], callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
-
-        readHandle(handle: Buffer, callback: (error: string, data: Buffer) => void): void;
-        writeHandle(handle: Buffer, data: Buffer, withoutResponse: boolean, callback: (error: string) => void): void;
-        toString(): string;
-
-        on(event: "connect", listener: (error: string) => void): this;
-        on(event: "disconnect", listener: (error: string) => void): this;
-        on(event: "rssiUpdate", listener: (rssi: number) => void): this;
-        on(event: "servicesDiscover", listener: (services: Service[]) => void): this;
-        on(event: string, listener: Function): this;
-    }
-
-    export interface Advertisement {
-        localName: string;
-        serviceData: {
-            uuid: string,
-            data: Buffer
-        };
-        txPowerLevel: number;
-        manufacturerData: Buffer;
-        serviceUuids: string[];
-    }
-
-    export class Service extends events.EventEmitter {
-        uuid: string;
-        name: string;
-        type: string;
-        includedServiceUuids: string[];
-        characteristics: Characteristic[];
-
-        discoverIncludedServices(serviceUUIDs: string[], callback?: (error: string, includedServiceUuids: string[]) => void): void;
-        discoverCharacteristics(characteristicUUIDs: string[], callback?: (error: string, characteristics: Characteristic[]) => void): void;
-        toString(): string;
-
-        on(event: "includedServicesDiscover", listener: (includedServiceUuids: string[]) => void): this;
-        on(event: "characteristicsDiscover", listener: (characteristics: Characteristic[]) => void): this;
-        on(event: string, listener: Function): this;
-    }
-
-    export class Characteristic extends events.EventEmitter {
-        uuid: string;
-        name: string;
-        type: string;
-        properties: string[];
-        descriptors: Descriptor[];
-
-        read(callback?: (error: string, data: Buffer) => void): void;
-        write(data: Buffer, notify: boolean, callback?: (error: string) => void): void;
-        broadcast(broadcast: boolean, callback?: (error: string) => void): void;
-        notify(notify: boolean, callback?: (error: string) => void): void;
-        discoverDescriptors(callback?: (error: string, descriptors: Descriptor[]) => void): void;
-        toString(): string;
-        subscribe(callback?: (error: string) => void): void;
-        unsubscribe(callback?: (error: string) => void): void;
-
-        on(event: "read", listener: (data: Buffer, isNotification: boolean) => void): this;
-        on(event: "write", withoutResponse: boolean, listener: (error: string) => void): this;
-        on(event: "broadcast", listener: (state: string) => void): this;
-        on(event: "notify", listener: (state: string) => void): this;
-        on(event: "descriptorsDiscover", listener: (descriptors: Descriptor[]) => void): this;
-        on(event: string, listener: Function): this;
-        on(event: string, option: boolean, listener: Function): this;
-    }
-
-    export class Descriptor extends events.EventEmitter {
-        uuid: string;
-        name: string;
-        type: string;
-
-        readValue(callback?: (error: string, data: Buffer) => void): void;
-        writeValue(data: Buffer, callback?: (error: string) => void): void;
-        toString(): string;
-
-        on(event: "valueRead", listener: (error: string, data: Buffer) => void): this;
-        on(event: "valueWrite", listener: (error: string) => void): this;
-        on(event: string, listener: Function): this;
-    }
-}