Merge remote-tracking branch 'upstream/develop'

8 files changed, 7 insertions, 29 deletions

diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h
index e48ac999db..68655d9d8f 100644
--- a/keyboards/creatkeebs/glacier/config.h
+++ b/keyboards/creatkeebs/glacier/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F1, F4, E6, F5, D0 }
@@ -29,9 +24,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/creatkeebs/glacier/info.json b/keyboards/creatkeebs/glacier/info.json
index 3c81d34267..227adcbea2 100644
--- a/keyboards/creatkeebs/glacier/info.json
+++ b/keyboards/creatkeebs/glacier/info.json
@@ -8,9 +8,12 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan"
     },
+    "community_layouts": ["tkl_f13_ansi_tsangan"],
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
diff --git a/keyboards/creatkeebs/glacier/readme.md b/keyboards/creatkeebs/glacier/readme.md
index 0a38629863..0f13b6857d 100644
--- a/keyboards/creatkeebs/glacier/readme.md
+++ b/keyboards/creatkeebs/glacier/readme.md
@@ -16,7 +16,7 @@ A 80% keyboard
 
 Enter the bootloader in 2 ways:
 
-* Physical reset button: Press the `QK_BOOT` button on the back of the PCB.
+* Physical reset button: Press the `RESET` button on the back of the PCB.
 * Keycode in layout: Press the key mapped to `QK_BOOT` if it is available.
 
 ### Building the Firmware
diff --git a/keyboards/creatkeebs/glacier/rules.mk b/keyboards/creatkeebs/glacier/rules.mk
index 95a02dff26..241d1099ca 100644
--- a/keyboards/creatkeebs/glacier/rules.mk
+++ b/keyboards/creatkeebs/glacier/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
@@ -16,5 +10,3 @@ NKRO_ENABLE = no          # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no     # Enable keyboard backlight functionality
 AUDIO_ENABLE = no         # Enable keyboard RGB underglow
 RGBLIGHT_ENABLE = no      # Audio output
-
-LAYOUTS = tkl_f13_ansi_tsangan
diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h
index 4761d61a34..3a17d73f17 100644
--- a/keyboards/creatkeebs/thera/config.h
+++ b/keyboards/creatkeebs/thera/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B2, B1, B0, E6, B3, B7 }
diff --git a/keyboards/creatkeebs/thera/info.json b/keyboards/creatkeebs/thera/info.json
index 388fc448e0..d30721658f 100644
--- a/keyboards/creatkeebs/thera/info.json
+++ b/keyboards/creatkeebs/thera/info.json
@@ -8,6 +8,8 @@
         "pid": "0x6061",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ansi"
     },
diff --git a/keyboards/creatkeebs/thera/readme.md b/keyboards/creatkeebs/thera/readme.md
index 2f78a154fd..2990f9a3b0 100644
--- a/keyboards/creatkeebs/thera/readme.md
+++ b/keyboards/creatkeebs/thera/readme.md
@@ -18,7 +18,7 @@ A 75% keyboard
 
 Enter the bootloader in 2 ways:
 
-* Physical reset button: Press the `QK_BOOT` button on the back of the PCB.
+* Physical reset button: Press the `RESET` button on the back of the PCB.
 * Keycode in layout: Press the key mapped to `QK_BOOT` if it is available.
 
 ### Building the Firmware
diff --git a/keyboards/creatkeebs/thera/rules.mk b/keyboards/creatkeebs/thera/rules.mk
index 1275531ef6..ab2c49da70 100644
--- a/keyboards/creatkeebs/thera/rules.mk
+++ b/keyboards/creatkeebs/thera/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #