forked from mirrors/qmk_userspace
Make default layer size 16-bit (#15286)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
This commit is contained in:
parent
cfcd647b2e
commit
0da6562c4d
293 changed files with 1249 additions and 1309 deletions
|
@ -209,7 +209,7 @@ void press_underscore(void) {
|
|||
uint8_t old_layer=_BASE;
|
||||
|
||||
void matrix_scan_user(void) {
|
||||
uint8_t layer = biton32(layer_state);
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
|
||||
frenchdev_led_1_off();
|
||||
frenchdev_led_2_off();
|
||||
|
|
|
@ -89,7 +89,7 @@ void matrix_init_user(void) {
|
|||
}
|
||||
|
||||
void matrix_scan_user(void) {
|
||||
uint8_t layer = biton32(layer_state);
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
if (layer) {
|
||||
PORTC |= _BV(PC7);
|
||||
} else {
|
||||
|
|
|
@ -87,7 +87,7 @@ void led_set_user(uint8_t usb_led) {
|
|||
//function for layer indicator LED
|
||||
layer_state_t layer_state_set_user(layer_state_t state)
|
||||
{
|
||||
if (biton32(state) == 1) {
|
||||
if (get_highest_layer(state) == 1) {
|
||||
writePinHigh(C6);
|
||||
} else {
|
||||
writePinLow(C6);
|
||||
|
|
|
@ -529,7 +529,7 @@ void led_reset(void) {
|
|||
}
|
||||
|
||||
void led_set_default_layer_indicator(void) {
|
||||
uint8_t default_layer = biton32(default_layer_state);
|
||||
uint8_t default_layer = get_highest_layer(default_layer_state);
|
||||
if (default_layer == _QWERTY) {
|
||||
rgbsps_set(LED_IND_QWERTY, THEME_COLOR_QWERTY);
|
||||
rgbsps_set(LED_IND_ALT, COLOR_BLANK);
|
||||
|
@ -553,7 +553,7 @@ void led_set_layer_indicator(void) {
|
|||
rgbsps_set(LED_IND_GREEK, COLOR_BLANK);
|
||||
rgbsps_set(LED_IND_EMOJI, COLOR_BLANK);
|
||||
|
||||
uint8_t layer = biton32(layer_state);
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
if (oldlayer == layer) {
|
||||
return;
|
||||
}
|
||||
|
@ -1014,7 +1014,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
|
||||
lshift = keyboard_report->mods & MOD_BIT(KC_LSFT);
|
||||
rshift = keyboard_report->mods & MOD_BIT(KC_RSFT);
|
||||
layer = biton32(layer_state);
|
||||
layer = get_highest_layer(layer_state);
|
||||
|
||||
#ifdef DOUBLESPACE_LAYER_ENABLE
|
||||
// double-space: send space immediately if any other key depressed before space is released
|
||||
|
|
|
@ -532,7 +532,7 @@ void led_reset(void) {
|
|||
}
|
||||
|
||||
void led_set_default_layer_indicator(void) {
|
||||
uint8_t default_layer = biton32(default_layer_state);
|
||||
uint8_t default_layer = get_highest_layer(default_layer_state);
|
||||
if (default_layer == _QWERTY) {
|
||||
rgbsps_set(LED_IND_QWERTY, THEME_COLOR_QWERTY);
|
||||
rgbsps_set(LED_IND_ALT, COLOR_BLANK);
|
||||
|
@ -556,7 +556,7 @@ void led_set_layer_indicator(void) {
|
|||
rgbsps_set(LED_IND_GREEK, COLOR_BLANK);
|
||||
rgbsps_set(LED_IND_EMOJI, COLOR_BLANK);
|
||||
|
||||
uint8_t layer = biton32(layer_state);
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
if (oldlayer == layer) {
|
||||
return;
|
||||
}
|
||||
|
@ -989,7 +989,7 @@ void process_doublespace(bool pressed, bool *isactive, bool *otheractive, bool *
|
|||
}
|
||||
#endif
|
||||
|
||||
uint32_t layer_state_set_kb(uint32_t state)
|
||||
layer_state_t layer_state_set_kb(layer_state_t state)
|
||||
{
|
||||
// turn on punc layer if both fun & num are on
|
||||
if ((state & ((1UL<<_NUM) | (1UL<<_FUN))) == ((1UL<<_NUM) | (1UL<<_FUN))) {
|
||||
|
@ -1017,7 +1017,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
|
||||
lshift = keyboard_report->mods & MOD_BIT(KC_LSFT);
|
||||
rshift = keyboard_report->mods & MOD_BIT(KC_RSFT);
|
||||
layer = biton32(layer_state);
|
||||
layer = get_highest_layer(layer_state);
|
||||
|
||||
#ifdef DOUBLESPACE_LAYER_ENABLE
|
||||
// double-space: send space immediately if any other key depressed before space is released
|
||||
|
|
|
@ -219,7 +219,7 @@ void LayerLEDSet(uint8_t layr) {
|
|||
uint8_t old_layer = _QW;
|
||||
|
||||
void matrix_scan_user(void) {
|
||||
uint8_t layer = biton32(layer_state);
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
|
||||
if (old_layer != layer) {
|
||||
LayerLEDSet(layer);
|
||||
|
|
|
@ -9,7 +9,7 @@ void keyboard_pre_init_user(void)
|
|||
layer_state_t layer_state_set_user(layer_state_t state)
|
||||
{
|
||||
// Switch layer LED accordingly
|
||||
switch (biton32(state)) {
|
||||
switch (get_highest_layer(state)) {
|
||||
case 0:
|
||||
writePinHigh(B0);
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue