Merge remote-tracking branch 'origin/master' into develop
commit
18aa7d1244
|
@ -212,14 +212,19 @@ static void render_layer_state(void) {
|
||||||
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
||||||
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
||||||
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
||||||
if(layer_state_is(_LOWER)) {
|
|
||||||
oled_write_P(lower_layer, false);
|
switch (get_highest_layer(layer_state | default_layer_state)) {
|
||||||
} else if(layer_state_is(_RAISE)) {
|
case _LOWER:
|
||||||
oled_write_P(raise_layer, false);
|
oled_write_P(lower_layer, false);
|
||||||
} else if(layer_state_is(_DEFAULT)) {
|
break;
|
||||||
oled_write_P(default_layer, false);
|
case _RAISE:
|
||||||
} else {
|
oled_write_P(raise_layer, false);
|
||||||
oled_write_P(adjust_layer, false);
|
break;
|
||||||
|
case _ADJUST:
|
||||||
|
oled_write_P(adjust_layer, false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
oled_write_P(default_layer, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -208,14 +208,19 @@ void render_layer_state(void) {
|
||||||
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
||||||
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
||||||
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
||||||
if(layer_state_is(_LOWER)) {
|
|
||||||
oled_write_P(lower_layer, false);
|
switch (get_highest_layer(layer_state | default_layer_state)) {
|
||||||
} else if(layer_state_is(_RAISE)) {
|
case _LOWER:
|
||||||
oled_write_P(raise_layer, false);
|
oled_write_P(lower_layer, false);
|
||||||
} else if(layer_state_is(_DEFAULT)) {
|
break;
|
||||||
oled_write_P(default_layer, false);
|
case _RAISE:
|
||||||
} else {
|
oled_write_P(raise_layer, false);
|
||||||
oled_write_P(adjust_layer, false);
|
break;
|
||||||
|
case _ADJUST:
|
||||||
|
oled_write_P(adjust_layer, false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
oled_write_P(default_layer, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -212,14 +212,19 @@ void render_layer_state(void) {
|
||||||
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
||||||
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
||||||
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
||||||
if(layer_state_is(_LOWER)) {
|
|
||||||
oled_write_P(lower_layer, false);
|
switch (get_highest_layer(layer_state | default_layer_state)) {
|
||||||
} else if(layer_state_is(_RAISE)) {
|
case _LOWER:
|
||||||
oled_write_P(raise_layer, false);
|
oled_write_P(lower_layer, false);
|
||||||
} else if(layer_state_is(_DEFAULT)) {
|
break;
|
||||||
oled_write_P(default_layer, false);
|
case _RAISE:
|
||||||
} else {
|
oled_write_P(raise_layer, false);
|
||||||
oled_write_P(adjust_layer, false);
|
break;
|
||||||
|
case _ADJUST:
|
||||||
|
oled_write_P(adjust_layer, false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
oled_write_P(default_layer, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -212,14 +212,19 @@ void render_layer_state(void) {
|
||||||
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
||||||
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
||||||
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
||||||
if(layer_state_is(_LOWER)) {
|
|
||||||
oled_write_P(lower_layer, false);
|
switch (get_highest_layer(layer_state | default_layer_state)) {
|
||||||
} else if(layer_state_is(_RAISE)) {
|
case _LOWER:
|
||||||
oled_write_P(raise_layer, false);
|
oled_write_P(lower_layer, false);
|
||||||
} else if(layer_state_is(_DEFAULT)) {
|
break;
|
||||||
oled_write_P(default_layer, false);
|
case _RAISE:
|
||||||
} else {
|
oled_write_P(raise_layer, false);
|
||||||
oled_write_P(adjust_layer, false);
|
break;
|
||||||
|
case _ADJUST:
|
||||||
|
oled_write_P(adjust_layer, false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
oled_write_P(default_layer, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -212,14 +212,19 @@ void render_layer_state(void) {
|
||||||
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
0x20, 0x9d, 0x9e, 0x9f, 0x20,
|
||||||
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
0x20, 0xbd, 0xbe, 0xbf, 0x20,
|
||||||
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
|
||||||
if(layer_state_is(_LOWER)) {
|
|
||||||
oled_write_P(lower_layer, false);
|
switch (get_highest_layer(layer_state | default_layer_state)) {
|
||||||
} else if(layer_state_is(_RAISE)) {
|
case _LOWER:
|
||||||
oled_write_P(raise_layer, false);
|
oled_write_P(lower_layer, false);
|
||||||
} else if(layer_state_is(_DEFAULT)) {
|
break;
|
||||||
oled_write_P(default_layer, false);
|
case _RAISE:
|
||||||
} else {
|
oled_write_P(raise_layer, false);
|
||||||
oled_write_P(adjust_layer, false);
|
break;
|
||||||
|
case _ADJUST:
|
||||||
|
oled_write_P(adjust_layer, false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
oled_write_P(default_layer, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue