updating references

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 `<HoldKeyAction scancode="${this.scancode}">`;
+        return `<HoldKeyMacroAction scancode="${this.scancode}">`;
     }
 }

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 `<HoldModifiersAction modifierMask="${this.modifierMask}">`;
+        return `<HoldModifiersMacroAction modifierMask="${this.modifierMask}">`;
     }
 }

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 `<HoldMouseButtonsAction mouseButtonsMask="${this.mouseButtonsMask}">`;
+        return `<HoldMouseButtonsMacroAction mouseButtonsMask="${this.mouseButtonsMask}">`;
     }
 }

config-serializer/config-items/MacroAction.ts

@@ -1,33 +1,33 @@
 enum MacroActionId {
-    PressKeyAction              =  0,
+    PressKeyMacroAction              =  0,
-    HoldKeyAction               =  1,
+    HoldKeyMacroAction               =  1,
-    ReleaseKeyAction            =  2,
+    ReleaseKeyMacroAction            =  2,
-    PressModifiersAction        =  3,
+    PressModifiersMacroAction        =  3,
-    HoldModifiersAction         =  4,
+    HoldModifiersMacroAction         =  4,
-    ReleaseModifiersAction      =  5,
+    ReleaseModifiersMacroAction      =  5,
-    PressMouseButtonsAction     =  6,
+    PressMouseButtonsMacroAction     =  6,
-    HoldMouseButtonsAction      =  7,
+    HoldMouseButtonsMacroAction      =  7,
-    ReleaseMouseButtonsAction   =  8,
+    ReleaseMouseButtonsMacroAction   =  8,
-    MoveMouseAction             =  9,
+    MoveMouseMacroAction             =  9,
-    ScrollMouseAction           = 10,
+    ScrollMouseMacroAction           = 10,
-    DelayAction                 = 11,
+    DelayMacroAction                 = 11,
-    TextAction                  = 12
+    TextMacroAction                  = 12
 }
 
 let macroActionType = {
-    PressKeyAction              : 'pressKey',
+    PressKeyMacroAction              : 'pressKey',
-    HoldKeyAction               : 'holdKey',
+    HoldKeyMacroAction               : 'holdKey',
-    ReleaseKeyAction            : 'releaseKey',
+    ReleaseKeyMacroAction            : 'releaseKey',
-    PressModifiersAction        : 'pressModifiers',
+    PressModifiersMacroAction        : 'pressModifiers',
-    HoldModifiersAction         : 'holdModifiers',
+    HoldModifiersMacroAction         : 'holdModifiers',
-    ReleaseModifiersAction      : 'releaseModifiers',
+    ReleaseModifiersMacroAction      : 'releaseModifiers',
-    PressMouseButtonsAction     : 'pressMouseButtons',
+    PressMouseButtonsMacroAction     : 'pressMouseButtons',
-    HoldMouseButtonsAction      : 'holdMouseButtons',
+    HoldMouseButtonsMacroAction      : 'holdMouseButtons',
-    ReleaseMouseButtonsAction   : 'releaseMouseButtons',
+    ReleaseMouseButtonsMacroAction   : 'releaseMouseButtons',
-    MoveMouseAction             : 'moveMouse',
+    MoveMouseMacroAction             : 'moveMouse',
-    ScrollMouseAction           : 'scrollMouse',
+    ScrollMouseMacroAction           : 'scrollMouse',
-    DelayAction                 : 'delay',
+    DelayMacroAction                 : 'delay',
-    TextAction                  : 'text'
+    TextMacroAction                  : 'text'
 };
 
 abstract class MacroAction extends Serializable<MacroAction> {

config-serializer/config-items/MacroActions.ts

@@ -2,28 +2,28 @@ class MacroActions extends ClassArray<MacroAction> {
 
     jsObjectToClass(jsObject: any): Serializable<MacroAction> {
         switch (jsObject.macroActionType) {
-            case macroActionType.PressKeyAction:
+            case macroActionType.PressKeyMacroAction:
-                return new PressKeyAction().fromJsObject(jsObject);
+                return new PressKeyMacroAction().fromJsObject(jsObject);
-            case macroActionType.HoldKeyAction:
+            case macroActionType.HoldKeyMacroAction:
-                return new HoldKeyAction().fromJsObject(jsObject);
+                return new HoldKeyMacroAction().fromJsObject(jsObject);
-            case macroActionType.ReleaseKeyAction:
+            case macroActionType.ReleaseKeyMacroAction:
-                return new ReleaseKeyAction().fromJsObject(jsObject);
+                return new ReleaseKeyMacroAction().fromJsObject(jsObject);
-            case macroActionType.PressModifiersAction:
+            case macroActionType.PressModifiersMacroAction:
-                return new PressModifiersAction().fromJsObject(jsObject);
+                return new PressModifiersMacroAction().fromJsObject(jsObject);
-            case macroActionType.HoldModifiersAction:
+            case macroActionType.HoldModifiersMacroAction:
-                return new HoldModifiersAction().fromJsObject(jsObject);
+                return new HoldModifiersMacroAction().fromJsObject(jsObject);
-            case macroActionType.ReleaseModifiersAction:
+            case macroActionType.ReleaseModifiersMacroAction:
-                return new ReleaseModifiersAction().fromJsObject(jsObject);
+                return new ReleaseModifiersMacroAction().fromJsObject(jsObject);
-            case macroActionType.PressMouseButtonsAction:
+            case macroActionType.PressMouseButtonsMacroAction:
-                return new PressMouseButtonsAction().fromJsObject(jsObject);
+                return new PressMouseButtonsMacroAction().fromJsObject(jsObject);
-            case macroActionType.HoldMouseButtonsAction:
+            case macroActionType.HoldMouseButtonsMacroAction:
-                return new HoldMouseButtonsAction().fromJsObject(jsObject);
+                return new HoldMouseButtonsMacroAction().fromJsObject(jsObject);
-            case macroActionType.ReleaseMouseButtonsAction:
+            case macroActionType.ReleaseMouseButtonsMacroAction:
-                return new ReleaseMouseButtonsAction().fromJsObject(jsObject);
+                return new ReleaseMouseButtonsMacroAction().fromJsObject(jsObject);
-            case macroActionType.MoveMouseAction:
+            case macroActionType.MoveMouseMacroAction:
-                return new MoveMouseAction().fromJsObject(jsObject);
+                return new MoveMouseMacroAction().fromJsObject(jsObject);
-            case macroActionType.ScrollMouseAction:
+            case macroActionType.ScrollMouseMacroAction:
-                return new ScrollMouseAction().fromJsObject(jsObject);
+                return new ScrollMouseMacroAction().fromJsObject(jsObject);
             default:
                 throw `Invalid MacroAction.macroActionType: "${jsObject.macroActionType}"`;
         }
@@ -39,28 +39,28 @@ class MacroActions extends ClassArray<MacroAction> {
         }
 
         switch (macroActionFirstByte) {
-            case MacroActionId.PressKeyAction:
+            case MacroActionId.PressKeyMacroAction:
-                return new PressKeyAction().fromBinary(buffer);
+                return new PressKeyMacroAction().fromBinary(buffer);
-            case MacroActionId.HoldKeyAction:
+            case MacroActionId.HoldKeyMacroAction:
-                return new HoldKeyAction().fromBinary(buffer);
+                return new HoldKeyMacroAction().fromBinary(buffer);
-            case MacroActionId.ReleaseKeyAction:
+            case MacroActionId.ReleaseKeyMacroAction:
-                return new ReleaseKeyAction().fromBinary(buffer);
+                return new ReleaseKeyMacroAction().fromBinary(buffer);
-            case MacroActionId.PressModifiersAction:
+            case MacroActionId.PressModifiersMacroAction:
-                return new PressModifiersAction().fromBinary(buffer);
+                return new PressModifiersMacroAction().fromBinary(buffer);
-            case MacroActionId.HoldModifiersAction:
+            case MacroActionId.HoldModifiersMacroAction:
-                return new HoldModifiersAction().fromBinary(buffer);
+                return new HoldModifiersMacroAction().fromBinary(buffer);
-            case MacroActionId.ReleaseModifiersAction:
+            case MacroActionId.ReleaseModifiersMacroAction:
-                return new ReleaseModifiersAction().fromBinary(buffer);
+                return new ReleaseModifiersMacroAction().fromBinary(buffer);
-            case MacroActionId.PressMouseButtonsAction:
+            case MacroActionId.PressMouseButtonsMacroAction:
-                return new PressMouseButtonsAction().fromBinary(buffer);
+                return new PressMouseButtonsMacroAction().fromBinary(buffer);
-            case MacroActionId.HoldMouseButtonsAction:
+            case MacroActionId.HoldMouseButtonsMacroAction:
-                return new HoldMouseButtonsAction().fromBinary(buffer);
+                return new HoldMouseButtonsMacroAction().fromBinary(buffer);
-            case MacroActionId.ReleaseMouseButtonsAction:
+            case MacroActionId.ReleaseMouseButtonsMacroAction:
-                return new ReleaseMouseButtonsAction().fromBinary(buffer);
+                return new ReleaseMouseButtonsMacroAction().fromBinary(buffer);
-            case MacroActionId.MoveMouseAction:
+            case MacroActionId.MoveMouseMacroAction:
-                return new MoveMouseAction().fromBinary(buffer);
+                return new MoveMouseMacroAction().fromBinary(buffer);
-            case MacroActionId.ScrollMouseAction:
+            case MacroActionId.ScrollMouseMacroAction:
-                return new ScrollMouseAction().fromBinary(buffer);
+                return new ScrollMouseMacroAction().fromBinary(buffer);
             default:
                 throw `Invalid MacroAction first byte: ${macroActionFirstByte}`;
         }

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 `<MoveMouseAction pos="(${this.x},${this.y})">`;
+        return `<MoveMouseMacroAction pos="(${this.x},${this.y})">`;
     }
 }

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 `<PressKeyAction scancode="${this.scancode}">`;
+        return `<PressKeyMacroAction scancode="${this.scancode}">`;
     }
 }

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 `<PressModifiersAction modifierMask="${this.modifierMask}">`;
+        return `<PressModifiersMacroAction modifierMask="${this.modifierMask}">`;
     }
 }

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 `<PressMouseButtonsAction mouseButtonsMask="${this.mouseButtonsMask}">`;
+        return `<PressMouseButtonsMacroAction mouseButtonsMask="${this.mouseButtonsMask}">`;
     }
 }

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 `<ReleaseKeyAction scancode="${this.scancode}">`;
+        return `<ReleaseKeyMacroAction scancode="${this.scancode}">`;
     }
 }

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 `<ReleaseModifiersAction modifierMask="${this.modifierMask}">`;
+        return `<ReleaseModifiersMacroAction modifierMask="${this.modifierMask}">`;
     }
 }

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 `<ReleaseMouseButtonsAction mouseButtonsMask="${this.mouseButtonsMask}">`;
+        return `<ReleaseMouseButtonsMacroAction mouseButtonsMask="${this.mouseButtonsMask}">`;
     }
 }

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 `<ScrollMouseAction pos="(${this.x},${this.y})">`;
+        return `<ScrollMouseMacroAction pos="(${this.x},${this.y})">`;
     }
 }

