Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2024-02-20 00:45:57 +00:00
commit e198643d66

View file

@ -333,27 +333,26 @@ will give the _NAV layer as a reference to it's self. All other layers
will have the default for their combo reference layer. If the default will have the default for their combo reference layer. If the default
is not set, all other layers will reference themselves. is not set, all other layers will reference themselves.
```c ```c
#define COMBO_REF_DEFAULT _MY_COMBO_LAYER #define COMBO_REF_DEFAULT _MY_COMBO_LAYER
...
uint8_t combo_ref_from_layer(uint8_t layer){ uint8_t combo_ref_from_layer(uint8_t layer){
switch (get_highest_layer(layer_state)){ switch (get_highest_layer(layer_state)){
case _DVORAK: return _QWERTY; case _DVORAK: return _QWERTY;
case _NAV: return _NAV; case _NAV: return _NAV;
default: return _MY_COMBO_LAYER; default: return _MY_COMBO_LAYER;
}
return layer; // important if default is not in case.
} }
``` return layer; // important if default is not in case.
}
```
The equivalent definition using the combo macros is this: The equivalent definition using the combo macros is this:
```c ```c
COMBO_REF_LAYER(_DVORAK, _QWERTY) COMBO_REF_LAYER(_DVORAK, _QWERTY)
COMBO_REF_LAYER(_NAV, _NAV) COMBO_REF_LAYER(_NAV, _NAV)
DEFAULT_REF_LAYER(_MY_COMBO_LAYER). DEFAULT_REF_LAYER(_MY_COMBO_LAYER).
``` ```
## User callbacks ## User callbacks