Merge upstream master

3 files changed, 290 insertions, 0 deletions

diff --git a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
new file mode 100644
index 0000000000..19196db763
--- /dev/null
+++ b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,115 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │Hom│Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│ BsPc│
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │PgU│HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │" '│   Enter│
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │PgD│Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ ↑Shft│
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │End│Ctrl│Opt│Cmd │        Space-Raise        │←Cmd│↓Lw│→Opt│
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+[_BASE] = LAYOUT_base_kit_all( \
+    KC_HOME, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_BSPC, \
+    KC_PGUP, HY_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, XXXXXXX, KC_ENT,  \
+    KC_PGDN, KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, UP_RSFT, \
+    KC_END,  KC_LCTL, KC_LOPT, KC_LCMD,              XXXXXXX,         SPC_RAI,                XXXXXXX, LFT_CMD, DWN_LWR, RGT_OPT  \
+),
+
+/* Lower
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │Nxt│Del  │BrD│BrU│Msn│LHP│   │   │   │   │   │ ↑ │Mut│ SlpD│
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │VlU│HyCaps│   │   │NxW│PvT│Bck│Fwd│NxT│   │ ← │ → │    Play│
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │VlD│        │   │   │   │1PX│1Ps│   │   │   │ ↓ │   │      │
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │Prv│    │   │    │                           │    │   │    │
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+[_LOWER] = LAYOUT_base_kit_all( \
+    KC_MNXT, KC_DEL,  KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
+    KC_VOLU, HY_CAPS, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, KC_LEFT, KC_RGHT, XXXXXXX, KC_MPLY, \
+    KC_VOLD, _______, XXXXXXX, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, KC_DOWN, _______, _______, \
+    KC_MPRV, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, _______, _______, _______  \
+),
+
+/* Raise
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │Nxt│~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│} ]│     │
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │VlU│      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │: ;│        │
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │VlD│        │ F7│ F8│ F9│F10│F11│F12│   │{ [│} ]│| \│ ⇞Shft│
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │Prv│    │   │    │                           │↖︎Cmd│⇟Fn│↘︎Opt│
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+[_RAISE] = LAYOUT_base_kit_all( \
+    KC_MNXT, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_RBRC, _______, \
+    KC_VOLU, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  _______, KC_SCLN, XXXXXXX, _______, \
+    KC_VOLD, _______, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_LBRC, KC_RBRC, KC_BSLS, PGU_SFT, \
+    KC_MPRV, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, HOM_CMD, PGD_LWR, END_OPT  \
+),
+
+/* Adjust
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │Make │   │   │EEP│RST│   │   │   │   │   │   │   │     │
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │   │      │   │   │   │   │   │   │   │   │   │   │        │
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │   │        │   │   │   │   │   │   │   │   │   │   │      │
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │   │    │   │    │                           │    │   │    │
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+[_ADJUST] = LAYOUT_base_kit_all( \
+    _______, QM_MAKE, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \
+    _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, _______, _______, _______  \
+),
+
+/* Blank layer
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │     │   │   │   │   │   │   │   │   │   │   │   │     │
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │   │      │   │   │   │   │   │   │   │   │   │   │        │
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │   │        │   │   │   │   │   │   │   │   │   │   │      │
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │   │    │   │    │                           │    │   │    │
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+/*
+[_BLANK] = LAYOUT_base_kit_all( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \
+    _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, _______, _______, _______  \
+),
+*/
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h
new file mode 100644
index 0000000000..b2b5d77c83
--- /dev/null
+++ b/keyboards/the_royal/schwann/config.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+#define MATRIX_ROW_PINS { F0, F1, F6, C7 }
+#define MATRIX_COL_PINS { F4, F5, D5, D3, D2, C6, B6, B5, B4, D7, D6, D1 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN B3
+#define RGBLED_NUM 8    // Number of LEDs
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 6
+#define RGBLIGHT_SAT_STEP 4
+#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/the_royal/schwann/keymaps/default/keymap.c b/keyboards/the_royal/schwann/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1535e3dc1f
--- /dev/null
+++ b/keyboards/the_royal/schwann/keymaps/default/keymap.c
@@ -0,0 +1,136 @@
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _OTHER
+};
+
+enum schwann_keycodes {
+  QWERTY = SAFE_RANGE,
+  LOWER,
+  RAISE
+};
+
+//Tap Dance Declarations
+enum {
+  TD_RST
+};
+
+void dance_rst_reset (qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count >= 2) {
+    reset_keyboard();
+    reset_tap_dance(state);
+  }
+}
+
+//All tap dance functions would go here. Only showing this one.
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_RST] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, NULL, dance_rst_reset)
+};
+
+
+#define XXXXX KC_TRNS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Default Layer
+   * ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+   * │Tab │ Q  │ W  │ E  │ R  │ T  │ Y  │ U  │ I  │ O  │ P  │BkSp│
+   * ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+   * │LCtl│ A  │ S  │ D  │ F  │ G  │ H  │ J  │ K  │ L  │ ;  │ '  │
+   * ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+   * │LSft│ Z  │ X  │ C  │ V  │ B  │ N  │ M  │ ,  │ .  │ /  │Entr│
+   * └────┼────┼────┼────┼────┼────┴────┼────┼────┼────┼────┼────┘
+   *      │Del │Gui │Alt │Lwr │         │Rse │Alt │Menu│Ctrl│
+   *      └────┴────┴────┴────┴─────────┴────┴────┴────┴────┘
+   */
+
+  [_QWERTY] = LAYOUT_mit(
+    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_BSPC,
+    KC_LCTL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,
+    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_ENT,
+              KC_DEL,  KC_LGUI, KC_LALT, LOWER,     KC_SPACE,       RAISE,   KC_RALT,  KC_MENU,  KC_RCTL
+  ),
+
+  /* Lower Layer
+   * ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+   * │Esc │ 1  │ 2  │ 3  │ 4  │ 5  │ 6  │ 7  │ 8  │ 9  │ 0  │    │
+   * ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+   * │ ~  │ !  │ @  │ #  │ $  │ %  │ ^  │ &  │ *  │ (  │ )  │ "  │
+   * ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+   * │    │    │    │    │    │    │    │    │ `  │ [  │ ]  │ .  │
+   * └────┼────┼────┼────┼────┼────┴────┼────┼────┼────┼────┼────┘
+   *      │    │    │    │    │         │    │    │    │    │
+   *      └────┴────┴────┴────┴─────────┴────┴────┴────┴────┘
+   */
+  [_LOWER] = LAYOUT_mit(
+    KC_ESC,     KC_1,      KC_2,      KC_3,      KC_4,      KC_5,      KC_6,      KC_7,     KC_8,     KC_9,     KC_0,     _______,
+    KC_TILD,    KC_EXLM,   KC_AT,     KC_HASH,   KC_DLR,    KC_PERC,   KC_CIRC,   KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_DQT,
+    _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,  KC_GRAVE, KC_LBRC,  KC_RBRC,  KC_DOT,
+                _______,   _______,   _______,   _______,         _______,        _______,  _______,  _______,  _______
+  ),
+
+  /* Raise Layer
+   * ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+   * │    │    │    │    │    │    │    │    │    │    │ -  │    │
+   * ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+   * │CAPS│    │    │    │    │    │    │    │    │    │ _  │ \  │
+   * ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+   * │PrSc│    │    │    │    │    │    │    │    │ UP │    │ =  │
+   * └────┼────┼────┼────┼────┼────┴────┼────┼────┼────┼────┼────┘
+   *      │    │    │    │    │         │    │Left│Down│Rght│
+   *      └────┴────┴────┴────┴─────────┴────┴────┴────┴────┘
+   */
+  [_RAISE] = LAYOUT_mit(
+    _______,    _______,   _______,    _______,   _______,   _______,   _______,   _______,  _______,  _______,  KC_MINS,  _______,
+    KC_CAPS,    _______,   _______,    _______,   _______,   _______,   _______,   _______,  _______,  _______,  KC_UNDS,  KC_BSLS,
+    KC_PSCR,    _______,   _______,    _______,   _______,   _______,   _______,   _______,  _______,   KC_UP,   _______,  KC_EQUAL,
+                 _______,   _______,    _______,   _______,         _______,       _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT
+),
+
+  /* Other Layer
+   * ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+   * │RSET│    │    │    │    │    │    │    │    │SAT+│Hue+│Brt+│
+   * ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+   * │    │    │    │    │    │    │    │    │    │SAT-│Hue-│Brt-│
+   * ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+   * │    │    │    │    │    │    │    │    │    │    │    │RGB!│
+   * └────┼────┼────┼────┼────┼────┴────┼────┼────┼────┼────┼────┘
+   *      │    │    │    │    │         │    │    │    │    │
+   *      └────┴────┴────┴────┴─────────┴────┴────┴────┴────┘
+   */
+  [_OTHER] = LAYOUT_mit(
+    TD(TD_RST), _______,   _______,    _______,   _______,   _______,   _______,   _______,  _______,  RGB_SAI,  RGB_HUI,  RGB_VAI,
+    _______,    _______,   _______,    _______,   _______,   _______,   _______,   _______,  _______,  RGB_SAD,  RGB_HUD,  RGB_VAD,
+    _______,    _______,   _______,    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  RGB_MOD,
+                _______,   _______,    _______,   _______,         _______,        _______,  _______,  _______,  _______
+  )
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _OTHER);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _OTHER);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _OTHER);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _OTHER);
+      }
+      return false;
+      break;
+  }
+  return true;
+};