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

master
QMK Bot 2023-12-05 05:19:46 +00:00
commit 18aa7d1244
5 changed files with 65 additions and 40 deletions

View File

@ -212,14 +212,19 @@ static void render_layer_state(void) {
0x20, 0x9d, 0x9e, 0x9f, 0x20,
0x20, 0xbd, 0xbe, 0xbf, 0x20,
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
if(layer_state_is(_LOWER)) {
oled_write_P(lower_layer, false);
} else if(layer_state_is(_RAISE)) {
oled_write_P(raise_layer, false);
} else if(layer_state_is(_DEFAULT)) {
oled_write_P(default_layer, false);
} else {
oled_write_P(adjust_layer, false);
switch (get_highest_layer(layer_state | default_layer_state)) {
case _LOWER:
oled_write_P(lower_layer, false);
break;
case _RAISE:
oled_write_P(raise_layer, false);
break;
case _ADJUST:
oled_write_P(adjust_layer, false);
break;
default:
oled_write_P(default_layer, false);
}
}

View File

@ -208,14 +208,19 @@ void render_layer_state(void) {
0x20, 0x9d, 0x9e, 0x9f, 0x20,
0x20, 0xbd, 0xbe, 0xbf, 0x20,
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
if(layer_state_is(_LOWER)) {
oled_write_P(lower_layer, false);
} else if(layer_state_is(_RAISE)) {
oled_write_P(raise_layer, false);
} else if(layer_state_is(_DEFAULT)) {
oled_write_P(default_layer, false);
} else {
oled_write_P(adjust_layer, false);
switch (get_highest_layer(layer_state | default_layer_state)) {
case _LOWER:
oled_write_P(lower_layer, false);
break;
case _RAISE:
oled_write_P(raise_layer, false);
break;
case _ADJUST:
oled_write_P(adjust_layer, false);
break;
default:
oled_write_P(default_layer, false);
}
}

View File

@ -212,14 +212,19 @@ void render_layer_state(void) {
0x20, 0x9d, 0x9e, 0x9f, 0x20,
0x20, 0xbd, 0xbe, 0xbf, 0x20,
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
if(layer_state_is(_LOWER)) {
oled_write_P(lower_layer, false);
} else if(layer_state_is(_RAISE)) {
oled_write_P(raise_layer, false);
} else if(layer_state_is(_DEFAULT)) {
oled_write_P(default_layer, false);
} else {
oled_write_P(adjust_layer, false);
switch (get_highest_layer(layer_state | default_layer_state)) {
case _LOWER:
oled_write_P(lower_layer, false);
break;
case _RAISE:
oled_write_P(raise_layer, false);
break;
case _ADJUST:
oled_write_P(adjust_layer, false);
break;
default:
oled_write_P(default_layer, false);
}
}

View File

@ -212,14 +212,19 @@ void render_layer_state(void) {
0x20, 0x9d, 0x9e, 0x9f, 0x20,
0x20, 0xbd, 0xbe, 0xbf, 0x20,
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
if(layer_state_is(_LOWER)) {
oled_write_P(lower_layer, false);
} else if(layer_state_is(_RAISE)) {
oled_write_P(raise_layer, false);
} else if(layer_state_is(_DEFAULT)) {
oled_write_P(default_layer, false);
} else {
oled_write_P(adjust_layer, false);
switch (get_highest_layer(layer_state | default_layer_state)) {
case _LOWER:
oled_write_P(lower_layer, false);
break;
case _RAISE:
oled_write_P(raise_layer, false);
break;
case _ADJUST:
oled_write_P(adjust_layer, false);
break;
default:
oled_write_P(default_layer, false);
}
}

View File

@ -212,14 +212,19 @@ void render_layer_state(void) {
0x20, 0x9d, 0x9e, 0x9f, 0x20,
0x20, 0xbd, 0xbe, 0xbf, 0x20,
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
if(layer_state_is(_LOWER)) {
oled_write_P(lower_layer, false);
} else if(layer_state_is(_RAISE)) {
oled_write_P(raise_layer, false);
} else if(layer_state_is(_DEFAULT)) {
oled_write_P(default_layer, false);
} else {
oled_write_P(adjust_layer, false);
switch (get_highest_layer(layer_state | default_layer_state)) {
case _LOWER:
oled_write_P(lower_layer, false);
break;
case _RAISE:
oled_write_P(raise_layer, false);
break;
case _ADJUST:
oled_write_P(adjust_layer, false);
break;
default:
oled_write_P(default_layer, false);
}
}