Merge branch 'master' of github.com:UltimateHackingKeyboard/agent

Author: mondalaci

packages/uhk-agent/src/services/device.service.ts

@@ -14,10 +14,8 @@ import {
     convertBleStringToNumberArray,
     CurrentlyUpdatingModuleInfo,
     DeviceConnectionState,
-    disableAgentUpgradeProtection,
     findUhkModuleById,
     FIRMWARE_UPGRADE_METHODS,
-    FirmwareUpgradeFailReason,
     FirmwareUpgradeIpcResponse,
     getHardwareConfigFromDeviceResponse,
     getUserConfigFromDeviceResponse,
@@ -107,7 +105,6 @@ export class DeviceService {
     private _pollerAllowed: boolean;
     private _uhkDevicePolling: boolean;
     private _checkStatusBuffer: boolean;
-    private disableAgentUpgrade = false;
     private dongleZephyrLogService: ZephyrLogService;
     private leftHalfZephyrLogService: ZephyrLogService;
     private queueManager = new QueueManager();
@@ -123,8 +120,6 @@ export class DeviceService {
                 private options: CommandLineArgs,
                 private rootDir: string
     ) {
-        this.disableAgentUpgrade = disableAgentUpgradeProtection(this.options);
-
         this.dongleZephyrLogService =  new ZephyrLogService({
             cliArgs: this.options,
             currentDeviceFn: getCurrentUhkDongleHID,

packages/uhk-common/src/config-serializer/config-items/user-configuration.ts

@@ -180,11 +180,6 @@ export class UserConfiguration implements MouseSpeedConfiguration {
         this.userConfigMinorVersion = jsonObject.userConfigMinorVersion;
         this.userConfigPatchVersion = jsonObject.userConfigPatchVersion;
 
-        if (this.userConfigMajorVersion >= 13) {
-            this.lastSaveAgentTag  = jsonObject.lastSaveAgentTag ;
-            this.lastSaveFirmwareTag = jsonObject.lastSaveFirmwareTag;
-        }
-
         switch (this.userConfigMajorVersion) {
             case 1:
             case 2:
@@ -244,11 +239,6 @@ export class UserConfiguration implements MouseSpeedConfiguration {
         this.userConfigMinorVersion = buffer.readUInt16();
         this.userConfigPatchVersion = buffer.readUInt16();
 
-        if (this.userConfigMajorVersion >= 13) {
-            this.lastSaveAgentTag = buffer.readString();
-            this.lastSaveFirmwareTag = buffer.readString();
-        }
-
         switch (this.userConfigMajorVersion) {
             case 1:
             case 2:
@@ -415,8 +405,6 @@ export class UserConfiguration implements MouseSpeedConfiguration {
         buffer.writeUInt16(this.userConfigMajorVersion);
         buffer.writeUInt16(this.userConfigMinorVersion);
         buffer.writeUInt16(this.userConfigPatchVersion);
-        buffer.writeString(this.lastSaveAgentTag);
-        buffer.writeString(this.lastSaveFirmwareTag);
         buffer.writeUInt32(this.userConfigurationLength);
         buffer.writeString(this.deviceName);
         buffer.writeUInt16(this.doubleTapSwitchLayerTimeout);
@@ -476,6 +464,8 @@ export class UserConfiguration implements MouseSpeedConfiguration {
         buffer.writeArray(this.keymaps, (uhkBuffer: UhkBuffer, keymap: Keymap) => {
             keymap.toBinary(uhkBuffer, this.getSerialisationInfo(), this);
         });
+        buffer.writeString(this.lastSaveAgentTag);
+        buffer.writeString(this.lastSaveFirmwareTag);
     }
 
     toString(): string {
@@ -819,6 +809,12 @@ export class UserConfiguration implements MouseSpeedConfiguration {
             return macro;
         });
         this.keymaps = buffer.readArray<Keymap>(uhkBuffer => new Keymap().fromBinary(uhkBuffer, this.macros, serialisationInfo));
+
+        if (this.userConfigMajorVersion >= 13) {
+            this.lastSaveAgentTag = buffer.readString();
+            this.lastSaveFirmwareTag = buffer.readString();
+        }
+
         ConfigSerializer.resolveSwitchKeymapActions(this.keymaps);
 
     }
@@ -1096,6 +1092,11 @@ export class UserConfiguration implements MouseSpeedConfiguration {
         this.keymaps = jsonObject.keymaps.map((keymap: any) => {
             return new Keymap().fromJsonObject(keymap, this.macros, serialisationInfo);
         });
+
+        if (this.userConfigMajorVersion >= 13) {
+            this.lastSaveAgentTag  = jsonObject.lastSaveAgentTag ;
+            this.lastSaveFirmwareTag = jsonObject.lastSaveFirmwareTag;
+        }
     }
 
     private migrateToV5(): boolean {