Skip to content

feat: Typing behavior, v14 #2858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ert78gb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Typing behavior, v14 #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"version": "9.0.1",
"firmwareVersion": "16.1.1",
"deviceProtocolVersion": "4.17.0",
"userConfigVersion": "13.0.0",
"userConfigVersion": "14.0.0",
"hardwareConfigVersion": "1.0.0",
"description": "Agent is the configuration application of the Ultimate Hacking Keyboard.",
"repository": {
Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/host-connection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export class HostConnection {
case 11:
case 12:
case 13:
case 14:
return this.fromJsonObjectV9(jsonObject, serialisationInfo);

default:
Expand All @@ -91,6 +92,7 @@ export class HostConnection {
case 11:
case 12:
case 13:
case 14:
return this.fromJsonBinaryV9(buffer, serialisationInfo);

default:
Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ export * from './layer.js';
export * from './layer-name.js';
export * from './secondary-role-action.js';
export * from './secondary-role-advanced-strategy-timeout-action.js';
export * from './secondary-role-advanced-strategy-timeout-type.js';
export * from './secondary-role-advanced-strategy-triggering-event.js';
export * from './secondary-role-strategy.js';
export * from './macro.js';
export * from './module.js';
Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/key-action/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export class Helper {
case 11:
case 12:
case 13:
case 14:
return this.fromUhkBufferV1(buffer, macros, serialisationInfo);

default:
Expand Down Expand Up @@ -130,6 +131,7 @@ export class Helper {
case 11:
case 12:
case 13:
case 14:
return this.fromJSONObjectV1(keyAction, macros, serialisationInfo);

default:
Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/key-action/keystroke-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export class KeystrokeAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV6(jsonObject, serialisationInfo);
break;

Expand Down Expand Up @@ -113,6 +114,7 @@ export class KeystrokeAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV6(buffer, serialisationInfo);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/key-action/mouse-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export class MouseAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV6(jsonObject, serialisationInfo);
break;

Expand Down Expand Up @@ -92,6 +93,7 @@ export class MouseAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV6(buffer, serialisationInfo);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/key-action/play-macro-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export class PlayMacroAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV6(jsonObject, macros, serialisationInfo);
break;

Expand Down Expand Up @@ -123,6 +124,7 @@ export class PlayMacroAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV6(buffer, macros, serialisationInfo);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/key-action/switch-keymap-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export class SwitchKeymapAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV6(jsonObject, serialisationInfo);
break;

Expand Down Expand Up @@ -121,6 +122,7 @@ export class UnresolvedSwitchKeymapAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV6(buffer, serialisationInfo);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/key-action/switch-layer-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export class SwitchLayerAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV6(jsonObject, serialisationInfo);
break;

Expand Down Expand Up @@ -101,6 +102,7 @@ export class SwitchLayerAction extends KeyAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV6(buffer, serialisationInfo);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/keymap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export class Keymap {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject, macros, serialisationInfo);
break;

Expand All @@ -69,6 +70,7 @@ export class Keymap {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer, macros, serialisationInfo);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export class Layer {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV5(jsonObject, macros, serialisationInfo);
break;

Expand Down Expand Up @@ -69,6 +70,7 @@ export class Layer {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV5(buffer, macros, serialisationInfo);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/macro-action/command-macro-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export class CommandMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject);
break;

Expand All @@ -52,6 +53,7 @@ export class CommandMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/macro-action/delay-macro-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export class DelayMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject);
break;

Expand All @@ -53,6 +54,7 @@ export class DelayMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/macro-action/key-macro-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export class KeyMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject);
break;

Expand All @@ -85,6 +86,7 @@ export class KeyMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer);
break;

Expand Down
2 changes: 2 additions & 0 deletions ...s/uhk-common/src/config-serializer/config-items/macro-action/mouse-button-macro-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export class MouseButtonMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject);
break;

Expand All @@ -67,6 +68,7 @@ export class MouseButtonMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer);
break;

Expand Down
2 changes: 2 additions & 0 deletions ...ges/uhk-common/src/config-serializer/config-items/macro-action/move-mouse-macro-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export class MoveMouseMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject);
break;

Expand All @@ -56,6 +57,7 @@ export class MoveMouseMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer);
break;

Expand Down
2 changes: 2 additions & 0 deletions ...s/uhk-common/src/config-serializer/config-items/macro-action/scroll-mouse-macro-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export class ScrollMouseMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject);
break;

Expand All @@ -56,6 +57,7 @@ export class ScrollMouseMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/macro-action/text-macro-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export class TextMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject);
break;

Expand All @@ -52,6 +53,7 @@ export class TextMacroAction extends MacroAction {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/macro.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export class Macro {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject, serialisationInfo);
break;

Expand All @@ -65,6 +66,7 @@ export class Macro {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer, serialisationInfo);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/module-configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export class ModuleConfiguration {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV7(jsonObject);
break;

Expand All @@ -122,6 +123,7 @@ export class ModuleConfiguration {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV7(buffer);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export class Module {
case 11:
case 12:
case 13:
case 14:
this.fromJsonObjectV1(jsonObject, macros, serialisationInfo);
break;

Expand All @@ -69,6 +70,7 @@ export class Module {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV1(buffer, macros, serialisationInfo);
break;

Expand Down
2 changes: 2 additions & 0 deletions packages/uhk-common/src/config-serializer/config-items/rgb-color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export class RgbColor {
case 11:
case 12:
case 13:
case 14:
this.fromJsonV6(jsonObject);
break;

Expand All @@ -64,6 +65,7 @@ export class RgbColor {
case 11:
case 12:
case 13:
case 14:
this.fromBinaryV6(buffer);
break;

Expand Down
1 change: 1 addition & 0 deletions ...mon/src/config-serializer/config-items/secondary-role-advanced-strategy-timeout-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export enum SecondaryRoleAdvancedStrategyTimeoutAction {
Primary,
Secondary,
None,
}
4 changes: 4 additions & 0 deletions ...ommon/src/config-serializer/config-items/secondary-role-advanced-strategy-timeout-type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export enum SecondaryRoleAdvancedStrategyTimeoutType {
Active,
Passive,
}
5 changes: 5 additions & 0 deletions ...n/src/config-serializer/config-items/secondary-role-advanced-strategy-triggering-event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export enum SecondaryRoleAdvancedStrategyTriggeringEvent {
Press,
Release,
None,
}
8 changes: 6 additions & 2 deletions packages/uhk-common/src/config-serializer/config-items/user-configuration.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('user-configuration', () => {

it('should transform an empty config', () => {
jsonTester({
userConfigMajorVersion: 13,
userConfigMajorVersion: 14,
userConfigMinorVersion: 0,
userConfigPatchVersion: 0,
lastSaveAgentTag: '',
Expand Down Expand Up @@ -40,9 +40,13 @@ describe('user-configuration', () => {
secondaryRoleAdvancedStrategyDoubletapTimeout: 200,
secondaryRoleAdvancedStrategyTimeout: 350,
secondaryRoleAdvancedStrategySafetyMargin: 50,
secondaryRoleAdvancedStrategyTriggerByRelease: true,
secondaryRoleAdvancedStrategyTrigger: 'Release',
secondaryRoleAdvancedStrategyDoubletapToPrimary: true,
secondaryRoleAdvancedStrategyTimeoutAction: 'Secondary',
secondaryRoleAdvancedStrategyTriggerByMouse: false,
secondaryRoleAdvancedStrategyTriggerFromSameHalf: true,
secondaryRoleAdvancedStrategyMinimumHoldTime: 0,
secondaryRoleAdvancedStrategyTimeoutType: 'Active',
mouseScrollAxisSkew: 1,
mouseMoveAxisSkew: 1,
diagonalSpeedCompensation: false,
Expand Down
Loading
Loading