Merge pull request #35 from srang/feature/bool_isolation

use full byte for each bool

config-serializer/UhkBuffer.ts

@@ -143,6 +143,14 @@ class UhkBuffer {
         this.offset += stringByteLength;
     }
 
+    readBoolean(): boolean {
+        return this.readUInt8() !== 0;
+    }
+
+    writeBoolean(bool: boolean) {
+        this.writeUInt8(bool ? 1 : 0);
+    }
+
     backtrack(): void {
         this.offset -= this.bytesToBacktrack;
         this.bytesToBacktrack = 0;

config-serializer/config-items/KeyMap.ts

@@ -1,7 +1,5 @@
 class KeyMap extends Serializable<KeyMap> {
 
-    static defaultFlag = 0x80;
-
     // @assertUInt8
     id: number;
 
@@ -23,10 +21,8 @@ class KeyMap extends Serializable<KeyMap> {
     }
 
     _fromBinary(buffer: UhkBuffer): KeyMap {
-        let map = buffer.readUInt8();
+        this.id = buffer.readUInt8();
-        /* saves almost a byte but limits number of keymaps... */
+        this.isDefault = buffer.readBoolean();
-        this.isDefault = (map & KeyMap.defaultFlag) !== 0;
-        this.id = map & ~KeyMap.defaultFlag; // Clear isDefault bit.;
         this.abbreviation = buffer.readString();
         this.name = buffer.readString();
         this.layers = new Layers().fromBinary(buffer);
@@ -44,7 +40,8 @@ class KeyMap extends Serializable<KeyMap> {
     }
 
     _toBinary(buffer: UhkBuffer): void {
-        buffer.writeUInt8(this.id | this.getDefaultFlag());
+        buffer.writeUInt8(this.id);
+        buffer.writeBoolean(this.isDefault);
         buffer.writeString(this.abbreviation);
         buffer.writeString(this.name);
         this.layers.toBinary(buffer);
@@ -53,8 +50,4 @@ class KeyMap extends Serializable<KeyMap> {
     toString(): string {
         return `<KeyMap id="${this.id}" name="${this.name}">`;
     }
-
-    private getDefaultFlag() {
-        return this.isDefault ? KeyMap.defaultFlag : 0;
-    }
 }

config-serializer/config-items/Macro.ts

@@ -1,8 +1,5 @@
 class Macro extends Serializable<Macro> {
 
-    static loopedFlag  = 0x80;
-    static privateFlag = 0x08;
-
     // @assertUInt8
     id: number;
 
@@ -25,10 +22,8 @@ class Macro extends Serializable<Macro> {
 
     _fromBinary(buffer: UhkBuffer): Macro {
         this.id = buffer.readUInt8();
-        let bools = buffer.readUInt8();
+        this.isLooped = buffer.readBoolean();
-        /* saves almost a byte but limits number of keymaps... */
+        this.isPrivate = buffer.readBoolean();
-        this.isLooped = (bools & Macro.loopedFlag) !== 0;
-        this.isPrivate = (bools & Macro.privateFlag) !== 0;
         this.name = buffer.readString();
         this.macroActions = new MacroActions().fromBinary(buffer);
         return this;
@@ -46,7 +41,8 @@ class Macro extends Serializable<Macro> {
 
     _toBinary(buffer: UhkBuffer): void {
         buffer.writeUInt8(this.id);
-        buffer.writeUInt8(this.getLoopedFlag() | this.getPrivateFlag());
+        buffer.writeBoolean(this.isLooped);
+        buffer.writeBoolean(this.isPrivate);
         buffer.writeString(this.name);
         this.macroActions.toBinary(buffer);
     }
@@ -54,12 +50,4 @@ class Macro extends Serializable<Macro> {
     toString(): string {
         return `<Macro id="${this.id}" name="${this.name}">`;
     }
-
-    private getLoopedFlag() {
-        return this.isLooped ? Macro.loopedFlag : 0;
-    }
-
-    private getPrivateFlag() {
-        return this.isPrivate ? Macro.privateFlag : 0;
-    }
 }

config-serializer/config-items/SwitchLayerAction.ts

@@ -6,8 +6,6 @@ enum LayerName {
 
 class SwitchLayerAction extends KeyAction {
 
-    static toggleFlag = 0x80;
-
     isLayerToggleable: boolean;
 
     // @assertEnum(LayerName)
@@ -22,9 +20,8 @@ class SwitchLayerAction extends KeyAction {
 
     _fromBinary(buffer: UhkBuffer): SwitchLayerAction {
         this.readAndAssertKeyActionId(buffer);
-        let layer = buffer.readUInt8();
+        this.layer = buffer.readUInt8();
-        this.isLayerToggleable = (layer & SwitchLayerAction.toggleFlag) !== 0;
+        this.isLayerToggleable = buffer.readBoolean();
-        this.layer = layer & ~SwitchLayerAction.toggleFlag; // Clear toggle bit.
         return this;
     }
 
@@ -38,14 +35,11 @@ class SwitchLayerAction extends KeyAction {
 
     _toBinary(buffer: UhkBuffer) {
         buffer.writeUInt8(KeyActionId.SwitchLayerAction);
-        buffer.writeUInt8(this.layer | this.getToggleFlag());
+        buffer.writeUInt8(this.layer);
+        buffer.writeBoolean(this.isLayerToggleable);
     }
 
     toString(): string {
         return `<SwitchLayerAction layer="${this.layer}" toggle="${this.isLayerToggleable}">`;
     }
-
-    private getToggleFlag() {
-        return this.isLayerToggleable ? SwitchLayerAction.toggleFlag : 0;
-    }
 }