diff --git a/packages/uhk-common/src/config-serializer/config-items/macro-action/keymap.spec.ts b/packages/uhk-common/src/config-serializer/config-items/macro-action/keymap.spec.ts index 9be3c18b..5664b40a 100644 --- a/packages/uhk-common/src/config-serializer/config-items/macro-action/keymap.spec.ts +++ b/packages/uhk-common/src/config-serializer/config-items/macro-action/keymap.spec.ts @@ -3,8 +3,24 @@ import { UserConfiguration } from '../user-configuration'; describe('keymap', () => { it('should normalize SwitchLayerAction if non base layer action is not SwitchLayerAction', () => { const inputJsonConfig = { - dataModelVersion: 1, + dataModelMajorVersion: 3, + dataModelMinorVersion: 0, + dataModelPatchVersion: 0, deviceName: 'My UHK', + doubleTapSwitchLayerTimeout: 250, + iconsAndLayerTextsBrightness: 255, + alphanumericSegmentsBrightness: 255, + keyBacklightBrightness: 255, + mouseMoveInitialSpeed: 5, + mouseMoveAcceleration: 35, + mouseMoveDeceleratedSpeed: 10, + mouseMoveBaseSpeed: 40, + mouseMoveAcceleratedSpeed: 80, + mouseScrollInitialSpeed: 20, + mouseScrollAcceleration: 20, + mouseScrollDeceleratedSpeed: 20, + mouseScrollBaseSpeed: 20, + mouseScrollAcceleratedSpeed: 50, moduleConfigurations: [], macros: [], keymaps: [ @@ -17,7 +33,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ { keyActionType: 'switchLayer', @@ -30,7 +45,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ { keyActionType: 'keystroke', @@ -43,7 +57,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ null ] @@ -52,7 +65,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ null ] @@ -63,8 +75,24 @@ describe('keymap', () => { ] }; const expectedJsonConfig = { - dataModelVersion: 1, + dataModelMajorVersion: 3, + dataModelMinorVersion: 0, + dataModelPatchVersion: 0, deviceName: 'My UHK', + doubleTapSwitchLayerTimeout: 250, + iconsAndLayerTextsBrightness: 255, + alphanumericSegmentsBrightness: 255, + keyBacklightBrightness: 255, + mouseMoveInitialSpeed: 5, + mouseMoveAcceleration: 35, + mouseMoveDeceleratedSpeed: 10, + mouseMoveBaseSpeed: 40, + mouseMoveAcceleratedSpeed: 80, + mouseScrollInitialSpeed: 20, + mouseScrollAcceleration: 20, + mouseScrollDeceleratedSpeed: 20, + mouseScrollBaseSpeed: 20, + mouseScrollAcceleratedSpeed: 50, moduleConfigurations: [], macros: [], keymaps: [ @@ -77,7 +105,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ { keyActionType: 'switchLayer', @@ -90,7 +117,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ { keyActionType: 'switchLayer', @@ -103,7 +129,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ null ] @@ -112,7 +137,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ null ] @@ -132,8 +156,24 @@ describe('keymap', () => { it('should normalize SwitchLayerAction if non base layer action is other SwitchLayerAction', () => { const inputJsonConfig = { - dataModelVersion: 1, + dataModelMajorVersion: 3, + dataModelMinorVersion: 0, + dataModelPatchVersion: 0, deviceName: 'My UHK', + doubleTapSwitchLayerTimeout: 250, + iconsAndLayerTextsBrightness: 255, + alphanumericSegmentsBrightness: 255, + keyBacklightBrightness: 255, + mouseMoveInitialSpeed: 5, + mouseMoveAcceleration: 35, + mouseMoveDeceleratedSpeed: 10, + mouseMoveBaseSpeed: 40, + mouseMoveAcceleratedSpeed: 80, + mouseScrollInitialSpeed: 20, + mouseScrollAcceleration: 20, + mouseScrollDeceleratedSpeed: 20, + mouseScrollBaseSpeed: 20, + mouseScrollAcceleratedSpeed: 50, moduleConfigurations: [], macros: [], keymaps: [ @@ -146,7 +186,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ { keyActionType: 'switchLayer', @@ -159,7 +198,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ { keyActionType: 'switchLayer', @@ -172,7 +210,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ null ] @@ -181,7 +218,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ null ] @@ -192,8 +228,24 @@ describe('keymap', () => { ] }; const expectedJsonConfig = { - dataModelVersion: 1, + dataModelMajorVersion: 3, + dataModelMinorVersion: 0, + dataModelPatchVersion: 0, deviceName: 'My UHK', + doubleTapSwitchLayerTimeout: 250, + iconsAndLayerTextsBrightness: 255, + alphanumericSegmentsBrightness: 255, + keyBacklightBrightness: 255, + mouseMoveInitialSpeed: 5, + mouseMoveAcceleration: 35, + mouseMoveDeceleratedSpeed: 10, + mouseMoveBaseSpeed: 40, + mouseMoveAcceleratedSpeed: 80, + mouseScrollInitialSpeed: 20, + mouseScrollAcceleration: 20, + mouseScrollDeceleratedSpeed: 20, + mouseScrollBaseSpeed: 20, + mouseScrollAcceleratedSpeed: 50, moduleConfigurations: [], macros: [], keymaps: [ @@ -206,7 +258,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ { keyActionType: 'switchLayer', @@ -219,7 +270,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ { keyActionType: 'switchLayer', @@ -232,7 +282,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ null ] @@ -241,7 +290,6 @@ describe('keymap', () => { { modules: [{ id: 0, - pointerRole: 'move', keyActions: [ null ] 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 index e75e0556..3615f9e2 100644 --- 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,24 @@ describe('user-configuration', () => { it('should transform an empty config', () => { jsonTester({ - dataModelVersion: 1, + dataModelMajorVersion: 3, + dataModelMinorVersion: 0, + dataModelPatchVersion: 0, deviceName: 'My UHK', + doubleTapSwitchLayerTimeout: 250, + iconsAndLayerTextsBrightness: 255, + alphanumericSegmentsBrightness: 255, + keyBacklightBrightness: 255, + mouseMoveInitialSpeed: 5, + mouseMoveAcceleration: 35, + mouseMoveDeceleratedSpeed: 10, + mouseMoveBaseSpeed: 40, + mouseMoveAcceleratedSpeed: 80, + mouseScrollInitialSpeed: 20, + mouseScrollAcceleration: 20, + mouseScrollDeceleratedSpeed: 20, + mouseScrollBaseSpeed: 20, + mouseScrollAcceleratedSpeed: 50, moduleConfigurations: [], macros: [], keymaps: [] @@ -18,8 +34,24 @@ describe('user-configuration', () => { it('should transform a null keyActionType ', () => { jsonTester({ - dataModelVersion: 1, + dataModelMajorVersion: 3, + dataModelMinorVersion: 0, + dataModelPatchVersion: 0, deviceName: 'My UHK', + doubleTapSwitchLayerTimeout: 250, + iconsAndLayerTextsBrightness: 255, + alphanumericSegmentsBrightness: 255, + keyBacklightBrightness: 255, + mouseMoveInitialSpeed: 5, + mouseMoveAcceleration: 35, + mouseMoveDeceleratedSpeed: 10, + mouseMoveBaseSpeed: 40, + mouseMoveAcceleratedSpeed: 80, + mouseScrollInitialSpeed: 20, + mouseScrollAcceleration: 20, + mouseScrollDeceleratedSpeed: 20, + mouseScrollBaseSpeed: 20, + mouseScrollAcceleratedSpeed: 50, moduleConfigurations: [], macros: [], keymaps: [ @@ -31,7 +63,6 @@ describe('user-configuration', () => { layers: [{ modules: [{ id: 0, - pointerRole: 'move', keyActions: [ null ] diff --git a/packages/uhk-web/test/user-config-helper.ts b/packages/uhk-web/test/user-config-helper.ts index e37593ab..54a5c0da 100644 --- a/packages/uhk-web/test/user-config-helper.ts +++ b/packages/uhk-web/test/user-config-helper.ts @@ -1,15 +1,25 @@ import { cloneDeep } from 'lodash'; const defaultUserConfig = { - dataModelVersion: 4, - moduleConfigurations: [ - { - id: 1, - initialPointerSpeed: 1, - pointerAcceleration: 5, - maxPointerSpeed: 200 - } - ], + dataModelMajorVersion: 3, + dataModelMinorVersion: 0, + dataModelPatchVersion: 0, + deviceName: 'My UHK', + doubleTapSwitchLayerTimeout: 250, + iconsAndLayerTextsBrightness: 255, + alphanumericSegmentsBrightness: 255, + keyBacklightBrightness: 255, + mouseMoveInitialSpeed: 5, + mouseMoveAcceleration: 35, + mouseMoveDeceleratedSpeed: 10, + mouseMoveBaseSpeed: 40, + mouseMoveAcceleratedSpeed: 80, + mouseScrollInitialSpeed: 20, + mouseScrollAcceleration: 20, + mouseScrollDeceleratedSpeed: 20, + mouseScrollBaseSpeed: 20, + mouseScrollAcceleratedSpeed: 50, + moduleConfigurations: [], keymaps: [ { isDefault: true, @@ -21,7 +31,6 @@ const defaultUserConfig = { modules: [ { id: 0, - pointerRole: 'move', keyActions: [ { keyActionType: 'keystroke', @@ -42,7 +51,6 @@ const defaultUserConfig = { }, { id: 1, - pointerRole: 'move', keyActions: [ { keyActionType: 'keystroke', @@ -59,7 +67,6 @@ const defaultUserConfig = { }, { id: 2, - pointerRole: 'scroll', keyActions: [] } ] @@ -68,7 +75,6 @@ const defaultUserConfig = { modules: [ { id: 0, - pointerRole: 'none', keyActions: [ { keyActionType: 'keystroke', @@ -89,7 +95,6 @@ const defaultUserConfig = { }, { id: 1, - pointerRole: 'none', keyActions: [ { keyActionType: 'keystroke', @@ -110,7 +115,6 @@ const defaultUserConfig = { modules: [ { id: 0, - pointerRole: 'move', keyActions: [ null, null, @@ -119,7 +123,6 @@ const defaultUserConfig = { }, { id: 1, - pointerRole: 'scroll', keyActions: [ null, { @@ -135,7 +138,6 @@ const defaultUserConfig = { modules: [ { id: 0, - pointerRole: 'move', keyActions: [ null, null, @@ -144,7 +146,6 @@ const defaultUserConfig = { }, { id: 1, - pointerRole: 'move', keyActions: [ null, null,