Updated keymaps

Signed-off-by: Ben Ray <ben@rayonline.net>

3 files changed, 65 insertions, 10 deletions

diff --git a/keyboards/geigeigeist/klor/keymaps/brray/config.h b/keyboards/geigeigeist/klor/keymaps/brray/config.h
new file mode 100644
index 0000000..c8c64af
--- /dev/null
+++ b/keyboards/geigeigeist/klor/keymaps/brray/config.h
@@ -0,0 +1 @@
+#define AUTO_SHIFT_REPEAT
diff --git a/keyboards/geigeigeist/klor/keymaps/brray/keymap.c b/keyboards/geigeigeist/klor/keymaps/brray/keymap.c
index 7d5b971..3948533 100644
--- a/keyboards/geigeigeist/klor/keymaps/brray/keymap.c
+++ b/keyboards/geigeigeist/klor/keymaps/brray/keymap.c
@@ -6,6 +6,13 @@
 enum layers {
     _QWERTY = 0,
     _LOWER,
+    _RAISE,
+    _ADJUST,
+    _DVORAK,
+};
+
+const char *layer_names[] = {
+    "Default Q", "Lower", "Raise", "Adjust", "Default D",
 };
 
 /* THIS FILE WAS GENERATED!
@@ -15,18 +22,42 @@ enum layers {
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(_LOWER), KC_MUTE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_TRNS, KC_SPC, KC_LALT, KC_LGUI, KC_ENT, KC_TRNS, KC_BSPC),
-    [1] = LAYOUT(KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TAB, QK_BOOT, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, QK_BOOT, KC_QUOT, KC_DEL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_MPLY, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_TRNS, KC_SPC, KC_LALT, KC_LGUI, KC_ENT, KC_TRNS, KC_BSPC)
+    // clang-format off
+    [_QWERTY] = LAYOUT(
+             KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                            KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    QK_GESC, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_MUTE, KC_MPLY,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+                      KC_LCTL, TL_LOWR, KC_LGUI, KC_ENT,                          KC_SPC,  KC_BSPC, TL_UPPR, KC_RALT
+    ),
+    [_LOWER] = LAYOUT(
+             KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_MINS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
+    QK_BOOT, _______, _______, KC_LPRN, KC_RPRN, KC_BSLS,    _______, _______,    KC_PIPE, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______,
+                      _______, _______, _______, _______,                         _______, _______, _______, _______
+    ),
+    [_RAISE] = LAYOUT(
+             KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,    _______, _______,    _______, _______, _______, _______, _______, _______,
+                      _______, _______, _______, _______,                         _______, _______, _______, _______
+    ),
+    [_ADJUST] = LAYOUT(
+             _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,    _______, _______,    _______, _______, _______, _______, _______, _______,
+                      _______, _______, _______, _______,                         _______, _______, _______, _______
+    ),
+    // clang-format on
 };
 
-
 #ifdef OLED_ENABLE
-#include "ornl_logo.h"
-#include "status.h"
+#    include "ornl_logo.h"
+#    include "status.h"
+
 bool oled_task_user(void) {
     // Host Keyboard Layer Status
+    oled_clear();
     if (is_keyboard_master()) {
-        oled_write_P(PSTR("Layer: "), false);
         switch (get_highest_layer(layer_state)) {
             case _QWERTY:
                 oled_write_P(PSTR("Default\n"), false);
@@ -34,12 +65,18 @@ bool oled_task_user(void) {
             case _LOWER:
                 oled_write_P(PSTR("Lower\n"), false);
                 break;
+            case _RAISE:
+                oled_write_P(PSTR("Raise\n"), false);
+                break;
+            case _ADJUST:
+                oled_write_P(PSTR("Adjust\n"), false);
+                break;
             default:
                 // Or use the write_ln shortcut over adding '\n' to the end of your string
                 oled_write_ln_P(PSTR("Undefined"), false);
         }
-
-        oled_write_ln_P(sep_v, false);
+        oled_write_P(sep_v, false);
+        oled_write_ln_P(PSTR("test"), false);
         // Host Keyboard LED Status
         led_t led_state = host_keyboard_led_state();
         oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
@@ -51,10 +88,24 @@ bool oled_task_user(void) {
 
     return false;
 }
+
+void oled_render_boot(bool bootloader) {
+    oled_clear();
+    if (bootloader) {
+        oled_write_P(PSTR("Awaiting New Firmware "), false);
+    } else {
+        oled_write_P(PSTR("Rebooting "), false);
+    }
+
+    oled_render_dirty(true);
+}
+
+bool shutdown_user(bool jump_to_bootloader) {
+    oled_render_boot(jump_to_bootloader);
+    return true;
+}
 #endif
 
 #ifdef OTHER_KEYMAP_C
 #    include OTHER_KEYMAP_C
 #endif // OTHER_KEYMAP_C
-
-
diff --git a/keyboards/geigeigeist/klor/keymaps/brray/rules.mk b/keyboards/geigeigeist/klor/keymaps/brray/rules.mk
index 982c581..f1c94fc 100644
--- a/keyboards/geigeigeist/klor/keymaps/brray/rules.mk
+++ b/keyboards/geigeigeist/klor/keymaps/brray/rules.mk
@@ -1 +1,4 @@
+AUTO_SHIFT_ENABLE = yes
 CONVERT_TO = kb2040
+OS_DETECTION_ENABLE = yes
+TRI_LAYER_ENABLE = yes