From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/ploopyco/trackball/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/ploopyco/trackball') diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h index 54a301b0d2..43f83da791 100644 --- a/keyboards/ploopyco/trackball/config.h +++ b/keyboards/ploopyco/trackball/config.h @@ -18,7 +18,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 1 -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/ploopyco/trackball/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/ploopyco/trackball') diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h index 43f83da791..a2fd4c8b53 100644 --- a/keyboards/ploopyco/trackball/config.h +++ b/keyboards/ploopyco/trackball/config.h @@ -27,9 +27,6 @@ /* 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 -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/ploopyco/trackball/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/ploopyco/trackball') diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h index a2fd4c8b53..ce1f7448a9 100644 --- a/keyboards/ploopyco/trackball/config.h +++ b/keyboards/ploopyco/trackball/config.h @@ -23,10 +23,6 @@ #define MATRIX_ROWS 1 #define MATRIX_COLS 5 - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/ploopyco/trackball/rev1/info.json | 4 ++++ keyboards/ploopyco/trackball/rev1/rules.mk | 2 -- keyboards/ploopyco/trackball/rev1_005/info.json | 4 ++++ keyboards/ploopyco/trackball/rev1_005/rules.mk | 2 -- keyboards/ploopyco/trackball/rules.mk | 3 --- 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 keyboards/ploopyco/trackball/rev1/info.json create mode 100644 keyboards/ploopyco/trackball/rev1_005/info.json (limited to 'keyboards/ploopyco/trackball') diff --git a/keyboards/ploopyco/trackball/rev1/info.json b/keyboards/ploopyco/trackball/rev1/info.json new file mode 100644 index 0000000000..4369a04103 --- /dev/null +++ b/keyboards/ploopyco/trackball/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} 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/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json new file mode 100644 index 0000000000..042c41f34d --- /dev/null +++ b/keyboards/ploopyco/trackball/rev1_005/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "atmel-dfu" +} 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 -- cgit v1.2.3 From 2cdf99ae950a82e233482347651b7689c4896827 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 14 Feb 2023 18:39:41 +1100 Subject: Migrate `DIRECT_PINS` to data driven (#19826) --- keyboards/ploopyco/trackball/rev1/config.h | 15 --------------- keyboards/ploopyco/trackball/rev1/info.json | 7 ++++++- keyboards/ploopyco/trackball/rev1_005/config.h | 15 --------------- keyboards/ploopyco/trackball/rev1_005/info.json | 7 ++++++- 4 files changed, 12 insertions(+), 32 deletions(-) (limited to 'keyboards/ploopyco/trackball') 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 index 4369a04103..8e372e7c2b 100644 --- a/keyboards/ploopyco/trackball/rev1/info.json +++ b/keyboards/ploopyco/trackball/rev1/info.json @@ -1,4 +1,9 @@ { "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4", "D2", "E6", "B5", "D7"] + ] + } } 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 index 042c41f34d..b963f8842a 100644 --- a/keyboards/ploopyco/trackball/rev1_005/info.json +++ b/keyboards/ploopyco/trackball/rev1_005/info.json @@ -1,4 +1,9 @@ { "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["D4", "D2", "E6", "B6", "D7"] + ] + } } -- cgit v1.2.3 From d784f78bd0a034c1d6085379615014fd701536ab Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:49:49 +1100 Subject: Move Bootmagic config to data driven (#19860) --- keyboards/ploopyco/trackball/config.h | 4 ---- keyboards/ploopyco/trackball/info.json | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'keyboards/ploopyco/trackball') diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h index ce1f7448a9..2cbbe176a6 100644 --- a/keyboards/ploopyco/trackball/config.h +++ b/keyboards/ploopyco/trackball/config.h @@ -30,10 +30,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..4d5fb44fac 100644 --- a/keyboards/ploopyco/trackball/info.json +++ b/keyboards/ploopyco/trackball/info.json @@ -8,6 +8,9 @@ "pid": "0x5442", "device_version": "0.0.1" }, + "bootmagic": { + "matrix": [0, 3] + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/ploopyco/trackball/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/ploopyco/trackball') diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h index 2cbbe176a6..de94eab9ba 100644 --- a/keyboards/ploopyco/trackball/config.h +++ b/keyboards/ploopyco/trackball/config.h @@ -18,11 +18,6 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 5 - /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING -- cgit v1.2.3 From e837a32b2b4d6eb96ffacad0022699d67c0f8f1e Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 19 Feb 2023 18:55:12 +1100 Subject: Move layouts for direct_pins boards to data driven (#19872) --- keyboards/ploopyco/trackball/info.json | 10 +++++----- keyboards/ploopyco/trackball/trackball.h | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'keyboards/ploopyco/trackball') diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json index 4d5fb44fac..a1f9c53284 100644 --- a/keyboards/ploopyco/trackball/info.json +++ b/keyboards/ploopyco/trackball/info.json @@ -14,11 +14,11 @@ "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/trackball.h b/keyboards/ploopyco/trackball/trackball.h index 8452a78ee7..e2e46b2c97 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 { -- cgit v1.2.3 From 7f805cc7799deb0ca75f751cebd32c6640058af9 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 23 Feb 2023 09:19:00 +1100 Subject: VIA Protocol 12 + fixes (#19916) Co-authored-by: Wilba Co-authored-by: zvecr --- keyboards/ploopyco/trackball/trackball.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'keyboards/ploopyco/trackball') diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h index e2e46b2c97..d6c4b0f985 100644 --- a/keyboards/ploopyco/trackball/trackball.h +++ b/keyboards/ploopyco/trackball/trackball.h @@ -44,17 +44,9 @@ 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); -- cgit v1.2.3 From 961f0b7b2de54f988daf4ce7b791f91a33e55612 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Feb 2023 22:49:07 +0000 Subject: Reallocate SAFE_RANGE (#19909) --- keyboards/ploopyco/trackball/keymaps/default/keymap.c | 2 -- keyboards/ploopyco/trackball/trackball.h | 1 - 2 files changed, 3 deletions(-) (limited to 'keyboards/ploopyco/trackball') 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/trackball.h b/keyboards/ploopyco/trackball/trackball.h index d6c4b0f985..4cdae526aa 100644 --- a/keyboards/ploopyco/trackball/trackball.h +++ b/keyboards/ploopyco/trackball/trackball.h @@ -46,7 +46,6 @@ extern uint16_t dpi_array[]; enum ploopy_keycodes { DPI_CONFIG = QK_KB_0, DRAG_SCROLL, - PLOOPY_SAFE_RANGE, }; bool encoder_update_user(uint8_t index, bool clockwise); -- cgit v1.2.3