Merge upstream master

2 files changed, 86 insertions, 0 deletions

diff --git a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
new file mode 100644
index 0000000000..d7ded8f415
--- /dev/null
+++ b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2019 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"
+
+enum romac_layers {
+    NUMPAD = 0,
+    FN,
+    NUMLOCK,
+    KARABINER
+};
+
+#define DF_NMPD   DF(NUMPAD)
+#define DF_NMLK   DF(NUMLOCK)
+#undef  DF_KBNR
+#define DF_KBNR   DF(KARABINER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[NUMPAD] = LAYOUT(
+		KC_P7, KC_P8, KC_P9, \
+		KC_P4, KC_P5, KC_P6, \
+		KC_P1, KC_P2, KC_P3, \
+		OSL(FN), KC_P0, KC_PDOT \
+	),
+
+	[FN] = LAYOUT(
+		KC_PSLS, KC_PAST, KC_BSPC, \
+		KC_TRNS, KC_TRNS, KC_PMNS, \
+		DF_NMLK, DF_KBNR, KC_PPLS, \
+		KC_TRNS, TG_ADJT, KC_PENT \
+	),
+
+    [NUMLOCK] = LAYOUT(
+		KC_HOME, KC_UP, KC_PGUP, \
+		KC_LEFT, CMD_TAB, KC_RGHT, \
+		KC_END, KC_DOWN, KC_PGDN, \
+		DF_NMPD, KC_INS, KC_DEL  \
+	),
+
+    [KARABINER] = LAYOUT(
+		KC_F13, KC_F14, KC_F15, \
+		KC_F16, KC_F17, KC_F18, \
+		KC_F19, KC_F20, KC_F21, \
+		LT(_ADJUST,KC_F22), KC_F23, KC_F24  \
+	),
+
+    [_ADJUST] = LAYOUT(
+		QM_MAKE, EE_CLR,  XXXXXXX, \
+		XXXXXXX, XXXXXXX, XXXXXXX, \
+		DF_NMPD, DF_NMLK, DF_KBNR, \
+		KC_TRNS, XXXXXXX, XXXXXXX  \
+	)
+};
diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
new file mode 100644
index 0000000000..41bba326c4
--- /dev/null
+++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
@@ -0,0 +1,19 @@
+#undef RGBLED_NUM
+#define RGBLED_NUM 16
+
+#define RGB_DI_PIN F4
+#ifdef RGB_DI_PIN
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+#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
+#endif