[Keymap] Xulkal changes (#6075)

6 files changed, 215 insertions, 38 deletions

diff --git a/keyboards/helix/rev2/keymaps/xulkal/keymap.c b/keyboards/helix/rev2/keymaps/xulkal/keymap.c
new file mode 100644
index 000000000..3fad64dea
--- /dev/null
+++ b/keyboards/helix/rev2/keymaps/xulkal/keymap.c
@@ -0,0 +1,69 @@
+#include QMK_KEYBOARD_H
+#include "xulkal.h"
+
+#ifdef PROTOCOL_LUFA
+#include "lufa.h"
+#include "split_util.h"
+#endif
+
+#define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Qwerty
+   * ,-----------------------------------------.             ,-----------------------------------------.
+   * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | BkSp |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |   \  |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |FN(CAPS)| A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  | Enter|
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * | Sft[ |   Z  |   X  |   C  |   V  |   B  |RGBTOG|RGBRST|   N  |   M  |   ,  |   .  |   /  | Sft] |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * | Ctl- |  Win | LOWER| RAISE| Alt  | Space|RGBRMOD|RGBMOD|Space| Left |  Up  | Down | Right| Ctl= |
+   * `-------------------------------------------------------------------------------------------------'
+   */
+  [_QWERTY] = EXPAND_LAYOUT( \
+      _________________QWERTY_L1_________________,                      _________________QWERTY_R1_________________, \
+      _________________QWERTY_L2_________________,                      _________________QWERTY_R2_________________, \
+      _________________QWERTY_L3_________________,                      _________________QWERTY_R3_________________, \
+      _________________QWERTY_L4_________________,  RGB_TOG,  RGBRST,   _________________QWERTY_R4_________________, \
+      _________________QWERTY_L5_________________,  RGB_RMOD, RGB_MOD,  _________________QWERTY_R5_________________ \
+  ),
+
+#ifndef GAMELAYER_DISABLE
+  [_GAME] = EXPAND_LAYOUT( \
+      ___________________GAME_L1_________________,                      ___________________GAME_R1_________________, \
+      ___________________GAME_L2_________________,                      ___________________GAME_R2_________________, \
+      ___________________GAME_L3_________________,                      ___________________GAME_R3_________________, \
+      ___________________GAME_L4_________________,  RGB_TOG,  RGBRST,   ___________________GAME_R4_________________, \
+      ___________________GAME_L5_________________,  RGB_RMOD, RGB_MOD,  ___________________GAME_R5_________________ \
+  ),
+#endif
+
+  [_LOWER] = EXPAND_LAYOUT( \
+      __________________LOWER_L1_________________,                      __________________LOWER_R1_________________, \
+      __________________LOWER_L2_________________,                      __________________LOWER_R2_________________, \
+      __________________LOWER_L3_________________,                      __________________LOWER_R3_________________, \
+      __________________LOWER_L4_________________,  _______,  _______,  __________________LOWER_R4_________________, \
+      __________________LOWER_L5_________________,  _______,  _______,  __________________LOWER_R5_________________ \
+  ),
+
+  [_RAISE] = EXPAND_LAYOUT( \
+      __________________RAISE_L1_________________,                      __________________RAISE_R1_________________, \
+      __________________RAISE_L2_________________,                      __________________RAISE_R2_________________, \
+      __________________RAISE_L3_________________,                      __________________RAISE_R3_________________, \
+      __________________RAISE_L4_________________,  _______,  _______,  __________________RAISE_R4_________________, \
+      __________________RAISE_L5_________________,  _______,  _______,  __________________RAISE_R5_________________ \
+  ),
+
+#ifdef TRILAYER_ENABLED
+  [_ADJUST] = EXPAND_LAYOUT( \
+      _________________ADJUST_L1_________________,                      _________________ADJUST_R1_________________, \
+      _________________ADJUST_L2_________________,                      _________________ADJUST_R2_________________, \
+      _________________ADJUST_L3_________________,                      _________________ADJUST_R3_________________, \
+      _________________ADJUST_L4_________________,  _______,  _______,  _________________ADJUST_R4_________________, \
+      _________________ADJUST_L5_________________,  _______,  _______,  _________________ADJUST_R5_________________ \
+  ),
+#endif
+};
diff --git a/keyboards/helix/rev2/keymaps/xulkal/rules.mk b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
new file mode 100644
index 000000000..a636b2a61
--- /dev/null
+++ b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
@@ -0,0 +1,11 @@
+RGBLIGHT_ENABLE = yes
+# Enable RGBLIGHT Animations
+OPT_DEFS += -DRGBLIGHT_ANIMATIONS
+# Helix specific define for correct RGBLED_NUM
+OPT_DEFS += -DRGBLED_BACK
+
+OLED_DRIVER_ENABLE = yes
+# Helix specific font file
+OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
+# Xulkal specific oled define
+OPT_DEFS += -DOLED_90ROTATION
diff --git a/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c b/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c
index 09c27428e..e51edd907 100644
--- a/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 #ifdef TRILAYER_ENABLED
-  [_RAISE] = EXPAND_LAYOUT( \
+  [_ADJUST] = EXPAND_LAYOUT( \
     _________________ADJUST_L1_________________, _______, _______, _________________ADJUST_R1_________________, \
     _________________ADJUST_L2_________________, _______, _______, _________________ADJUST_R2_________________, \
     _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________, \
@@ -75,3 +75,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 #endif
 };
+
diff --git a/users/xulkal/custom_oled.c b/users/xulkal/custom_oled.c
index 77e580b95..d871e96f0 100644
--- a/users/xulkal/custom_oled.c
+++ b/users/xulkal/custom_oled.c
@@ -5,60 +5,112 @@
 
 #ifdef OLED_DRIVER_ENABLE
 
+#ifdef RGBLIGHT_ENABLE
+rgblight_config_t rgblight_config;
+#endif
+
 static void render_logo(void)
 {
-    static const char PROGMEM sol_logo[] = {
+    static const char PROGMEM font_logo[] = {
         0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
         0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
         0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-    oled_write_P(sol_logo, false);
+    oled_write_P(font_logo, false);
+}
+
+#if defined(OLED_90ROTATION)
+
+// TODO: Need to define this function / extern only for helix based split common keyboards
+extern uint8_t is_master;
+bool is_keyboard_master(void)
+{
+    return is_master;
+}
+
+static void render_layer(uint8_t layer)
+{
+    switch (layer)
+    {
+        case _QWERTY:
+            oled_write_P(PSTR("DFLT "), false);
+            break;
+#ifndef GAMELAYER_DISABLE
+        case _GAME:
+            oled_write_P(PSTR("GAME "), false);
+            break;
+#endif
+        case _LOWER:
+            oled_write_P(PSTR("LOWER"), false);
+            break;
+        case _RAISE:
+            oled_write_P(PSTR("RAISE"), false);
+            break;
+#ifdef TRILAYER_ENABLED
+        case _ADJUST:
+            oled_write_P(PSTR("ADJST"), false);
+            break;
+#endif
+    }
 }
 
 static void render_status(void)
 {
     // Render to mode icon
-    static const char PROGMEM mode_logo[2][3] = {
-        {0x97,0x98,0},
-        {0xb7,0xb8,0}
-    };
+    static const char PROGMEM mode_logo[2][4] = {
+        {0x97,0x98,0x0a,0},
+        {0xb7,0xb8,0x0a,0} };
 
     oled_write_P(mode_logo[0], false);
+    oled_write_P(mode_logo[1], false);
 
-#if defined(RGB_MATRIX_ENABLE)
-    static char buffer[20] = {0};
-    snprintf(buffer, sizeof(buffer), "    h%3d s%3d v%3d\n", rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val);
-    oled_write(buffer, false);
-#endif
+    oled_write_P(PSTR("Layer"), false);
+    uint8_t layer = biton(layer_state);
+    if (layer != _QWERTY)
+        render_layer(layer);
+    else
+        render_layer(biton32(default_layer_state));
 
-    oled_write_P(mode_logo[1], false);
+    // Host Keyboard LED Status
+    uint8_t led_usb_state = host_keyboard_leds();
+    oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("-----NUMLK") : PSTR("-----     "), false);
+    oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPLK") : PSTR("     "), false);
+    oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : PSTR("     "), false);
 
 #if defined(RGB_MATRIX_ENABLE)
-    snprintf(buffer, sizeof(buffer), "         s%3d m%3d\n", rgb_matrix_config.speed, rgb_matrix_config.mode);
+    oled_set_cursor(0, oled_max_lines() - 7);
+    oled_write_P(PSTR("-----"), false);
+    static char buffer[26] = {0};
+    snprintf(buffer, sizeof(buffer), "h%3d s%3d v%3d s%3d m%3d\n", rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val, rgb_matrix_config.speed, rgb_matrix_config.mode);
+    oled_write(buffer, false);
+#elif defined(RGBLIGHT_ENABLE)
+    oled_set_cursor(0, oled_max_lines() - 7);
+    oled_write_P(PSTR("-----"), false);
+    static char buffer[31] = {0};
+    snprintf(buffer, sizeof(buffer), "h%3d s%3d v%3d s%3d m%3d\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val, rgblight_config.speed, rgblight_config.mode);
     oled_write(buffer, false);
 #endif
+}
 
-    // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-    oled_write_P(PSTR("Layer: "), false);
-    switch (biton32(layer_state))
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (is_keyboard_master())
+    return OLED_ROTATION_270;
+  return OLED_ROTATION_180;
+}
+
+#else  // OLED_90ROTATION
+
+static void render_layer(uint8_t layer)
+{
+    switch (layer)
     {
         case _QWERTY:
-#ifndef GAMELAYER_DISABLE
-            switch (biton32(default_layer_state))
-            {
-                case _QWERTY:
-                    oled_write_P(PSTR("Default\n"), false);
-                    break;
-                case _GAME:
-                    oled_write_P(PSTR("Game\n"), false);
-                    break;
-                default:
-                    oled_write_P(PSTR("Undefined\n"), false);
-                    break;
-            }
-#else
             oled_write_P(PSTR("Default\n"), false);
-#endif
             break;
+#ifndef GAMELAYER_DISABLE
+        case _GAME:
+            oled_write_P(PSTR("Game\n"), false);
+            break;
+#endif
         case _LOWER:
             oled_write_P(PSTR("Lower\n"), false);
             break;
@@ -70,18 +122,60 @@ static void render_status(void)
             oled_write_P(PSTR("Adjust\n"), false);
             break;
 #endif
-        default:
-            oled_write_P(PSTR("Undefined\n"), false);
-            break;
-  }
+    }
+}
+
+static void render_status(void)
+{
+    // Render to mode icon
+    static const char PROGMEM mode_logo[2][3] = {
+        {0x97,0x98,0},
+        {0xb7,0xb8,0}
+    };
+
+    oled_write_P(mode_logo[0], false);
+
+#if defined(RGB_MATRIX_ENABLE)
+    static char buffer[20] = {0};
+    snprintf(buffer, sizeof(buffer), "    h%3d s%3d v%3d\n", rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val);
+    oled_write(buffer, false);
+#elif defined(RGBLIGHT_ENABLE)
+    static char buffer[20] = {0};
+    snprintf(buffer, sizeof(buffer), "    h%3d s%3d v%3d\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
+    oled_write(buffer, false);
+#else
+    oled_write_P(PSTR("\n"));
+#endif
+
+    oled_write_P(mode_logo[1], false);
+
+#if defined(RGB_MATRIX_ENABLE)
+    snprintf(buffer, sizeof(buffer), "         s%3d m%3d\n", rgb_matrix_config.speed, rgb_matrix_config.mode);
+    oled_write(buffer, false);
+#elif defined(RGBLIGHT_ENABLE)
+    snprintf(buffer, sizeof(buffer), "         s%3d m%3d\n", rgblight_config.speed, rgblight_config.mode);
+    oled_write(buffer, false);
+#else
+    oled_write_P(PSTR("\n"));
+#endif
 
-  // Host Keyboard LED Status
+    // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
+    oled_write_P(PSTR("Layer: "), false);
+    uint8_t layer = biton(layer_state);
+    if (layer != _QWERTY)
+        render_layer(layer);
+    else
+        render_layer(biton32(default_layer_state));
+
+    // Host Keyboard LED Status
     uint8_t led_usb_state = host_keyboard_leds();
     oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR("       "), false);
     oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR("       "), false);
     oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR("       "), false);
 }
 
+#endif // OLED_90ROTATION
+
 void oled_task_user(void)
 {
     if (is_keyboard_master())
diff --git a/users/xulkal/custom_tap_dance.c b/users/xulkal/custom_tap_dance.c
index a1c644efd..7123f1be6 100644
--- a/users/xulkal/custom_tap_dance.c
+++ b/users/xulkal/custom_tap_dance.c
@@ -8,7 +8,8 @@
 qk_tap_dance_action_t tap_dance_actions[] = {
   [COMM_QUOT]  = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_QUOT),
   [BACKSPACE] = ACTION_TAP_DANCE_DOUBLE (KC_BSPACE, LCTL(KC_BSPACE)),
-  [DELETE] = ACTION_TAP_DANCE_DOUBLE (KC_DELETE, LCTL(KC_DELETE))
+  [DELETE] = ACTION_TAP_DANCE_DOUBLE (KC_DELETE, LCTL(KC_DELETE)),
+  [DOT] = ACTION_TAP_DANCE_DOUBLE (KC_DOT, KC_GRAVE)
 };
 
 #else
diff --git a/users/xulkal/rules.mk b/users/xulkal/rules.mk
index 50dc75d61..ab0231d7d 100644
--- a/users/xulkal/rules.mk
+++ b/users/xulkal/rules.mk
@@ -8,6 +8,7 @@ SRC += xulkal.c \
 # Some usual defaults
 MOUSEKEY_ENABLE         = no    # Mouse keys (+4700)
 EXTRAKEY_ENABLE         = yes   # Audio control and System control (+450)
+TAP_DANCE_ENABLE        = yes
 
 ifneq ($(strip $(DISABLE_LTO)), yes)
   EXTRAFLAGS += -flto