Merge remote-tracking branch 'upstream/develop'

11 files changed, 27 insertions, 74 deletions

diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index 54a301b0d2..de94eab9ba 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -18,19 +18,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 5
-
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* disable action features */
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
@@ -38,10 +25,6 @@
 
 #define USB_MAX_POWER_CONSUMPTION 100
 
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 3
-
 #define ROTATIONAL_TRANSFORM_ANGLE 20
 
 // If board has a debug LED, you can enable it by defining this
diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json
index feb458e1c5..a1f9c53284 100644
--- a/keyboards/ploopyco/trackball/info.json
+++ b/keyboards/ploopyco/trackball/info.json
@@ -8,14 +8,17 @@
         "pid": "0x5442",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 3]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "h":2},
-                {"x":1, "y":0.25, "h":1.5},
-                {"x":2, "y":0, "h":2},
-                {"x":3.5, "y":0, "h":2},
-                {"x":4.5, "y":0, "h":2}
+                {"x":0, "y":0, "h":2, "matrix": [0, 0]},
+                {"x":1, "y":0.25, "h":1.5, "matrix": [0, 1]},
+                {"x":2, "y":0, "h":2, "matrix": [0, 2]},
+                {"x":3.5, "y":0, "h":2, "matrix": [0, 3]},
+                {"x":4.5, "y":0, "h":2, "matrix": [0, 4]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball/keymaps/default/keymap.c b/keyboards/ploopyco/trackball/keymaps/default/keymap.c
index 40f70ab99b..83a4a16847 100644
--- a/keyboards/ploopyco/trackball/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball/keymaps/default/keymap.c
@@ -17,8 +17,6 @@
  */
 #include QMK_KEYBOARD_H
 
-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT( /* Base */
         KC_BTN1, KC_BTN3, KC_BTN2,
diff --git a/keyboards/ploopyco/trackball/rev1/config.h b/keyboards/ploopyco/trackball/rev1/config.h
index 3db085baf2..35ab215341 100644
--- a/keyboards/ploopyco/trackball/rev1/config.h
+++ b/keyboards/ploopyco/trackball/rev1/config.h
@@ -18,21 +18,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define DIRECT_PINS            \
-    {                          \
-        { D4, D2, E6, B5, D7 } \
-    }
-
 // These pins are not broken out, and cannot be used normally.
 // They are set as output and pulled high, by default
 #define UNUSABLE_PINS \
diff --git a/keyboards/ploopyco/trackball/rev1/info.json b/keyboards/ploopyco/trackball/rev1/info.json
new file mode 100644
index 0000000000..8e372e7c2b
--- /dev/null
+++ b/keyboards/ploopyco/trackball/rev1/info.json
@@ -0,0 +1,9 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "D2", "E6", "B5", "D7"]
+        ]
+    }
+}
diff --git a/keyboards/ploopyco/trackball/rev1/rules.mk b/keyboards/ploopyco/trackball/rev1/rules.mk
index 6ded83e74b..e69de29bb2 100644
--- a/keyboards/ploopyco/trackball/rev1/rules.mk
+++ b/keyboards/ploopyco/trackball/rev1/rules.mk
@@ -1,2 +0,0 @@
-# Bootloader selection
-BOOTLOADER = caterina
diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h
index 321e3004d1..fcf51c4c1b 100644
--- a/keyboards/ploopyco/trackball/rev1_005/config.h
+++ b/keyboards/ploopyco/trackball/rev1_005/config.h
@@ -18,21 +18,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define DIRECT_PINS            \
-    {                          \
-        { D4, D2, E6, B6, D7 } \
-    }
-
 // These pins are not broken out, and cannot be used normally.
 // They are set as output and pulled high, by default
 #define UNUSABLE_PINS \
diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json
new file mode 100644
index 0000000000..b963f8842a
--- /dev/null
+++ b/keyboards/ploopyco/trackball/rev1_005/info.json
@@ -0,0 +1,9 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "D2", "E6", "B6", "D7"]
+        ]
+    }
+}
diff --git a/keyboards/ploopyco/trackball/rev1_005/rules.mk b/keyboards/ploopyco/trackball/rev1_005/rules.mk
index bddd4e389e..e69de29bb2 100644
--- a/keyboards/ploopyco/trackball/rev1_005/rules.mk
+++ b/keyboards/ploopyco/trackball/rev1_005/rules.mk
@@ -1,2 +0,0 @@
-# Bootloader selection
-BOOTLOADER = atmel-dfu
diff --git a/keyboards/ploopyco/trackball/rules.mk b/keyboards/ploopyco/trackball/rules.mk
index 3d5c364e3e..0f5f3f648f 100644
--- a/keyboards/ploopyco/trackball/rules.mk
+++ b/keyboards/ploopyco/trackball/rules.mk
@@ -1,6 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
 # Processor frequency
 F_CPU = 8000000
 
diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h
index 8452a78ee7..4cdae526aa 100644
--- a/keyboards/ploopyco/trackball/trackball.h
+++ b/keyboards/ploopyco/trackball/trackball.h
@@ -33,9 +33,6 @@
 #define OPT_ENC1_MUX 0
 #define OPT_ENC2_MUX 4
 
-#define LAYOUT(BL, BM, BR, BF, BB) \
-    { {BL, BM, BR, BF, BB}, }
-
 typedef union {
     uint32_t raw;
     struct {
@@ -47,17 +44,8 @@ extern keyboard_config_t keyboard_config;
 extern uint16_t          dpi_array[];
 
 enum ploopy_keycodes {
-#ifdef VIA_ENABLE
-    DPI_CONFIG = USER00,
-#else
-    DPI_CONFIG = SAFE_RANGE,
-#endif
+    DPI_CONFIG = QK_KB_0,
     DRAG_SCROLL,
-#ifdef VIA_ENABLE
-    PLOOPY_SAFE_RANGE = SAFE_RANGE,
-#else
-    PLOOPY_SAFE_RANGE,
-#endif
 };
 
 bool encoder_update_user(uint8_t index, bool clockwise);