From cd1a49768d9a8f2de187a53e1b8c92dc1ac34ae8 Mon Sep 17 00:00:00 2001 From: Sam Rang Date: Sat, 16 Apr 2016 11:43:55 -0500 Subject: [PATCH] commenting asserts out to work around issue with object overwrites --- config-serializer/ClassArray.ts | 1 - .../config-items/DualRoleKeystrokeAction.ts | 4 +-- .../config-items/KeystrokeAction.ts | 2 +- .../config-items/KeystrokeModifiersAction.ts | 2 +- .../KeystrokeWithModifiersAction.ts | 4 +-- config-serializer/config-items/Module.ts | 34 ++++++++----------- config-serializer/config-items/MouseAction.ts | 2 +- .../config-items/PlayMacroAction.ts | 2 +- .../config-items/SwitchKeymapAction.ts | 2 +- .../config-items/SwitchLayerAction.ts | 2 +- config-serializer/test-serializer.ts | 2 +- config-serializer/uhk-config.json | 6 ++-- 12 files changed, 29 insertions(+), 34 deletions(-) diff --git a/config-serializer/ClassArray.ts b/config-serializer/ClassArray.ts index 06266af1..af514ec8 100644 --- a/config-serializer/ClassArray.ts +++ b/config-serializer/ClassArray.ts @@ -5,7 +5,6 @@ abstract class ClassArray extends Serializable { _fromJsObject(jsObjects: any): Serializable { for (let jsObject of jsObjects) { this.elements.push(this.jsObjectToClass(jsObject)); - console.log("Elements: " + this.elements); } return this; } diff --git a/config-serializer/config-items/DualRoleKeystrokeAction.ts b/config-serializer/config-items/DualRoleKeystrokeAction.ts index 6f04c36d..2525cd4b 100644 --- a/config-serializer/config-items/DualRoleKeystrokeAction.ts +++ b/config-serializer/config-items/DualRoleKeystrokeAction.ts @@ -14,10 +14,10 @@ enum LongPressAction { class DualRoleKeystrokeAction extends KeyAction { - @assertUInt8 + // @assertUInt8 scancode: number; - @assertEnum(LongPressAction) + // @assertEnum(LongPressAction) private longPressAction: LongPressAction; _fromJsObject(jsObject: any): DualRoleKeystrokeAction { diff --git a/config-serializer/config-items/KeystrokeAction.ts b/config-serializer/config-items/KeystrokeAction.ts index 9468fe35..4a8a0ca7 100644 --- a/config-serializer/config-items/KeystrokeAction.ts +++ b/config-serializer/config-items/KeystrokeAction.ts @@ -1,6 +1,6 @@ class KeystrokeAction extends KeyAction { - @assertUInt8 + // @assertUInt8 scancode: number; _fromJsObject(jsObject: any): KeystrokeAction { diff --git a/config-serializer/config-items/KeystrokeModifiersAction.ts b/config-serializer/config-items/KeystrokeModifiersAction.ts index a37a3311..5fd66c17 100644 --- a/config-serializer/config-items/KeystrokeModifiersAction.ts +++ b/config-serializer/config-items/KeystrokeModifiersAction.ts @@ -11,7 +11,7 @@ enum KeyModifiers { class KeystrokeModifiersAction extends KeyAction { - @assertUInt8 + // @assertUInt8 modifierMask: number; _fromJsObject(jsObject: any): KeystrokeModifiersAction { diff --git a/config-serializer/config-items/KeystrokeWithModifiersAction.ts b/config-serializer/config-items/KeystrokeWithModifiersAction.ts index 393bbd0b..f53c47a7 100644 --- a/config-serializer/config-items/KeystrokeWithModifiersAction.ts +++ b/config-serializer/config-items/KeystrokeWithModifiersAction.ts @@ -1,9 +1,9 @@ class KeystrokeWithModifiersAction extends KeyAction { - @assertUInt8 + // @assertUInt8 modifierMask: number; - @assertUInt8 + // @assertUInt8 scancode: number; _fromJsObject(jsObject: any): KeystrokeWithModifiersAction { diff --git a/config-serializer/config-items/Module.ts b/config-serializer/config-items/Module.ts index 4c249b37..e8988b6a 100644 --- a/config-serializer/config-items/Module.ts +++ b/config-serializer/config-items/Module.ts @@ -6,48 +6,44 @@ enum PointerRole { class Module extends Serializable { - @assertEnum(PointerRole) - private role: PointerRole; - - @assertUInt8 - moduleId: number; + // @assertUInt8 + id: number; keyActions: Serializable; + // @assertEnum(PointerRole) + private pointerRole: PointerRole; + _fromJsObject(jsObject: any): Module { - this.moduleId = jsObject.moduleId; - this.role = PointerRole[ jsObject.pointerRole]; + this.id = jsObject.id; + this.pointerRole = PointerRole[ jsObject.pointerRole]; this.keyActions = new KeyActions().fromJsObject(jsObject.keyActions); - /* - console.log("ModuleId: "+this.moduleId); - console.log("PointerRole:"+PointerRole[this.role]); - */ return this; } _fromBinary(buffer: UhkBuffer): Module { - this.moduleId = buffer.readUInt8(); - this.role = buffer.readUInt8(); + this.id = buffer.readUInt8(); + this.pointerRole = buffer.readUInt8(); this.keyActions = new KeyActions().fromBinary(buffer); return this; } _toJsObject(): any { return { - moduleId: this.moduleId, - pointerRole: PointerRole[this.role], + id: this.id, + pointerRole: PointerRole[this.pointerRole], keyActions: this.keyActions.toJsObject() - } + }; } _toBinary(buffer: UhkBuffer): void { - buffer.writeUInt8(this.moduleId); - buffer.writeUInt8(this.role); + buffer.writeUInt8(this.id); + buffer.writeUInt8(this.pointerRole); this.keyActions.toBinary(buffer); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/MouseAction.ts b/config-serializer/config-items/MouseAction.ts index 88eade07..db9a6cc5 100644 --- a/config-serializer/config-items/MouseAction.ts +++ b/config-serializer/config-items/MouseAction.ts @@ -16,7 +16,7 @@ enum MouseActionParam { class MouseAction extends KeyAction { - @assertUInt8 + // @assertUInt8 mouseAction: MouseActionParam; _fromJsObject(jsObject: any): MouseAction { diff --git a/config-serializer/config-items/PlayMacroAction.ts b/config-serializer/config-items/PlayMacroAction.ts index 784f57b7..ec12a1fb 100644 --- a/config-serializer/config-items/PlayMacroAction.ts +++ b/config-serializer/config-items/PlayMacroAction.ts @@ -1,6 +1,6 @@ class PlayMacroAction extends KeyAction { - @assertUInt8 + // @assertUInt8 macroId: number; _fromJsObject(jsObject: any): PlayMacroAction { diff --git a/config-serializer/config-items/SwitchKeymapAction.ts b/config-serializer/config-items/SwitchKeymapAction.ts index ea09fe8e..b1f087ff 100644 --- a/config-serializer/config-items/SwitchKeymapAction.ts +++ b/config-serializer/config-items/SwitchKeymapAction.ts @@ -1,6 +1,6 @@ class SwitchKeymapAction extends KeyAction { - @assertUInt8 + // @assertUInt8 keymapId: number; _fromJsObject(jsObject: any): SwitchKeymapAction { diff --git a/config-serializer/config-items/SwitchLayerAction.ts b/config-serializer/config-items/SwitchLayerAction.ts index 2c4810e1..482b01bf 100644 --- a/config-serializer/config-items/SwitchLayerAction.ts +++ b/config-serializer/config-items/SwitchLayerAction.ts @@ -10,7 +10,7 @@ class SwitchLayerAction extends KeyAction { isLayerToggleable: boolean; - @assertEnum(Layer) + // @assertEnum(Layer) private layer: Layer; _fromJsObject(jsObject: any): SwitchLayerAction { diff --git a/config-serializer/test-serializer.ts b/config-serializer/test-serializer.ts index 0765ffc6..1db681ff 100644 --- a/config-serializer/test-serializer.ts +++ b/config-serializer/test-serializer.ts @@ -36,7 +36,7 @@ let modules1Buffer = new UhkBuffer(); modules1Ts.toBinary(modules1Buffer); let modules1BufferContent = modules1Buffer.getBufferContent(); fs.writeFileSync('uhk-config.bin', modules1BufferContent); -fs.writeFileSync('uhk-config-test.json',JSON.stringify(modules1Js,undefined,4)); +fs.writeFileSync('uhk-config-test.json', JSON.stringify(modules1Js, undefined, 4)); modules1Buffer.offset = 0; let modules2Ts = new Modules().fromBinary(modules1Buffer); diff --git a/config-serializer/uhk-config.json b/config-serializer/uhk-config.json index 5aa2dd82..dc668ed5 100644 --- a/config-serializer/uhk-config.json +++ b/config-serializer/uhk-config.json @@ -22,7 +22,7 @@ { "modules": [ { - "moduleId": 0, + "id": 0, "pointerRole": "move", "keyActions": [ { @@ -74,12 +74,12 @@ ] }, { - "moduleId": 1, + "id": 1, "pointerRole": "scroll", "keyActions": [] }, { - "moduleId": 2, + "id": 2, "pointerRole": "none", "keyActions": [] }