Merge remote-tracking branch 'upstream/develop'

9 files changed, 15 insertions, 48 deletions

diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h
index 84c71b0195..0bcd052fed 100644
--- a/keyboards/superuser/ext/config.h
+++ b/keyboards/superuser/ext/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 19
 
 /*
  * Keyboard Matrix Assignments
@@ -38,8 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-#define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json
index d19f1e524d..57d4ccbb18 100644
--- a/keyboards/superuser/ext/info.json
+++ b/keyboards/superuser/ext/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4558",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
     "layout_aliases": {
         "LAYOUT_tkl": "LAYOUT_all"
     },
diff --git a/keyboards/superuser/ext/rules.mk b/keyboards/superuser/ext/rules.mk
index 4fdac83bca..58cb1ddd55 100644
--- a/keyboards/superuser/ext/rules.mk
+++ b/keyboards/superuser/ext/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h
index 021cb0f57d..607133eaf8 100644
--- a/keyboards/superuser/frl/config.h
+++ b/keyboards/superuser/frl/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
 
 /*
  * Keyboard Matrix Assignments
@@ -38,8 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-#define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/info.json
index 5a01d0a39d..14c7b1e54f 100644
--- a/keyboards/superuser/frl/info.json
+++ b/keyboards/superuser/frl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4652",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
     "layouts": {
         "LAYOUT_tkl": {
             "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Bksp", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"End", "x":16.25, "y":1}, {"label":"PgDn", "x":17.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
diff --git a/keyboards/superuser/frl/rules.mk b/keyboards/superuser/frl/rules.mk
index 4fdac83bca..58cb1ddd55 100644
--- a/keyboards/superuser/frl/rules.mk
+++ b/keyboards/superuser/frl/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h
index 768cd26fa6..665276c79d 100644
--- a/keyboards/superuser/tkl/config.h
+++ b/keyboards/superuser/tkl/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
 
 /*
  * Keyboard Matrix Assignments
@@ -38,8 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-#define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/info.json
index ff8a6b7895..6e94c7a28e 100644
--- a/keyboards/superuser/tkl/info.json
+++ b/keyboards/superuser/tkl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x544B",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
     "layout_aliases": {
         "LAYOUT_tkl": "LAYOUT_all"
     },
diff --git a/keyboards/superuser/tkl/rules.mk b/keyboards/superuser/tkl/rules.mk
index 4fdac83bca..58cb1ddd55 100644
--- a/keyboards/superuser/tkl/rules.mk
+++ b/keyboards/superuser/tkl/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #