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

master^2
QMK Bot 2022-06-10 07:46:24 +00:00
commit 97fc4f1b6a
2 changed files with 4 additions and 11 deletions

View File

@ -15,13 +15,6 @@
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
enum custom_layers {
_BASE,
_L1,
_L2,
_L3,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( [0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,

View File

@ -24,16 +24,16 @@ bool oled_task_kb(void) {
oled_write_P(PSTR("Layer: "), false); oled_write_P(PSTR("Layer: "), false);
switch (get_highest_layer(layer_state)) { switch (get_highest_layer(layer_state)) {
case _BASE: case 0:
oled_write_P(PSTR("Base\n"), false); oled_write_P(PSTR("Base\n"), false);
break; break;
case _L1: case 1:
oled_write_P(PSTR("ONE\n"), false); oled_write_P(PSTR("ONE\n"), false);
break; break;
case _L2: case 2:
oled_write_P(PSTR("TWO\n"), false); oled_write_P(PSTR("TWO\n"), false);
break; break;
case _L3: case 3:
oled_write_P(PSTR("Three\n"), false); oled_write_P(PSTR("Three\n"), false);
break; break;
default: default: