From 198d637ef9d13cdb7b73ca8278f58aa57b97ffd4 Mon Sep 17 00:00:00 2001 From: Nathan Kellenicki Date: Mon, 16 Dec 2019 08:42:40 -0800 Subject: [PATCH] Renamed devices --- examples/new_device_test.js | 4 ++-- src/consts.ts | 6 +++--- src/index-browser.ts | 14 ++++++------- src/index-node.ts | 14 ++++++------- src/{lights.ts => light.ts} | 4 ++-- src/lpf2hub.ts | 20 +++++++++---------- ...rgemotor.ts => techniclargelinearmotor.ts} | 4 ++-- ...gemotor.ts => technicxlargelinearmotor.ts} | 4 ++-- src/wedo2smarthub.ts | 12 +++++------ 9 files changed, 41 insertions(+), 41 deletions(-) rename src/{lights.ts => light.ts} (90%) rename src/{controlpluslargemotor.ts => techniclargelinearmotor.ts} (55%) rename src/{controlplusxlargemotor.ts => technicxlargelinearmotor.ts} (55%) diff --git a/examples/new_device_test.js b/examples/new_device_test.js index 99f35e6..fb05ed0 100644 --- a/examples/new_device_test.js +++ b/examples/new_device_test.js @@ -27,8 +27,8 @@ poweredUP.on("discover", async (hub) => { // Wait to discover hubs if ( // device instanceof PoweredUP.MoveHubMediumLinearMotor || device instanceof PoweredUP.MediumLinearMotor || - device instanceof PoweredUP.ControlPlusLargeMotor || - device instanceof PoweredUP.ControlPlusXLargeMotor + device instanceof PoweredUP.TechnicLargeLinearMotor || + device instanceof PoweredUP.TechnicXLargeLinearMotor ) { const motor = device; diff --git a/src/consts.ts b/src/consts.ts index 2189508..11f7bb7 100644 --- a/src/consts.ts +++ b/src/consts.ts @@ -54,7 +54,7 @@ export enum DeviceType { UNKNOWN = 0, SIMPLE_MEDIUM_LINEAR_MOTOR = 1, TRAIN_MOTOR = 2, - LED_LIGHTS = 8, + LIGHT = 8, VOLTAGE = 20, CURRENT = 21, PIEZO_TONE = 22, @@ -69,8 +69,8 @@ export enum DeviceType { DUPLO_TRAIN_BASE_SPEAKER = 42, DUPLO_TRAIN_BASE_COLOR = 43, DUPLO_TRAIN_BASE_SPEEDOMETER = 44, - CONTROL_PLUS_LARGE_MOTOR = 46, - CONTROL_PLUS_XLARGE_MOTOR = 47, + TECHNIC_LARGE_LINEAR_MOTOR = 46, + TECHNIC_XLARGE_LINEAR_MOTOR = 47, CONTROL_PLUS_GEST = 54, POWERED_UP_REMOTE_BUTTON = 55, RSSI = 56, diff --git a/src/index-browser.ts b/src/index-browser.ts index 032e422..0eafb35 100644 --- a/src/index-browser.ts +++ b/src/index-browser.ts @@ -11,13 +11,13 @@ import { PUPRemote } from "./pupremote"; import { WeDo2SmartHub } from "./wedo2smarthub"; import { ColorDistanceSensor } from "./colordistancesensor"; -import { ControlPlusLargeMotor } from "./controlpluslargemotor"; -import { ControlPlusXLargeMotor } from "./controlplusxlargemotor"; import { Device } from "./device"; -import { Lights } from "./lights"; +import { Light } from "./light"; import { MediumLinearMotor } from "./mediumlinearmotor"; -import { MoveHubMediumLinearMotor } from "./MoveHubMediumLinearMotor"; +import { MoveHubMediumLinearMotor } from "./movehubmediumlinearmotor"; import { SimpleMediumLinearMotor } from "./simplemediumlinearmotor"; +import { TechnicLargeLinearMotor } from "./techniclargelinearmotor"; +import { TechnicXLargeLinearMotor } from "./technicxlargelinearmotor"; import { TrainMotor } from "./trainmotor"; import { isWebBluetooth } from "./utils"; @@ -34,13 +34,13 @@ window.PoweredUP = { DuploTrainBase, Consts, ColorDistanceSensor, - ControlPlusLargeMotor, - ControlPlusXLargeMotor, Device, - Lights, + Light, MediumLinearMotor, MoveHubMediumLinearMotor, SimpleMediumLinearMotor, + TechnicLargeLinearMotor, + TechnicXLargeLinearMotor, TrainMotor, isWebBluetooth }; diff --git a/src/index-node.ts b/src/index-node.ts index ccaed22..ffe988d 100644 --- a/src/index-node.ts +++ b/src/index-node.ts @@ -11,13 +11,13 @@ import { PUPRemote } from "./pupremote"; import { WeDo2SmartHub } from "./wedo2smarthub"; import { ColorDistanceSensor } from "./colordistancesensor"; -import { ControlPlusLargeMotor } from "./controlpluslargemotor"; -import { ControlPlusXLargeMotor } from "./controlplusxlargemotor"; import { Device } from "./device"; -import { Lights } from "./lights"; +import { Light } from "./light"; import { MediumLinearMotor } from "./mediumlinearmotor"; -import { MoveHubMediumLinearMotor } from "./MoveHubMediumLinearMotor"; +import { MoveHubMediumLinearMotor } from "./movehubmediumlinearmotor"; import { SimpleMediumLinearMotor } from "./simplemediumlinearmotor"; +import { TechnicLargeLinearMotor } from "./techniclargelinearmotor"; +import { TechnicXLargeLinearMotor } from "./technicxlargelinearmotor"; import { TrainMotor } from "./trainmotor"; import { isWebBluetooth } from "./utils"; @@ -34,13 +34,13 @@ export { DuploTrainBase, Consts, ColorDistanceSensor, - ControlPlusLargeMotor, - ControlPlusXLargeMotor, Device, - Lights, + Light, MediumLinearMotor, MoveHubMediumLinearMotor, SimpleMediumLinearMotor, + TechnicLargeLinearMotor, + TechnicXLargeLinearMotor, TrainMotor, isWebBluetooth }; diff --git a/src/lights.ts b/src/light.ts similarity index 90% rename from src/lights.ts rename to src/light.ts index 8386d82..fda7104 100644 --- a/src/lights.ts +++ b/src/light.ts @@ -4,11 +4,11 @@ import { WeDo2SmartHub } from "./wedo2smarthub"; import * as Consts from "./consts"; -export class Lights extends Device { +export class Light extends Device { constructor (hub: Hub, portId: number) { - super(hub, portId, Consts.DeviceType.LED_LIGHTS); + super(hub, portId, Consts.DeviceType.LIGHT); } diff --git a/src/lpf2hub.ts b/src/lpf2hub.ts index f1d330a..b573bb3 100644 --- a/src/lpf2hub.ts +++ b/src/lpf2hub.ts @@ -2,12 +2,12 @@ import { Device } from "./device"; import { Hub } from "./hub"; import { ColorDistanceSensor } from "./colordistancesensor"; -import { ControlPlusLargeMotor } from "./controlpluslargemotor"; -import { ControlPlusXLargeMotor } from "./controlplusxlargemotor"; -import { Lights } from "./lights"; +import { Light } from "./light"; import { MediumLinearMotor } from "./mediumlinearmotor"; -import { MoveHubMediumLinearMotor } from "./MoveHubMediumLinearMotor"; +import { MoveHubMediumLinearMotor } from "./movehubmediumlinearmotor"; import { SimpleMediumLinearMotor } from "./simplemediumlinearmotor"; +import { TechnicLargeLinearMotor } from "./techniclargelinearmotor"; +import { TechnicXLargeLinearMotor } from "./technicxlargelinearmotor"; import { TrainMotor } from "./trainmotor"; import * as Consts from "./consts"; @@ -289,8 +289,8 @@ export class LPF2Hub extends Hub { let device; switch (deviceType) { - case Consts.DeviceType.LED_LIGHTS: - device = new Lights(this, portId); + case Consts.DeviceType.LIGHT: + device = new Light(this, portId); break; case Consts.DeviceType.TRAIN_MOTOR: device = new TrainMotor(this, portId); @@ -304,11 +304,11 @@ export class LPF2Hub extends Hub { case Consts.DeviceType.MEDIUM_LINEAR_MOTOR: device = new MediumLinearMotor(this, portId); break; - case Consts.DeviceType.CONTROL_PLUS_LARGE_MOTOR: - device = new ControlPlusLargeMotor(this, portId); + case Consts.DeviceType.TECHNIC_LARGE_LINEAR_MOTOR: + device = new TechnicLargeLinearMotor(this, portId); break; - case Consts.DeviceType.CONTROL_PLUS_XLARGE_MOTOR: - device = new ControlPlusXLargeMotor(this, portId); + case Consts.DeviceType.TECHNIC_XLARGE_LINEAR_MOTOR: + device = new TechnicXLargeLinearMotor(this, portId); break; case Consts.DeviceType.COLOR_DISTANCE_SENSOR: device = new ColorDistanceSensor(this, portId); diff --git a/src/controlpluslargemotor.ts b/src/techniclargelinearmotor.ts similarity index 55% rename from src/controlpluslargemotor.ts rename to src/techniclargelinearmotor.ts index 8ba0567..5f65f08 100644 --- a/src/controlpluslargemotor.ts +++ b/src/techniclargelinearmotor.ts @@ -3,10 +3,10 @@ import { Hub } from "./hub"; import * as Consts from "./consts"; import { TachoMotor } from "./tachomotor"; -export class ControlPlusLargeMotor extends TachoMotor { +export class TechnicLargeLinearMotor extends TachoMotor { constructor (hub: Hub, portId: number) { - super(hub, portId, Consts.DeviceType.CONTROL_PLUS_LARGE_MOTOR); + super(hub, portId, Consts.DeviceType.TECHNIC_LARGE_LINEAR_MOTOR); } } diff --git a/src/controlplusxlargemotor.ts b/src/technicxlargelinearmotor.ts similarity index 55% rename from src/controlplusxlargemotor.ts rename to src/technicxlargelinearmotor.ts index c83bcde..4a24ccc 100644 --- a/src/controlplusxlargemotor.ts +++ b/src/technicxlargelinearmotor.ts @@ -3,10 +3,10 @@ import { Hub } from "./hub"; import * as Consts from "./consts"; import { TachoMotor } from "./tachomotor"; -export class ControlPlusXLargeMotor extends TachoMotor { +export class TechnicXLargeLinearMotor extends TachoMotor { constructor (hub: Hub, portId: number) { - super(hub, portId, Consts.DeviceType.CONTROL_PLUS_XLARGE_MOTOR); + super(hub, portId, Consts.DeviceType.TECHNIC_XLARGE_LINEAR_MOTOR); } } diff --git a/src/wedo2smarthub.ts b/src/wedo2smarthub.ts index 7eef844..dc81284 100644 --- a/src/wedo2smarthub.ts +++ b/src/wedo2smarthub.ts @@ -6,12 +6,12 @@ import { Device } from "./device"; import { Hub } from "./hub"; import { ColorDistanceSensor } from "./colordistancesensor"; -import { ControlPlusLargeMotor } from "./controlpluslargemotor"; -import { ControlPlusXLargeMotor } from "./controlplusxlargemotor"; -import { Lights } from "./lights"; +import { Light } from "./light"; import { MediumLinearMotor } from "./mediumlinearmotor"; -import { MoveHubMediumLinearMotor } from "./MoveHubMediumLinearMotor"; +import { MoveHubMediumLinearMotor } from "./movehubmediumlinearmotor"; import { SimpleMediumLinearMotor } from "./simplemediumlinearmotor"; +import { TechnicLargeLinearMotor } from "./techniclargelinearmotor"; +import { TechnicXLargeLinearMotor } from "./technicxlargelinearmotor"; import { TrainMotor } from "./trainmotor"; import * as Consts from "./consts"; @@ -281,8 +281,8 @@ export class WeDo2SmartHub extends Hub { let device; switch (deviceType) { - case Consts.DeviceType.LED_LIGHTS: - device = new Lights(this, portId); + case Consts.DeviceType.LIGHT: + device = new Light(this, portId); break; // case Consts.DeviceType.BOOST_TACHO_MOTOR: // device = new BoostTachoMotor(this, portId);