Skip to content

Add missing secondary role settings to user config (version 14) #1483

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
kareltucek wants to merge 2 commits into
base: master
Choose a base branch
from
+67 −4
Open

Add missing secondary role settings to user config (version 14) #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cdaeaa
Add missing secondary role settings to user config (version 14)
kareltucek Feb 9, 2026
d47c3a0
ParseConfig: use explicit serialization enums for secondary roles.
kareltucek Feb 9, 2026
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
55 changes: 52 additions & 3 deletions right/src/config_parser/parse_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,21 @@ parser_error_t parseConfig(config_buffer_t *buffer)
secondary_role_strategy_t secondaryRoles_Strategy = SecondaryRoleStrategy_Simple;
uint16_t secondaryRoles_AdvancedStrategyTimeout = Cfg.SecondaryRoles_AdvancedStrategyTimeout;
int16_t secondaryRoles_AdvancedStrategySafetyMargin = Cfg.SecondaryRoles_AdvancedStrategySafetyMargin;
secondary_role_triggering_event_t secondaryRoles_AdvancedStrategyTriggeringEvent = Cfg.SecondaryRoles_AdvancedStrategyTriggeringEvent;
serialized_secondary_role_triggering_event_t secondaryRoles_AdvancedStrategyTriggeringEvent = SerializedSecondaryRoleTriggeringEvent_Release;
bool secondaryRoles_AdvancedStrategyDoubletapToPrimary = Cfg.SecondaryRoles_AdvancedStrategyDoubletapToPrimary;
serialized_secondary_role_action_type_t secondaryRoles_AdvancedStrategyTimeoutAction = SerializedSecondaryRoleActionType_Secondary;

bool secondaryRoles_AdvancedStrategyTriggerByMouse = Cfg.SecondaryRoles_AdvancedStrategyTriggerByMouse;
bool secondaryRoles_AdvancedStrategyAcceptTriggersFromSameHalf = Cfg.SecondaryRoles_AdvancedStrategyAcceptTriggersFromSameHalf;
uint8_t secondaryRoles_AdvancedStrategyMinimumHoldTime = Cfg.SecondaryRoles_AdvancedStrategyMinimumHoldTime;
serialized_secondary_role_timeout_type_t secondaryRoles_AdvancedStrategyTimeoutType = SerializedSecondaryRoleTimeoutType_Active;

if (DataModelVersion.major >= 7) {
secondaryRoles_Strategy = ReadUInt8(buffer);
ATTR_UNUSED uint16_t secondaryRoles_AdvancedStrategyDoubletapTimeout = ReadUInt16(buffer);
secondaryRoles_AdvancedStrategyTimeout = ReadUInt16(buffer);
secondaryRoles_AdvancedStrategySafetyMargin = ReadInt16(buffer);
secondaryRoles_AdvancedStrategyTriggeringEvent = ReadBool(buffer) ? SecondaryRoleTriggeringEvent_Release : SecondaryRoleTriggeringEvent_Press;
secondaryRoles_AdvancedStrategyTriggeringEvent = ReadUInt8(buffer);
secondaryRoles_AdvancedStrategyDoubletapToPrimary = ReadBool(buffer);
secondaryRoles_AdvancedStrategyTimeoutAction = ReadUInt8(buffer);

Expand Down Expand Up @@ -243,6 +248,15 @@ parser_error_t parseConfig(config_buffer_t *buffer)
batteryChargingMode = ReadUInt8(buffer);
}

// Version 14:

if (DataModelVersion.major >= 14) {
secondaryRoles_AdvancedStrategyTriggerByMouse = ReadBool(buffer);
secondaryRoles_AdvancedStrategyAcceptTriggersFromSameHalf = ReadBool(buffer);
secondaryRoles_AdvancedStrategyMinimumHoldTime = ReadUInt8(buffer);
secondaryRoles_AdvancedStrategyTimeoutType = ReadUInt8(buffer);
}

// HostConnection configuration