config-serializer/config-items/config-items.ts

@@ -17,14 +17,14 @@
 /// <reference path="KeyMaps.ts" />
 /// <reference path="MacroAction.ts" />
 /// <reference path="MacroActions.ts" />
-/// <reference path="PressKeyAction.ts" />
+/// <reference path="PressKeyMacroAction.ts" />
-/// <reference path="HoldKeyAction.ts" />
+/// <reference path="HoldKeyMacroAction.ts" />
-/// <reference path="ReleaseKeyAction.ts" />
+/// <reference path="ReleaseKeyMacroAction.ts" />
-/// <reference path="PressModifiersAction.ts" />
+/// <reference path="PressModifiersMacroAction.ts" />
-/// <reference path="HoldModifiersAction.ts" />
+/// <reference path="HoldModifiersMacroAction.ts" />
-/// <reference path="ReleaseModifiersAction.ts" />
+/// <reference path="ReleaseModifiersMacroAction.ts" />
-/// <reference path="PressMouseButtonsAction.ts" />
+/// <reference path="PressMouseButtonsMacroAction.ts" />
-/// <reference path="HoldMouseButtonsAction.ts" />
+/// <reference path="HoldMouseButtonsMacroAction.ts" />
-/// <reference path="ReleaseMouseButtonsAction.ts" />
+/// <reference path="ReleaseMouseButtonsMacroAction.ts" />
-/// <reference path="MoveMouseAction.ts" />
+/// <reference path="MoveMouseMacroAction.ts" />
-/// <reference path="ScrollMouseAction.ts" />
+/// <reference path="ScrollMouseMacroAction.ts" />

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"
                 }
             ]
         }