From 4dc3c4f6c3abcfe0c6ba0de7e043c84c24c09b32 Mon Sep 17 00:00:00 2001 From: Sam Rang Date: Sun, 17 Apr 2016 23:27:24 -0500 Subject: [PATCH] updating references --- .../config-items/HoldKeyMacroAction.ts | 12 +-- .../config-items/HoldModifiersMacroAction.ts | 12 +-- .../HoldMouseButtonsMacroAction.ts | 12 +-- config-serializer/config-items/MacroAction.ts | 52 +++++------ .../config-items/MacroActions.ts | 88 +++++++++---------- .../config-items/MoveMouseMacroAction.ts | 12 +-- .../config-items/PressKeyMacroAction.ts | 12 +-- .../config-items/PressModifiersMacroAction.ts | 12 +-- .../PressMouseButtonsMacroAction.ts | 12 +-- .../config-items/ReleaseKeyMacroAction.ts | 12 +-- .../ReleaseModifiersMacroAction.ts | 12 +-- .../ReleaseMouseButtonsMacroAction.ts | 12 +-- .../config-items/ScrollMouseMacroAction.ts | 12 +-- .../config-items/config-items.ts | 22 ++--- config-serializer/uhk-config.json | 8 -- 15 files changed, 147 insertions(+), 155 deletions(-) diff --git a/config-serializer/config-items/HoldKeyMacroAction.ts b/config-serializer/config-items/HoldKeyMacroAction.ts index ad2b4877..29b77f33 100644 --- a/config-serializer/config-items/HoldKeyMacroAction.ts +++ b/config-serializer/config-items/HoldKeyMacroAction.ts @@ -1,15 +1,15 @@ -class HoldKeyAction extends MacroAction { +class HoldKeyMacroAction extends MacroAction { // @assertUInt8 scancode: number; - _fromJsObject(jsObject: any): HoldKeyAction { + _fromJsObject(jsObject: any): HoldKeyMacroAction { this.assertMacroActionType(jsObject); this.scancode = jsObject.scancode; return this; } - _fromBinary(buffer: UhkBuffer): HoldKeyAction { + _fromBinary(buffer: UhkBuffer): HoldKeyMacroAction { this.readAndAssertMacroActionId(buffer); this.scancode = buffer.readUInt8(); return this; @@ -17,17 +17,17 @@ class HoldKeyAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.HoldKeyAction, + macroActionType: macroActionType.HoldKeyMacroAction, scancode: this.scancode }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.HoldKeyAction); + buffer.writeUInt8(MacroActionId.HoldKeyMacroAction); buffer.writeUInt8(this.scancode); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/HoldModifiersMacroAction.ts b/config-serializer/config-items/HoldModifiersMacroAction.ts index d91165a3..7671fe04 100644 --- a/config-serializer/config-items/HoldModifiersMacroAction.ts +++ b/config-serializer/config-items/HoldModifiersMacroAction.ts @@ -1,15 +1,15 @@ -class HoldModifiersAction extends MacroAction { +class HoldModifiersMacroAction extends MacroAction { // @assertUInt8 modifierMask: number; - _fromJsObject(jsObject: any): HoldModifiersAction { + _fromJsObject(jsObject: any): HoldModifiersMacroAction { this.assertMacroActionType(jsObject); this.modifierMask = jsObject.modifierMask; return this; } - _fromBinary(buffer: UhkBuffer): HoldModifiersAction { + _fromBinary(buffer: UhkBuffer): HoldModifiersMacroAction { this.readAndAssertMacroActionId(buffer); this.modifierMask = buffer.readUInt8(); return this; @@ -17,17 +17,17 @@ class HoldModifiersAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.HoldModifiersAction, + macroActionType: macroActionType.HoldModifiersMacroAction, modifierMask: this.modifierMask }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.HoldModifiersAction); + buffer.writeUInt8(MacroActionId.HoldModifiersMacroAction); buffer.writeUInt8(this.modifierMask); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/HoldMouseButtonsMacroAction.ts b/config-serializer/config-items/HoldMouseButtonsMacroAction.ts index 2dd4b247..129d129f 100644 --- a/config-serializer/config-items/HoldMouseButtonsMacroAction.ts +++ b/config-serializer/config-items/HoldMouseButtonsMacroAction.ts @@ -1,15 +1,15 @@ -class HoldMouseButtonsAction extends MacroAction { +class HoldMouseButtonsMacroAction extends MacroAction { // @assertUInt8 mouseButtonsMask: number; - _fromJsObject(jsObject: any): HoldMouseButtonsAction { + _fromJsObject(jsObject: any): HoldMouseButtonsMacroAction { this.assertMacroActionType(jsObject); this.mouseButtonsMask = jsObject.mouseButtonsMask; return this; } - _fromBinary(buffer: UhkBuffer): HoldMouseButtonsAction { + _fromBinary(buffer: UhkBuffer): HoldMouseButtonsMacroAction { this.readAndAssertMacroActionId(buffer); this.mouseButtonsMask = buffer.readUInt8(); return this; @@ -17,17 +17,17 @@ class HoldMouseButtonsAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.HoldMouseButtonsAction, + macroActionType: macroActionType.HoldMouseButtonsMacroAction, mouseButtonsMask: this.mouseButtonsMask }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.HoldMouseButtonsAction); + buffer.writeUInt8(MacroActionId.HoldMouseButtonsMacroAction); buffer.writeUInt8(this.mouseButtonsMask); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/MacroAction.ts b/config-serializer/config-items/MacroAction.ts index 930dada1..138ab47f 100644 --- a/config-serializer/config-items/MacroAction.ts +++ b/config-serializer/config-items/MacroAction.ts @@ -1,33 +1,33 @@ enum MacroActionId { - PressKeyAction = 0, - HoldKeyAction = 1, - ReleaseKeyAction = 2, - PressModifiersAction = 3, - HoldModifiersAction = 4, - ReleaseModifiersAction = 5, - PressMouseButtonsAction = 6, - HoldMouseButtonsAction = 7, - ReleaseMouseButtonsAction = 8, - MoveMouseAction = 9, - ScrollMouseAction = 10, - DelayAction = 11, - TextAction = 12 + PressKeyMacroAction = 0, + HoldKeyMacroAction = 1, + ReleaseKeyMacroAction = 2, + PressModifiersMacroAction = 3, + HoldModifiersMacroAction = 4, + ReleaseModifiersMacroAction = 5, + PressMouseButtonsMacroAction = 6, + HoldMouseButtonsMacroAction = 7, + ReleaseMouseButtonsMacroAction = 8, + MoveMouseMacroAction = 9, + ScrollMouseMacroAction = 10, + DelayMacroAction = 11, + TextMacroAction = 12 } let macroActionType = { - PressKeyAction : 'pressKey', - HoldKeyAction : 'holdKey', - ReleaseKeyAction : 'releaseKey', - PressModifiersAction : 'pressModifiers', - HoldModifiersAction : 'holdModifiers', - ReleaseModifiersAction : 'releaseModifiers', - PressMouseButtonsAction : 'pressMouseButtons', - HoldMouseButtonsAction : 'holdMouseButtons', - ReleaseMouseButtonsAction : 'releaseMouseButtons', - MoveMouseAction : 'moveMouse', - ScrollMouseAction : 'scrollMouse', - DelayAction : 'delay', - TextAction : 'text' + PressKeyMacroAction : 'pressKey', + HoldKeyMacroAction : 'holdKey', + ReleaseKeyMacroAction : 'releaseKey', + PressModifiersMacroAction : 'pressModifiers', + HoldModifiersMacroAction : 'holdModifiers', + ReleaseModifiersMacroAction : 'releaseModifiers', + PressMouseButtonsMacroAction : 'pressMouseButtons', + HoldMouseButtonsMacroAction : 'holdMouseButtons', + ReleaseMouseButtonsMacroAction : 'releaseMouseButtons', + MoveMouseMacroAction : 'moveMouse', + ScrollMouseMacroAction : 'scrollMouse', + DelayMacroAction : 'delay', + TextMacroAction : 'text' }; abstract class MacroAction extends Serializable { diff --git a/config-serializer/config-items/MacroActions.ts b/config-serializer/config-items/MacroActions.ts index 5d9209f0..fc16280d 100644 --- a/config-serializer/config-items/MacroActions.ts +++ b/config-serializer/config-items/MacroActions.ts @@ -2,28 +2,28 @@ class MacroActions extends ClassArray { jsObjectToClass(jsObject: any): Serializable { switch (jsObject.macroActionType) { - case macroActionType.PressKeyAction: - return new PressKeyAction().fromJsObject(jsObject); - case macroActionType.HoldKeyAction: - return new HoldKeyAction().fromJsObject(jsObject); - case macroActionType.ReleaseKeyAction: - return new ReleaseKeyAction().fromJsObject(jsObject); - case macroActionType.PressModifiersAction: - return new PressModifiersAction().fromJsObject(jsObject); - case macroActionType.HoldModifiersAction: - return new HoldModifiersAction().fromJsObject(jsObject); - case macroActionType.ReleaseModifiersAction: - return new ReleaseModifiersAction().fromJsObject(jsObject); - case macroActionType.PressMouseButtonsAction: - return new PressMouseButtonsAction().fromJsObject(jsObject); - case macroActionType.HoldMouseButtonsAction: - return new HoldMouseButtonsAction().fromJsObject(jsObject); - case macroActionType.ReleaseMouseButtonsAction: - return new ReleaseMouseButtonsAction().fromJsObject(jsObject); - case macroActionType.MoveMouseAction: - return new MoveMouseAction().fromJsObject(jsObject); - case macroActionType.ScrollMouseAction: - return new ScrollMouseAction().fromJsObject(jsObject); + case macroActionType.PressKeyMacroAction: + return new PressKeyMacroAction().fromJsObject(jsObject); + case macroActionType.HoldKeyMacroAction: + return new HoldKeyMacroAction().fromJsObject(jsObject); + case macroActionType.ReleaseKeyMacroAction: + return new ReleaseKeyMacroAction().fromJsObject(jsObject); + case macroActionType.PressModifiersMacroAction: + return new PressModifiersMacroAction().fromJsObject(jsObject); + case macroActionType.HoldModifiersMacroAction: + return new HoldModifiersMacroAction().fromJsObject(jsObject); + case macroActionType.ReleaseModifiersMacroAction: + return new ReleaseModifiersMacroAction().fromJsObject(jsObject); + case macroActionType.PressMouseButtonsMacroAction: + return new PressMouseButtonsMacroAction().fromJsObject(jsObject); + case macroActionType.HoldMouseButtonsMacroAction: + return new HoldMouseButtonsMacroAction().fromJsObject(jsObject); + case macroActionType.ReleaseMouseButtonsMacroAction: + return new ReleaseMouseButtonsMacroAction().fromJsObject(jsObject); + case macroActionType.MoveMouseMacroAction: + return new MoveMouseMacroAction().fromJsObject(jsObject); + case macroActionType.ScrollMouseMacroAction: + return new ScrollMouseMacroAction().fromJsObject(jsObject); default: throw `Invalid MacroAction.macroActionType: "${jsObject.macroActionType}"`; } @@ -39,28 +39,28 @@ class MacroActions extends ClassArray { } switch (macroActionFirstByte) { - case MacroActionId.PressKeyAction: - return new PressKeyAction().fromBinary(buffer); - case MacroActionId.HoldKeyAction: - return new HoldKeyAction().fromBinary(buffer); - case MacroActionId.ReleaseKeyAction: - return new ReleaseKeyAction().fromBinary(buffer); - case MacroActionId.PressModifiersAction: - return new PressModifiersAction().fromBinary(buffer); - case MacroActionId.HoldModifiersAction: - return new HoldModifiersAction().fromBinary(buffer); - case MacroActionId.ReleaseModifiersAction: - return new ReleaseModifiersAction().fromBinary(buffer); - case MacroActionId.PressMouseButtonsAction: - return new PressMouseButtonsAction().fromBinary(buffer); - case MacroActionId.HoldMouseButtonsAction: - return new HoldMouseButtonsAction().fromBinary(buffer); - case MacroActionId.ReleaseMouseButtonsAction: - return new ReleaseMouseButtonsAction().fromBinary(buffer); - case MacroActionId.MoveMouseAction: - return new MoveMouseAction().fromBinary(buffer); - case MacroActionId.ScrollMouseAction: - return new ScrollMouseAction().fromBinary(buffer); + case MacroActionId.PressKeyMacroAction: + return new PressKeyMacroAction().fromBinary(buffer); + case MacroActionId.HoldKeyMacroAction: + return new HoldKeyMacroAction().fromBinary(buffer); + case MacroActionId.ReleaseKeyMacroAction: + return new ReleaseKeyMacroAction().fromBinary(buffer); + case MacroActionId.PressModifiersMacroAction: + return new PressModifiersMacroAction().fromBinary(buffer); + case MacroActionId.HoldModifiersMacroAction: + return new HoldModifiersMacroAction().fromBinary(buffer); + case MacroActionId.ReleaseModifiersMacroAction: + return new ReleaseModifiersMacroAction().fromBinary(buffer); + case MacroActionId.PressMouseButtonsMacroAction: + return new PressMouseButtonsMacroAction().fromBinary(buffer); + case MacroActionId.HoldMouseButtonsMacroAction: + return new HoldMouseButtonsMacroAction().fromBinary(buffer); + case MacroActionId.ReleaseMouseButtonsMacroAction: + return new ReleaseMouseButtonsMacroAction().fromBinary(buffer); + case MacroActionId.MoveMouseMacroAction: + return new MoveMouseMacroAction().fromBinary(buffer); + case MacroActionId.ScrollMouseMacroAction: + return new ScrollMouseMacroAction().fromBinary(buffer); default: throw `Invalid MacroAction first byte: ${macroActionFirstByte}`; } diff --git a/config-serializer/config-items/MoveMouseMacroAction.ts b/config-serializer/config-items/MoveMouseMacroAction.ts index 197e494f..22d229a7 100644 --- a/config-serializer/config-items/MoveMouseMacroAction.ts +++ b/config-serializer/config-items/MoveMouseMacroAction.ts @@ -1,4 +1,4 @@ -class MoveMouseAction extends MacroAction { +class MoveMouseMacroAction extends MacroAction { // @assertInt16 x: number; @@ -6,14 +6,14 @@ class MoveMouseAction extends MacroAction { // @assertInt16 y: number; - _fromJsObject(jsObject: any): MoveMouseAction { + _fromJsObject(jsObject: any): MoveMouseMacroAction { this.assertMacroActionType(jsObject); this.x = jsObject.x; this.y = jsObject.y; return this; } - _fromBinary(buffer: UhkBuffer): MoveMouseAction { + _fromBinary(buffer: UhkBuffer): MoveMouseMacroAction { this.readAndAssertMacroActionId(buffer); this.x = buffer.readInt16(); this.y = buffer.readInt16(); @@ -22,19 +22,19 @@ class MoveMouseAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.MoveMouseAction, + macroActionType: macroActionType.MoveMouseMacroAction, x: this.x, y: this.y }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.MoveMouseAction); + buffer.writeUInt8(MacroActionId.MoveMouseMacroAction); buffer.writeInt16(this.x); buffer.writeInt16(this.y); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/PressKeyMacroAction.ts b/config-serializer/config-items/PressKeyMacroAction.ts index 456b4bbb..d73f7c2c 100644 --- a/config-serializer/config-items/PressKeyMacroAction.ts +++ b/config-serializer/config-items/PressKeyMacroAction.ts @@ -1,15 +1,15 @@ -class PressKeyAction extends MacroAction { +class PressKeyMacroAction extends MacroAction { // @assertUInt8 scancode: number; - _fromJsObject(jsObject: any): PressKeyAction { + _fromJsObject(jsObject: any): PressKeyMacroAction { this.assertMacroActionType(jsObject); this.scancode = jsObject.scancode; return this; } - _fromBinary(buffer: UhkBuffer): PressKeyAction { + _fromBinary(buffer: UhkBuffer): PressKeyMacroAction { this.readAndAssertMacroActionId(buffer); this.scancode = buffer.readUInt8(); return this; @@ -17,17 +17,17 @@ class PressKeyAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.PressKeyAction, + macroActionType: macroActionType.PressKeyMacroAction, scancode: this.scancode }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.PressKeyAction); + buffer.writeUInt8(MacroActionId.PressKeyMacroAction); buffer.writeUInt8(this.scancode); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/PressModifiersMacroAction.ts b/config-serializer/config-items/PressModifiersMacroAction.ts index 59f7e4a2..cc42fe37 100644 --- a/config-serializer/config-items/PressModifiersMacroAction.ts +++ b/config-serializer/config-items/PressModifiersMacroAction.ts @@ -1,15 +1,15 @@ -class PressModifiersAction extends MacroAction { +class PressModifiersMacroAction extends MacroAction { // @assertUInt8 modifierMask: number; - _fromJsObject(jsObject: any): PressModifiersAction { + _fromJsObject(jsObject: any): PressModifiersMacroAction { this.assertMacroActionType(jsObject); this.modifierMask = jsObject.modifierMask; return this; } - _fromBinary(buffer: UhkBuffer): PressModifiersAction { + _fromBinary(buffer: UhkBuffer): PressModifiersMacroAction { this.readAndAssertMacroActionId(buffer); this.modifierMask = buffer.readUInt8(); return this; @@ -17,17 +17,17 @@ class PressModifiersAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.PressModifiersAction, + macroActionType: macroActionType.PressModifiersMacroAction, modifierMask: this.modifierMask }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.PressModifiersAction); + buffer.writeUInt8(MacroActionId.PressModifiersMacroAction); buffer.writeUInt8(this.modifierMask); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/PressMouseButtonsMacroAction.ts b/config-serializer/config-items/PressMouseButtonsMacroAction.ts index 35853c07..aa2593bc 100644 --- a/config-serializer/config-items/PressMouseButtonsMacroAction.ts +++ b/config-serializer/config-items/PressMouseButtonsMacroAction.ts @@ -1,15 +1,15 @@ -class PressMouseButtonsAction extends MacroAction { +class PressMouseButtonsMacroAction extends MacroAction { // @assertUInt8 mouseButtonsMask: number; - _fromJsObject(jsObject: any): PressMouseButtonsAction { + _fromJsObject(jsObject: any): PressMouseButtonsMacroAction { this.assertMacroActionType(jsObject); this.mouseButtonsMask = jsObject.mouseButtonsMask; return this; } - _fromBinary(buffer: UhkBuffer): PressMouseButtonsAction { + _fromBinary(buffer: UhkBuffer): PressMouseButtonsMacroAction { this.readAndAssertMacroActionId(buffer); this.mouseButtonsMask = buffer.readUInt8(); return this; @@ -17,17 +17,17 @@ class PressMouseButtonsAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.PressMouseButtonsAction, + macroActionType: macroActionType.PressMouseButtonsMacroAction, mouseButtonsMask: this.mouseButtonsMask }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.PressMouseButtonsAction); + buffer.writeUInt8(MacroActionId.PressMouseButtonsMacroAction); buffer.writeUInt8(this.mouseButtonsMask); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/ReleaseKeyMacroAction.ts b/config-serializer/config-items/ReleaseKeyMacroAction.ts index 1d20aaa3..7648ac3e 100644 --- a/config-serializer/config-items/ReleaseKeyMacroAction.ts +++ b/config-serializer/config-items/ReleaseKeyMacroAction.ts @@ -1,15 +1,15 @@ -class ReleaseKeyAction extends MacroAction { +class ReleaseKeyMacroAction extends MacroAction { // @assertUInt8 scancode: number; - _fromJsObject(jsObject: any): ReleaseKeyAction { + _fromJsObject(jsObject: any): ReleaseKeyMacroAction { this.assertMacroActionType(jsObject); this.scancode = jsObject.scancode; return this; } - _fromBinary(buffer: UhkBuffer): ReleaseKeyAction { + _fromBinary(buffer: UhkBuffer): ReleaseKeyMacroAction { this.readAndAssertMacroActionId(buffer); this.scancode = buffer.readUInt8(); return this; @@ -17,17 +17,17 @@ class ReleaseKeyAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.ReleaseKeyAction, + macroActionType: macroActionType.ReleaseKeyMacroAction, scancode: this.scancode }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.ReleaseKeyAction); + buffer.writeUInt8(MacroActionId.ReleaseKeyMacroAction); buffer.writeUInt8(this.scancode); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/ReleaseModifiersMacroAction.ts b/config-serializer/config-items/ReleaseModifiersMacroAction.ts index cd0c6f13..5586fe5c 100644 --- a/config-serializer/config-items/ReleaseModifiersMacroAction.ts +++ b/config-serializer/config-items/ReleaseModifiersMacroAction.ts @@ -1,15 +1,15 @@ -class ReleaseModifiersAction extends MacroAction { +class ReleaseModifiersMacroAction extends MacroAction { // @assertUInt8 modifierMask: number; - _fromJsObject(jsObject: any): ReleaseModifiersAction { + _fromJsObject(jsObject: any): ReleaseModifiersMacroAction { this.assertMacroActionType(jsObject); this.modifierMask = jsObject.modifierMask; return this; } - _fromBinary(buffer: UhkBuffer): ReleaseModifiersAction { + _fromBinary(buffer: UhkBuffer): ReleaseModifiersMacroAction { this.readAndAssertMacroActionId(buffer); this.modifierMask = buffer.readUInt8(); return this; @@ -17,17 +17,17 @@ class ReleaseModifiersAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.ReleaseModifiersAction, + macroActionType: macroActionType.ReleaseModifiersMacroAction, modifierMask: this.modifierMask }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.ReleaseModifiersAction); + buffer.writeUInt8(MacroActionId.ReleaseModifiersMacroAction); buffer.writeUInt8(this.modifierMask); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts b/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts index c77caf33..52a897b3 100644 --- a/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts +++ b/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts @@ -1,15 +1,15 @@ -class ReleaseMouseButtonsAction extends MacroAction { +class ReleaseMouseButtonsMacroAction extends MacroAction { // @assertUInt8 mouseButtonsMask: number; - _fromJsObject(jsObject: any): ReleaseMouseButtonsAction { + _fromJsObject(jsObject: any): ReleaseMouseButtonsMacroAction { this.assertMacroActionType(jsObject); this.mouseButtonsMask = jsObject.mouseButtonsMask; return this; } - _fromBinary(buffer: UhkBuffer): ReleaseMouseButtonsAction { + _fromBinary(buffer: UhkBuffer): ReleaseMouseButtonsMacroAction { this.readAndAssertMacroActionId(buffer); this.mouseButtonsMask = buffer.readUInt8(); return this; @@ -17,17 +17,17 @@ class ReleaseMouseButtonsAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.ReleaseMouseButtonsAction, + macroActionType: macroActionType.ReleaseMouseButtonsMacroAction, mouseButtonsMask: this.mouseButtonsMask }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.ReleaseMouseButtonsAction); + buffer.writeUInt8(MacroActionId.ReleaseMouseButtonsMacroAction); buffer.writeUInt8(this.mouseButtonsMask); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/ScrollMouseMacroAction.ts b/config-serializer/config-items/ScrollMouseMacroAction.ts index d2e78d9a..30e754b2 100644 --- a/config-serializer/config-items/ScrollMouseMacroAction.ts +++ b/config-serializer/config-items/ScrollMouseMacroAction.ts @@ -1,4 +1,4 @@ -class ScrollMouseAction extends MacroAction { +class ScrollMouseMacroAction extends MacroAction { // @assertInt16 x: number; @@ -6,14 +6,14 @@ class ScrollMouseAction extends MacroAction { // @assertInt16 y: number; - _fromJsObject(jsObject: any): ScrollMouseAction { + _fromJsObject(jsObject: any): ScrollMouseMacroAction { this.assertMacroActionType(jsObject); this.x = jsObject.x; this.y = jsObject.y; return this; } - _fromBinary(buffer: UhkBuffer): ScrollMouseAction { + _fromBinary(buffer: UhkBuffer): ScrollMouseMacroAction { this.readAndAssertMacroActionId(buffer); this.x = buffer.readInt16(); this.y = buffer.readInt16(); @@ -22,19 +22,19 @@ class ScrollMouseAction extends MacroAction { _toJsObject(): any { return { - macroActionType: macroActionType.ScrollMouseAction, + macroActionType: macroActionType.ScrollMouseMacroAction, x: this.x, y: this.y }; } _toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(MacroActionId.ScrollMouseAction); + buffer.writeUInt8(MacroActionId.ScrollMouseMacroAction); buffer.writeInt16(this.x); buffer.writeInt16(this.y); } toString(): string { - return ``; + return ``; } } diff --git a/config-serializer/config-items/config-items.ts b/config-serializer/config-items/config-items.ts index 9aa3a9e9..d4cc9dc3 100644 --- a/config-serializer/config-items/config-items.ts +++ b/config-serializer/config-items/config-items.ts @@ -17,14 +17,14 @@ /// /// /// -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// +/// diff --git a/config-serializer/uhk-config.json b/config-serializer/uhk-config.json index 778e9354..b6d792fc 100644 --- a/config-serializer/uhk-config.json +++ b/config-serializer/uhk-config.json @@ -244,14 +244,6 @@ "macroActionType": "scrollMouse", "x": 0, "y": 20000 - }, - { - "macroActionType": "delay", - "delay": 40000 - }, - { - "macroActionType": "text", - "text": "this is a text" } ] }