diff options
Diffstat (limited to 'keyboards/ploopyco/trackball_mini')
10 files changed, 26 insertions, 74 deletions
diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h index bf7570f364..2cb236fcd0 100644 --- a/keyboards/ploopyco/trackball_mini/config.h +++ b/keyboards/ploopyco/trackball_mini/config.h @@ -19,19 +19,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 @@ -39,10 +26,6 @@ #define USB_MAX_POWER_CONSUMPTION 100 -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 3 - // If board has a debug LED, you can enable it by defining this // #define DEBUG_LED_PIN F7 diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json index f465a7a21e..e3daea0575 100644 --- a/keyboards/ploopyco/trackball_mini/info.json +++ b/keyboards/ploopyco/trackball_mini/info.json @@ -8,14 +8,19 @@ "pid": "0x1EAB", "device_version": "0.0.1" }, + "bootmagic": { + "matrix": [0, 3] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "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_mini/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c index 5e7c684d19..3659076bec 100644 --- a/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c +++ b/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c @@ -18,8 +18,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_mini/keymaps/drag_scroll/keymap.c b/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c index 7eb973216b..b6c71c6ece 100644 --- a/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c +++ b/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c @@ -21,7 +21,7 @@ bool is_drag_scroll = false; enum custom_keycodes { - DRAG_SCROLL = PLOOPY_SAFE_RANGE, + DRAG_SCROLL = SAFE_RANGE, }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/config.h b/keyboards/ploopyco/trackball_mini/rev1_001/config.h index d4c9d23bec..485f8e3485 100644 --- a/keyboards/ploopyco/trackball_mini/rev1_001/config.h +++ b/keyboards/ploopyco/trackball_mini/rev1_001/config.h @@ -19,21 +19,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_mini/rev1_001/info.json b/keyboards/ploopyco/trackball_mini/rev1_001/info.json new file mode 100644 index 0000000000..20c192f869 --- /dev/null +++ b/keyboards/ploopyco/trackball_mini/rev1_001/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "direct": [ + ["D4", "D2", "E6", "B6", "D7"] + ] + } +} diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/config.h b/keyboards/ploopyco/trackball_mini/rev1_002/config.h index d4c9d23bec..485f8e3485 100644 --- a/keyboards/ploopyco/trackball_mini/rev1_002/config.h +++ b/keyboards/ploopyco/trackball_mini/rev1_002/config.h @@ -19,21 +19,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_mini/rev1_002/info.json b/keyboards/ploopyco/trackball_mini/rev1_002/info.json new file mode 100644 index 0000000000..20c192f869 --- /dev/null +++ b/keyboards/ploopyco/trackball_mini/rev1_002/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "direct": [ + ["D4", "D2", "E6", "B6", "D7"] + ] + } +} diff --git a/keyboards/ploopyco/trackball_mini/rules.mk b/keyboards/ploopyco/trackball_mini/rules.mk index f5e7935ee2..d7016929c9 100644 --- a/keyboards/ploopyco/trackball_mini/rules.mk +++ b/keyboards/ploopyco/trackball_mini/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.h b/keyboards/ploopyco/trackball_mini/trackball_mini.h index 3af2a49b5e..f212ec17ca 100644 --- a/keyboards/ploopyco/trackball_mini/trackball_mini.h +++ b/keyboards/ploopyco/trackball_mini/trackball_mini.h @@ -31,9 +31,6 @@ void process_wheel(void); -#define LAYOUT(BL, BM, BR, BF, BB) \ - { {BL, BM, BR, BF, BB}, } - typedef union { uint32_t raw; struct { @@ -44,17 +41,8 @@ typedef union { extern keyboard_config_t keyboard_config; 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); |