[Keymap] Xulkal changes (#6075)

3 files changed, 82 insertions, 1 deletions

diff --git a/keyboards/helix/rev2/keymaps/xulkal/keymap.c b/keyboards/helix/rev2/keymaps/xulkal/keymap.c
new file mode 100644
index 0000000000..3fad64deac
--- /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 0000000000..a636b2a619
--- /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 09c27428ec..e51edd9071 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
 };
+