Merge remote-tracking branch 'upstream/develop'

5 files changed, 30 insertions, 42 deletions

diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h
index 246ef019a4..e81c5f4913 100644
--- a/keyboards/kingly_keys/romac/config.h
+++ b/keyboards/kingly_keys/romac/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 3
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
@@ -13,9 +8,6 @@
 /* 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
 
diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/info.json
index da73cadfb9..1f8b3f4871 100644
--- a/keyboards/kingly_keys/romac/info.json
+++ b/keyboards/kingly_keys/romac/info.json
@@ -8,6 +8,8 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
 	  "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
diff --git a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
index d7ded8f415..670c3e16c7 100644
--- a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
+++ b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
@@ -31,37 +31,37 @@ enum romac_layers {
 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 \
+		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 \
+		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  \
+		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  \
+		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  \
+		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/jarred/keymap.c b/keyboards/kingly_keys/romac/keymaps/jarred/keymap.c
index 472e99004f..0ab492fa43 100644
--- a/keyboards/kingly_keys/romac/keymaps/jarred/keymap.c
+++ b/keyboards/kingly_keys/romac/keymaps/jarred/keymap.c
@@ -22,16 +22,16 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT(
-		KC_7, KC_8, KC_9, \
-		KC_4, KC_5, KC_6, \
-		KC_1, KC_2, KC_3, \
-		LT(_FN1, KC_0), KC_ENT, KC_DOT \
+		KC_7, KC_8, KC_9,
+		KC_4, KC_5, KC_6,
+		KC_1, KC_2, KC_3,
+		LT(_FN1, KC_0), KC_ENT, KC_DOT
 	),
   
 	[_FN1] = LAYOUT(
-		KC_HOME, KC_UP  , KC_PGUP , \
-		KC_LEFT, KC_DOWN, KC_RIGHT, \
-		KC_END , KC_BSPC, KC_PGDN , \
-		KC_TRNS, XXXXXXX, KC_DEL    \
+		KC_HOME, KC_UP  , KC_PGUP ,
+		KC_LEFT, KC_DOWN, KC_RIGHT,
+		KC_END , KC_BSPC, KC_PGDN ,
+		KC_TRNS, XXXXXXX, KC_DEL
 	)
 };
diff --git a/keyboards/kingly_keys/romac/rules.mk b/keyboards/kingly_keys/romac/rules.mk
index 40d08b7731..5e7b5aadb5 100644
--- a/keyboards/kingly_keys/romac/rules.mk
+++ b/keyboards/kingly_keys/romac/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #