chore: bump user config version to 12.0.0

ert78gb · ert78gb · commit 9a3b3863d8d5 · 2025-07-07T22:45:26.000+02:00
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "version": "7.0.1",
   "firmwareVersion": "14.0.1",
   "deviceProtocolVersion": "4.15.0",
-  "userConfigVersion": "11.1.0",
+  "userConfigVersion": "12.0.0",
   "hardwareConfigVersion": "1.0.0",
   "description": "Agent is the configuration application of the Ultimate Hacking Keyboard.",
   "repository": {
diff --git a/packages/uhk-common/src/config-serializer/config-items/host-connection.ts b/packages/uhk-common/src/config-serializer/config-items/host-connection.ts
@@ -73,6 +73,7 @@ export class HostConnection {
 
             case 9:
             case 11:
+            case 12:
                 return this.fromJsonObjectV9(jsonObject, serialisationInfo);
 
             default:
@@ -87,6 +88,7 @@ export class HostConnection {
 
             case 9:
             case 11:
+            case 12:
                 return this.fromJsonBinaryV9(buffer, serialisationInfo);
 
             default:
diff --git a/packages/uhk-common/src/config-serializer/config-items/key-action/helper.ts b/packages/uhk-common/src/config-serializer/config-items/key-action/helper.ts
@@ -38,6 +38,7 @@ export class Helper {
             case 8:
             case 9:
             case 11:
+            case 12:
                 return this.fromUhkBufferV1(buffer, macros, serialisationInfo);
 
             default:
@@ -117,6 +118,7 @@ export class Helper {
             case 8:
             case 9:
             case 11:
+            case 12:
                 return this.fromJSONObjectV1(keyAction, macros, serialisationInfo);
 
             default:
diff --git a/packages/uhk-common/src/config-serializer/config-items/key-action/keystroke-action.ts b/packages/uhk-common/src/config-serializer/config-items/key-action/keystroke-action.ts
@@ -84,6 +84,7 @@ export class KeystrokeAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV6(jsonObject, serialisationInfo);
                 break;
 
@@ -109,6 +110,7 @@ export class KeystrokeAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV6(buffer, serialisationInfo);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/key-action/mouse-action.ts b/packages/uhk-common/src/config-serializer/config-items/key-action/mouse-action.ts
@@ -63,6 +63,7 @@ export class MouseAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV6(jsonObject, serialisationInfo);
                 break;
 
@@ -88,6 +89,7 @@ export class MouseAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV6(buffer, serialisationInfo);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/key-action/play-macro-action.ts b/packages/uhk-common/src/config-serializer/config-items/key-action/play-macro-action.ts
@@ -38,6 +38,7 @@ export class PlayMacroAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV6(jsonObject, macros, serialisationInfo);
                 break;
 
@@ -63,6 +64,7 @@ export class PlayMacroAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV6(buffer, macros, serialisationInfo);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/key-action/switch-keymap-action.ts b/packages/uhk-common/src/config-serializer/config-items/key-action/switch-keymap-action.ts
@@ -42,6 +42,7 @@ export class SwitchKeymapAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV6(jsonObject, serialisationInfo);
                 break;
 
@@ -117,6 +118,7 @@ export class UnresolvedSwitchKeymapAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV6(buffer, serialisationInfo);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/key-action/switch-layer-action.ts b/packages/uhk-common/src/config-serializer/config-items/key-action/switch-layer-action.ts
@@ -72,6 +72,7 @@ export class SwitchLayerAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV6(jsonObject, serialisationInfo);
                 break;
 
@@ -97,6 +98,7 @@ export class SwitchLayerAction extends KeyAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV6(buffer, serialisationInfo);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/keymap.ts b/packages/uhk-common/src/config-serializer/config-items/keymap.ts
@@ -41,6 +41,7 @@ export class Keymap {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject, macros, serialisationInfo);
                 break;
 
@@ -65,6 +66,7 @@ export class Keymap {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer, macros, serialisationInfo);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/layer.ts b/packages/uhk-common/src/config-serializer/config-items/layer.ts
@@ -40,6 +40,7 @@ export class Layer {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV5(jsonObject, macros, serialisationInfo);
                 break;
 
@@ -65,6 +66,7 @@ export class Layer {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV5(buffer, macros, serialisationInfo);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/macro-action/command-macro-action.ts b/packages/uhk-common/src/config-serializer/config-items/macro-action/command-macro-action.ts
@@ -26,6 +26,7 @@ export class CommandMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject);
                 break;
 
@@ -48,6 +49,7 @@ export class CommandMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/macro-action/delay-macro-action.ts b/packages/uhk-common/src/config-serializer/config-items/macro-action/delay-macro-action.ts
@@ -27,6 +27,7 @@ export class DelayMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject);
                 break;
 
@@ -49,6 +50,7 @@ export class DelayMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/macro-action/key-macro-action.ts b/packages/uhk-common/src/config-serializer/config-items/macro-action/key-macro-action.ts
@@ -59,6 +59,7 @@ export class KeyMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject);
                 break;
 
@@ -81,6 +82,7 @@ export class KeyMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/macro-action/mouse-button-macro-action.ts b/packages/uhk-common/src/config-serializer/config-items/macro-action/mouse-button-macro-action.ts
@@ -41,6 +41,7 @@ export class MouseButtonMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject);
                 break;
 
@@ -63,6 +64,7 @@ export class MouseButtonMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/macro-action/move-mouse-macro-action.ts b/packages/uhk-common/src/config-serializer/config-items/macro-action/move-mouse-macro-action.ts
@@ -30,6 +30,7 @@ export class MoveMouseMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject);
                 break;
 
@@ -52,6 +53,7 @@ export class MoveMouseMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/macro-action/scroll-mouse-macro-action.ts b/packages/uhk-common/src/config-serializer/config-items/macro-action/scroll-mouse-macro-action.ts
@@ -30,6 +30,7 @@ export class ScrollMouseMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject);
                 break;
 
@@ -52,6 +53,7 @@ export class ScrollMouseMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/macro-action/text-macro-action.ts b/packages/uhk-common/src/config-serializer/config-items/macro-action/text-macro-action.ts
@@ -26,6 +26,7 @@ export class TextMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject);
                 break;
 
