Merge upstream master

2 files changed, 124 insertions, 0 deletions

diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
new file mode 100644
index 0000000000..21209271e1
--- /dev/null
+++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
@@ -0,0 +1,85 @@
+#include QMK_KEYBOARD_H
+#include "kageurufu.h"
+
+#ifdef PROTOCOL_LUFA
+#include "lufa.h"
+#include "split_util.h"
+#endif
+
+#define FN_CAPS  LT(_FN, KC_CAPS)
+
+// Define your non-alpha grouping in this define's LAYOUT, and all your BASE_LAYERS will share the same mod/macro columns
+  /*  / Base Layout \
+   * /-----------------------------------------\  /-----------------------------------------\
+   * | GESC |  1   |  2   |  3   |  4   |  5   |  |  6   |  7   |  8   |  9   |  0   | BkSp |
+   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+   * | Tab  |      |      |      |      |      |  |      |      |      |      |      |   \  |
+   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+   * |FNCAPS|      |      |      |      |      |  |      |      |      |      |      |   '  |
+   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+   * |Shift |      |      |      |      |      |  |      |      |      |      |      |Shift |
+   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
+   * | Ctrl |  Win |  Alt |  RGB | ADJ  | Space|  | Space|  FN  | Left | Down | Up   |Right |
+   * \------+------+------+------+------+------/  \------+------+------+------+------+------/
+   */
+#define EXPAND_LAYOUT(...) LAYOUT_ortho_5x12(__VA_ARGS__)
+#define _BASE_LAYOUT( \
+  _00, _01, _02, _03, _04,  _05, _06, _07, _08, _09, \
+  _10, _11, _12, _13, _14,  _15, _16, _17, _18, _19, \
+  _20, _21, _22, _23, _24,  _25, _26, _27, _28, _29 \
+) \
+EXPAND_LAYOUT( \
+      QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+      KC_TAB,  _00,     _01,     _02,     _03,     _04,    _05,     _06,     _07,     _08,     _09,     KC_BSLS, \
+      FN_CAPS, _10,     _11,     _12,     _13,     _14,    _15,     _16,     _17,     _18,     _19,     KC_QUOT, \
+      KC_LSFT, _20,     _21,     _22,     _23,     _24,    _25,     _26,     _27,     _28,     _29,     KC_ENT, \
+      KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG,  ADJ,    KC_SPC, KC_SPC,  FN,      KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT \
+)
+#define BASE_LAYOUT(...) _BASE_LAYOUT(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = BASE_LAYOUT( \
+    _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, \
+    _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, \
+    _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ \
+  ),
+
+  [_COLEMAK] = BASE_LAYOUT( \
+    _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, \
+    _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, \
+    _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ \
+  ),
+
+  [_FN] = EXPAND_LAYOUT( \
+    ________________FUNCTION_L1________________, ________________FUNCTION_R1________________, \
+    ________________FUNCTION_L2________________, ________________FUNCTION_R2________________, \
+    ________________FUNCTION_L3________________, ________________FUNCTION_R3________________, \
+    ________________FUNCTION_L4________________, ________________FUNCTION_R4________________, \
+    ________________FUNCTION_L5________________, ________________FUNCTION_R5________________ \
+  ),
+
+  [_ADJ] =  EXPAND_LAYOUT( \
+    _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, \
+    _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, \
+    _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, \
+    _________________ADJUST_L4_________________, _________________ADJUST_R4_________________, \
+    _________________ADJUST_L5_________________, _________________ADJUST_R5_________________ \
+  )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  if (index == 0) { /* First encoder */
+    if (clockwise) {
+      tap_code(KC_PGDN);
+    } else {
+      tap_code(KC_PGUP);
+    }
+  } else if (index == 1) { /* Second encoder from slave */
+    if (clockwise) {
+      tap_code(KC_UP);
+    } else {
+      tap_code(KC_DOWN);
+    }
+  }
+    return true;
+}
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
new file mode 100644
index 0000000000..b95d2edaaa
--- /dev/null
+++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
@@ -0,0 +1,39 @@
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in
+#   the appropriate keymap folder that will get included automatically
+#
+
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
+RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
+RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
+RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
+UNICODE_ENABLE = no         # Unicode
+SWAP_HANDS_ENABLE = no      # Enable one-hand typing
+ENCODER_ENABLE = yes        # Enable rotary encoder
+OLED_ENABLE = no     # Enable the OLED Driver
+IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
+
+# Do not edit past here
+
+ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
+    OPT_DEFS += -DIOS_DEVICE_ENABLE
+else ifeq ($(strip $(RGBLIGHT_FULL_POWER)), yes)
+    OPT_DEFS += -DRGBLIGHT_FULL_POWER
+endif
+
+ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
+    OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
+endif
+
+ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
+    OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
+endif
+
+# Link time optimization, should save on firmware size
+LTO_ENABLE = yes