Merge remote-tracking branch 'upstream/develop'

9 files changed, 24 insertions, 67 deletions

diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 151c74bc37..eb01b1ad13 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -13,13 +13,8 @@
  * 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 "config_common.h"
 
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-#define DIRECT_PINS {{B13, B15, B3, B5}, {B12, B14, A13, B7}}
+#pragma once
 
 #define RGBLED_NUM 42
 #define RGB_MATRIX_LED_COUNT 42
@@ -93,11 +88,4 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define WAIT_FOR_USB
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 3
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index bac03b43f1..5bb1cc5ee8 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -8,18 +8,27 @@
     "pid": "0xA372",
     "device_version": "0.0.2"
   },
+  "processor": "STM32F072",
+  "bootloader": "stm32-dfu",
+  "matrix_pins": {
+    "direct": [
+      ["B13", "B15", "B3", "B5"],
+      ["B12", "B14", "A13", "B7"]
+    ]
+  },
+  "debounce": 3,
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [
-        {"label": "K0", "x": 0, "y": 0},
-        {"label": "K1", "x": 1, "y": 0},
-        {"label": "K2", "x": 2, "y": 0},
-        {"label": "K3", "x": 3, "y": 0},
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 3, "y": 0, "matrix": [0, 3]},
 
-        {"label": "K4", "x": 0, "y": 1},
-        {"label": "K5", "x": 1, "y": 1},
-        {"label": "K6", "x": 2, "y": 1},
-        {"label": "K7", "x": 3, "y": 1}
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 3, "y": 1, "matrix": [1, 3]}
       ]
     }
   }
diff --git a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
index b0e5b9327d..4e6655c23c 100644
--- a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
+++ b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
@@ -20,12 +20,12 @@ bool is_alt_tab_active = false;
 uint16_t alt_tab_timer = 0;
 
 enum custom_keycodes {
-  ALT_TAB = USER00,
+  ALT_TAB = QK_KB_0,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho_2x4(
-        LT(1, KC_MUTE), KC_VOLD, KC_VOLU, MACRO00,
+        LT(1, KC_MUTE), KC_VOLD, KC_VOLU, MC_0,
         ALT_TAB,        KC_MPRV, KC_MNXT, KC_MPLY
     ),
     [1] = LAYOUT_ortho_2x4(
diff --git a/keyboards/geekboards/macropad_v2/macropad_v2.c b/keyboards/geekboards/macropad_v2/macropad_v2.c
index df8581cc58..191290d3fa 100644
--- a/keyboards/geekboards/macropad_v2/macropad_v2.c
+++ b/keyboards/geekboards/macropad_v2/macropad_v2.c
@@ -13,7 +13,7 @@
  * 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 "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/geekboards/macropad_v2/macropad_v2.h b/keyboards/geekboards/macropad_v2/macropad_v2.h
deleted file mode 100644
index 7fe684deb7..0000000000
--- a/keyboards/geekboards/macropad_v2/macropad_v2.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
- *
- * 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/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13  \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 } \
-}
diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk
index 4aa4ccfdef..f81c11eb7d 100644
--- a/keyboards/geekboards/macropad_v2/rules.mk
+++ b/keyboards/geekboards/macropad_v2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index c8f3aa4977..0a184388ae 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include "config_common.h"
-
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
 
 #define MATRIX_ROW_PINS { B0, D4}
 #define MATRIX_COL_PINS { F7, F6, D2, D3}
@@ -12,7 +8,6 @@
 #define LOCKING_SUPPORT_ENABL
 #define LOCKING_RESYNC_ENABLE
 
-#define DEBOUNCE 3
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index 2da610fb3f..fdc0463e41 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1319",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "debounce": 3,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/geekboards/tester/rules.mk b/keyboards/geekboards/tester/rules.mk
index 923f1f383c..e17c577cc4 100644
--- a/keyboards/geekboards/tester/rules.mk
+++ b/keyboards/geekboards/tester/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #