kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fix up layer metadata, move to layer IDs.

Browse source 
* Studio will use stable layer IDs to refer to layers, so that
  layer reordering doesn't affect behavior bindings, so update to match.
* Fix a few layer metadata entries that missed being refactored.
This commit is contained in:
Peter Johanson 2024-07-05 12:56:33 -06:00 • committed by Pete Johanson
parent e01f13f9f0
commit 3694ff85a0
5 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/include/drivers/behavior.h
View file

@ -39,7 +39,7 @@ struct behavior_parameter_value_metadata {
BEHAVIOR_PARAMETER_VALUE_TYPE_VALUE = 1, BEHAVIOR_PARAMETER_VALUE_TYPE_VALUE = 1,
BEHAVIOR_PARAMETER_VALUE_TYPE_RANGE = 2, BEHAVIOR_PARAMETER_VALUE_TYPE_RANGE = 2,
BEHAVIOR_PARAMETER_VALUE_TYPE_HID_USAGE = 3, BEHAVIOR_PARAMETER_VALUE_TYPE_HID_USAGE = 3,
BEHAVIOR_PARAMETER_VALUE_TYPE_LAYER_INDEX = 4, BEHAVIOR_PARAMETER_VALUE_TYPE_LAYER_ID = 4,
} type; } type;
}; };

2
app/src/behavior.c
View file

@ -99,7 +99,7 @@ static int check_param_matches_value(const struct behavior_parameter_value_metad
} }
break; break;
case BEHAVIOR_PARAMETER_VALUE_TYPE_LAYER_INDEX: case BEHAVIOR_PARAMETER_VALUE_TYPE_LAYER_ID:
if (param >= 0 && param < ZMK_KEYMAP_LEN) { if (param >= 0 && param < ZMK_KEYMAP_LEN) {
return PARAM_MATCHES; return PARAM_MATCHES;
} }

2
app/src/behaviors/behavior_momentary_layer.c
View file

@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
static const struct behavior_parameter_value_metadata param_values[] = { static const struct behavior_parameter_value_metadata param_values[] = {
{ {
.display_name = "Layer", .display_name = "Layer",
.type = BEHAVIOR_PARAMETER_VALUE_TYPE_LAYER_INDEX, .type = BEHAVIOR_PARAMETER_VALUE_TYPE_LAYER_ID,
}, },
}; };

3
app/src/behaviors/behavior_to_layer.c
View file

@ -37,8 +37,7 @@ static int to_keymap_binding_released(struct zmk_behavior_binding *binding,
static const struct behavior_parameter_value_metadata param_values[] = { static const struct behavior_parameter_value_metadata param_values[] = {
{ {
.display_name = "Layer", .display_name = "Layer",
.type = BEHAVIOR_PARAMETER_VALUE_TYPE_STANDARD, .type = BEHAVIOR_PARAMETER_VALUE_TYPE_LAYER_ID,
.standard = BEHAVIOR_PARAMETER_STANDARD_DOMAIN_LAYER_INDEX,
}, },
}; };

3
app/src/behaviors/behavior_toggle_layer.c
View file

@ -39,8 +39,7 @@ static int tog_keymap_binding_released(struct zmk_behavior_binding *binding,
static const struct behavior_parameter_value_metadata param_values[] = { static const struct behavior_parameter_value_metadata param_values[] = {
{ {
.display_name = "Layer", .display_name = "Layer",
.type = BEHAVIOR_PARAMETER_VALUE_TYPE_STANDARD, .type = BEHAVIOR_PARAMETER_VALUE_TYPE_LAYER_ID,
.standard = BEHAVIOR_PARAMETER_STANDARD_DOMAIN_LAYER_INDEX,
}, },
}; };