if (VERSION_AT_LEAST(DataModelVersion, 8, 1, 0)) {
Expand Down Expand Up @@ -347,7 +361,20 @@ parser_error_t parseConfig(config_buffer_t *buffer)
Cfg.SecondaryRoles_Strategy = secondaryRoles_Strategy;
Cfg.SecondaryRoles_AdvancedStrategyTimeout = secondaryRoles_AdvancedStrategyTimeout;
Cfg.SecondaryRoles_AdvancedStrategySafetyMargin = secondaryRoles_AdvancedStrategySafetyMargin;
Cfg.SecondaryRoles_AdvancedStrategyTriggeringEvent = secondaryRoles_AdvancedStrategyTriggeringEvent;
switch (secondaryRoles_AdvancedStrategyTriggeringEvent) {
case SerializedSecondaryRoleTriggeringEvent_Press:
Cfg.SecondaryRoles_AdvancedStrategyTriggeringEvent = SecondaryRoleTriggeringEvent_Press;
break;
case SerializedSecondaryRoleTriggeringEvent_Release:
Cfg.SecondaryRoles_AdvancedStrategyTriggeringEvent = SecondaryRoleTriggeringEvent_Release;
break;
case SerializedSecondaryRoleTriggeringEvent_None:
Cfg.SecondaryRoles_AdvancedStrategyTriggeringEvent = SecondaryRoleTriggeringEvent_None;
break;
default:
ConfigParser_Error(buffer, "Invalid secondary role triggering event: %u", secondaryRoles_AdvancedStrategyTriggeringEvent);
return ParserError_InvalidSecondaryRoleTriggeringEvent;
}
Cfg.SecondaryRoles_AdvancedStrategyDoubletapToPrimary = secondaryRoles_AdvancedStrategyDoubletapToPrimary;
switch (secondaryRoles_AdvancedStrategyTimeoutAction) {
case SerializedSecondaryRoleActionType_Primary:
Expand All @@ -356,6 +383,9 @@ parser_error_t parseConfig(config_buffer_t *buffer)
case SerializedSecondaryRoleActionType_Secondary:
Cfg.SecondaryRoles_AdvancedStrategyTimeoutAction = SecondaryRoleState_Secondary;
break;
case SerializedSecondaryRoleActionType_NoOp:
Cfg.SecondaryRoles_AdvancedStrategyTimeoutAction = SecondaryRoleState_NoOp;
break;
default:
ConfigParser_Error(buffer, "Invalid secondary role action type: %u", secondaryRoles_AdvancedStrategyTimeoutAction);
return ParserError_InvalidSecondaryRoleActionType;
Expand All @@ -369,6 +399,25 @@ parser_error_t parseConfig(config_buffer_t *buffer)
Cfg.KeystrokeDelay = keystrokeDelay;
}

// Version 14

if (DataModelVersion.major >= 14) {
Cfg.SecondaryRoles_AdvancedStrategyTriggerByMouse = secondaryRoles_AdvancedStrategyTriggerByMouse;
Cfg.SecondaryRoles_AdvancedStrategyAcceptTriggersFromSameHalf = secondaryRoles_AdvancedStrategyAcceptTriggersFromSameHalf;
Cfg.SecondaryRoles_AdvancedStrategyMinimumHoldTime = secondaryRoles_AdvancedStrategyMinimumHoldTime;
switch (secondaryRoles_AdvancedStrategyTimeoutType) {
case SerializedSecondaryRoleTimeoutType_Active:
Cfg.SecondaryRoles_AdvancedStrategyTimeoutType = SecondaryRoleTimeoutType_Active;
break;
case SerializedSecondaryRoleTimeoutType_Passive:
Cfg.SecondaryRoles_AdvancedStrategyTimeoutType = SecondaryRoleTimeoutType_Passive;
break;
default:
ConfigParser_Error(buffer, "Invalid secondary role timeout type: %u", secondaryRoles_AdvancedStrategyTimeoutType);
return ParserError_InvalidSecondaryRoleTimeoutType;
}
}

// Version 8


Expand Down
14 changes: 14 additions & 0 deletions right/src/config_parser/parse_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,27 @@
ParserError_InvalidHostConnectionId = 21,
ParserError_InvalidSerializedOtherAction = 22,
ParserError_ConfigVersionTooNew = 23,
ParserError_InvalidSecondaryRoleTriggeringEvent = 24,
ParserError_InvalidSecondaryRoleTimeoutType = 25,
} parser_error_t;

typedef enum {
SerializedSecondaryRoleActionType_Primary,
SerializedSecondaryRoleActionType_Secondary,
SerializedSecondaryRoleActionType_NoOp,
} serialized_secondary_role_action_type_t;

typedef enum {
SerializedSecondaryRoleTriggeringEvent_Press,
SerializedSecondaryRoleTriggeringEvent_Release,
SerializedSecondaryRoleTriggeringEvent_None,
} serialized_secondary_role_triggering_event_t;

typedef enum {
SerializedSecondaryRoleTimeoutType_Active,
SerializedSecondaryRoleTimeoutType_Passive,
} serialized_secondary_role_timeout_type_t;

typedef enum {
SerializedChargingMode_Full = 0,
SerializedChargingMode_StationaryMode = 1,
Expand Down
2 changes: 1 addition & 1 deletion scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"deviceProtocolVersion": "4.17.0",
"moduleProtocolVersion": "4.3.0",
"dongleProtocolVersion": "1.0.2",
"userConfigVersion": "13.0.0",
"userConfigVersion": "14.0.0",
"hardwareConfigVersion": "1.0.0",
"smartMacrosVersion": "3.13.0",
"devices": [
Expand Down