@@ -48,6 +49,7 @@ export class TextMacroAction extends MacroAction {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/macro.ts b/packages/uhk-common/src/config-serializer/config-items/macro.ts
@@ -39,6 +39,7 @@ export class Macro {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject, serialisationInfo);
                 break;
 
@@ -61,6 +62,7 @@ export class Macro {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer, serialisationInfo);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/module-configuration.ts b/packages/uhk-common/src/config-serializer/config-items/module-configuration.ts
@@ -94,6 +94,7 @@ export class ModuleConfiguration {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV7(jsonObject);
                 break;
 
@@ -118,6 +119,7 @@ export class ModuleConfiguration {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV7(buffer);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/module.ts b/packages/uhk-common/src/config-serializer/config-items/module.ts
@@ -35,6 +35,7 @@ export class Module {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV1(jsonObject, macros, serialisationInfo);
                 break;
 
@@ -57,6 +58,7 @@ export class Module {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV1(buffer, macros, serialisationInfo);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/rgb-color.ts b/packages/uhk-common/src/config-serializer/config-items/rgb-color.ts
@@ -36,6 +36,7 @@ export class RgbColor {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromJsonV6(jsonObject);
                 break;
 
@@ -60,6 +61,7 @@ export class RgbColor {
             case 8:
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV6(buffer);
                 break;
 
diff --git a/packages/uhk-common/src/config-serializer/config-items/user-configuration.spec.ts b/packages/uhk-common/src/config-serializer/config-items/user-configuration.spec.ts
@@ -8,8 +8,8 @@ describe('user-configuration', () => {
 
     it('should transform an empty config', () => {
         jsonTester({
-            userConfigMajorVersion: 11,
-            userConfigMinorVersion: 1,
+            userConfigMajorVersion: 12,
+            userConfigMinorVersion: 0,
             userConfigPatchVersion: 0,
             deviceName: 'My UHK',
             doubleTapSwitchLayerTimeout: 250,
diff --git a/packages/uhk-common/src/config-serializer/config-items/user-configuration.ts b/packages/uhk-common/src/config-serializer/config-items/user-configuration.ts
@@ -199,6 +199,7 @@ export class UserConfiguration implements MouseSpeedConfiguration {
 
             case 9:
             case 11:
+            case 12:
                 this.fromJsonObjectV9(jsonObject);
                 break;
 
@@ -219,6 +220,7 @@ export class UserConfiguration implements MouseSpeedConfiguration {
         this.migrateToV9();
         this.migrateToV9_99();
         this.migrateToV11();
+        this.migrateToV12();
 
         this.recalculateConfigurationLength();
 
@@ -253,6 +255,7 @@ export class UserConfiguration implements MouseSpeedConfiguration {
 
             case 9:
             case 11:
+            case 12:
                 this.fromBinaryV9(buffer);
                 break;
 
@@ -309,6 +312,10 @@ export class UserConfiguration implements MouseSpeedConfiguration {
             this.userConfigurationLength = 0;
         }
 
+        if (this.migrateToV12()) {
+            this.userConfigurationLength = 0;
+        }
+
         if (this.userConfigurationLength === 0) {
             this.recalculateConfigurationLength();
         }
@@ -1342,6 +1349,16 @@ export class UserConfiguration implements MouseSpeedConfiguration {
         this.userConfigPatchVersion = 0;
     }
 
+    private migrateToV12(): boolean {
+        if (this.userConfigMajorVersion > 11) {
+            return false;
+        }
+
+        this.userConfigMajorVersion = 12;
+        this.userConfigMinorVersion = 0;
+        this.userConfigPatchVersion = 0;
+    }
+
     private getSerialisationInfo(): SerialisationInfo {
         return {
             isUserConfigContainsRgbColors: this.perKeyRgbPresent,
diff --git a/packages/uhk-web/src/app/services/user-config-80.json b/packages/uhk-web/src/app/services/user-config-80.json
