From 36c34a9743e0f74a733a92e85b877bae3e5ee83a Mon Sep 17 00:00:00 2001
From: Nathan Kellenicki <nathan.kellenicki@sony.com>
Date: Tue, 17 Dec 2019 14:29:14 -0800
Subject: [PATCH] Exported device ModeMap

---
 src/devices/colordistancesensor.ts | 14 +++++++++-----
 src/devices/motionsensor.ts        | 10 +++++++---
 src/devices/tachomotor.ts          | 10 +++++++---
 src/devices/tiltsensor.ts          | 10 +++++++---
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/devices/colordistancesensor.ts b/src/devices/colordistancesensor.ts
index 3ef43d2..cbf5de8 100644
--- a/src/devices/colordistancesensor.ts
+++ b/src/devices/colordistancesensor.ts
@@ -7,11 +7,7 @@ import * as Consts from "../consts";
 export class ColorDistanceSensor extends Device {
 
     constructor (hub: IDeviceInterface, portId: number) {
-        super(hub, portId, {
-            "color": ColorDistanceSensor.Mode.COLOR,
-            "distance": ColorDistanceSensor.Mode.DISTANCE,
-            "colorAndDistance": ColorDistanceSensor.Mode.COLOR_AND_DISTANCE
-        }, Consts.DeviceType.COLOR_DISTANCE_SENSOR);
+        super(hub, portId, ColorDistanceSensor.ModeMap, Consts.DeviceType.COLOR_DISTANCE_SENSOR);
     }
 
     public receive (message: Buffer) {
@@ -82,9 +78,17 @@ export class ColorDistanceSensor extends Device {
 }
 
 export namespace ColorDistanceSensor {
+
     export enum Mode {
         COLOR = 0x00,
         DISTANCE = 0x01,
         COLOR_AND_DISTANCE = 0x08
     }
+
+    export const ModeMap: {[event: string]: number} = {
+        "color": ColorDistanceSensor.Mode.COLOR,
+        "distance": ColorDistanceSensor.Mode.DISTANCE,
+        "colorAndDistance": ColorDistanceSensor.Mode.COLOR_AND_DISTANCE
+    }
+
 }
\ No newline at end of file
diff --git a/src/devices/motionsensor.ts b/src/devices/motionsensor.ts
index 611e1d9..6d547ba 100644
--- a/src/devices/motionsensor.ts
+++ b/src/devices/motionsensor.ts
@@ -7,9 +7,7 @@ import * as Consts from "../consts";
 export class MotionSensor extends Device {
 
     constructor (hub: IDeviceInterface, portId: number) {
-        super(hub, portId, {
-            "distance": MotionSensor.Mode.DISTANCE
-        }, Consts.DeviceType.MOTION_SENSOR);
+        super(hub, portId, MotionSensor.ModeMap, Consts.DeviceType.MOTION_SENSOR);
     }
 
     public receive (message: Buffer) {
@@ -34,7 +32,13 @@ export class MotionSensor extends Device {
 }
 
 export namespace MotionSensor {
+
     export enum Mode {
         DISTANCE = 0x00
     }
+
+    export const ModeMap: {[event: string]: number} = {
+        "distance": MotionSensor.Mode.DISTANCE
+    }
+
 }
\ No newline at end of file
diff --git a/src/devices/tachomotor.ts b/src/devices/tachomotor.ts
index a448bed..5f0aff3 100644
--- a/src/devices/tachomotor.ts
+++ b/src/devices/tachomotor.ts
@@ -8,9 +8,7 @@ import { mapSpeed } from "../utils";
 export class TachoMotor extends BasicMotor {
 
     constructor (hub: IDeviceInterface, portId: number, modeMap: {[event: string]: number} = {}, type: Consts.DeviceType = Consts.DeviceType.UNKNOWN) {
-        super(hub, portId, Object.assign({}, modeMap, {
-            "rotate": TachoMotor.Mode.ROTATION
-        }), type);
+        super(hub, portId, Object.assign({}, modeMap, TachoMotor.ModeMap), type);
     }
 
     public receive (message: Buffer) {
@@ -54,7 +52,13 @@ export class TachoMotor extends BasicMotor {
 }
 
 export namespace TachoMotor {
+
     export enum Mode {
         ROTATION = 0x02
     }
+
+    export const ModeMap: {[event: string]: number} = {
+        "rotate": TachoMotor.Mode.ROTATION
+    }
+
 }
\ No newline at end of file
diff --git a/src/devices/tiltsensor.ts b/src/devices/tiltsensor.ts
index 7fcfd7a..7e9e45d 100644
--- a/src/devices/tiltsensor.ts
+++ b/src/devices/tiltsensor.ts
@@ -7,9 +7,7 @@ import * as Consts from "../consts";
 export class TiltSensor extends Device {
 
     constructor (hub: IDeviceInterface, portId: number) {
-        super(hub, portId, {
-            "tilt": TiltSensor.Mode.TILT
-        }, Consts.DeviceType.TILT_SENSOR);
+        super(hub, portId, TiltSensor.ModeMap, Consts.DeviceType.TILT_SENSOR);
     }
 
     public receive (message: Buffer) {
@@ -33,7 +31,13 @@ export class TiltSensor extends Device {
 }
 
 export namespace TiltSensor {
+
     export enum Mode {
         TILT = 0x00
     }
+
+    export const ModeMap: {[event: string]: number} = {
+        "tilt": TiltSensor.Mode.TILT
+    }
+    
 }
\ No newline at end of file