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

keyboards/nacly/sodium62/keymaps/default/keymap.c

@@ -15,13 +15,6 @@
  */
 #include QMK_KEYBOARD_H
 
-enum custom_layers {
-    _BASE,
-    _L1,
-    _L2,
-    _L3,
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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,

keyboards/nacly/sodium62/sodium62.c

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