summaryrefslogtreecommitdiffstats
path: root/keyboards/ploopyco
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ploopyco')
-rw-r--r--keyboards/ploopyco/mouse/config.h31
-rw-r--r--keyboards/ploopyco/mouse/info.json26
-rw-r--r--keyboards/ploopyco/mouse/keymaps/default/keymap.c2
-rw-r--r--keyboards/ploopyco/mouse/keymaps/drashna/keymap.c2
-rw-r--r--keyboards/ploopyco/mouse/mouse.h14
-rw-r--r--keyboards/ploopyco/mouse/rules.mk6
-rw-r--r--keyboards/ploopyco/trackball/config.h17
-rw-r--r--keyboards/ploopyco/trackball/info.json13
-rw-r--r--keyboards/ploopyco/trackball/keymaps/default/keymap.c2
-rw-r--r--keyboards/ploopyco/trackball/rev1/config.h15
-rw-r--r--keyboards/ploopyco/trackball/rev1/info.json9
-rw-r--r--keyboards/ploopyco/trackball/rev1/rules.mk2
-rw-r--r--keyboards/ploopyco/trackball/rev1_005/config.h15
-rw-r--r--keyboards/ploopyco/trackball/rev1_005/info.json9
-rw-r--r--keyboards/ploopyco/trackball/rev1_005/rules.mk2
-rw-r--r--keyboards/ploopyco/trackball/rules.mk3
-rw-r--r--keyboards/ploopyco/trackball/trackball.h14
-rw-r--r--keyboards/ploopyco/trackball_mini/config.h17
-rw-r--r--keyboards/ploopyco/trackball_mini/info.json15
-rw-r--r--keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c2
-rw-r--r--keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c2
-rw-r--r--keyboards/ploopyco/trackball_mini/rev1_001/config.h15
-rw-r--r--keyboards/ploopyco/trackball_mini/rev1_001/info.json7
-rw-r--r--keyboards/ploopyco/trackball_mini/rev1_002/config.h15
-rw-r--r--keyboards/ploopyco/trackball_mini/rev1_002/info.json7
-rw-r--r--keyboards/ploopyco/trackball_mini/rules.mk6
-rw-r--r--keyboards/ploopyco/trackball_mini/trackball_mini.h14
-rw-r--r--keyboards/ploopyco/trackball_nano/config.h9
-rw-r--r--keyboards/ploopyco/trackball_nano/info.json5
-rw-r--r--keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c2
-rw-r--r--keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c1
-rw-r--r--keyboards/ploopyco/trackball_nano/rev1_001/config.h12
-rw-r--r--keyboards/ploopyco/trackball_nano/rev1_001/info.json7
-rw-r--r--keyboards/ploopyco/trackball_nano/rules.mk6
-rw-r--r--keyboards/ploopyco/trackball_nano/trackball_nano.h5
-rw-r--r--keyboards/ploopyco/trackball_thumb/config.h5
-rw-r--r--keyboards/ploopyco/trackball_thumb/info.json1
-rw-r--r--keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c2
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_001/config.h24
-rw-r--r--keyboards/ploopyco/trackball_thumb/trackball_thumb.c13
-rw-r--r--keyboards/ploopyco/trackball_thumb/trackball_thumb.h11
41 files changed, 122 insertions, 263 deletions
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 6a6713557b..c7fcc504e3 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -18,49 +18,18 @@
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 8
-
-/*
- * 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, C6, C7, B7 } \
- }
-
// These pins are not broken out, and cannot be used normally.
// They are set as output and pulled high, by default
#define UNUSABLE_PINS \
{ B4, D6, F1, F5, F6, F7 }
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
#define USB_MAX_POWER_CONSUMPTION 100
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 3
-
#define RGB_DI_PIN B5
#define RGBLED_NUM 4
#define RGBLIGHT_LIMIT_VAL 40
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index f672336c25..c8889f59f9 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -8,17 +8,27 @@
"pid": "0x4D6F",
"device_version": "0.0.1"
},
+ "bootmagic": {
+ "matrix": [0, 3]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "matrix_pins": {
+ "direct": [
+ ["D4", "D2", "E6", "B6", "D7", "C6", "C7", "B7"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"x":1, "y":0, "h":2},
- {"x":2, "y":0, "h":2},
- {"x":3, "y":0.25, "h":1.25},
- {"x":4, "y":0, "h":2},
- {"x":5, "y":0, "h":2},
- {"x":0, "y":0},
- {"x":0, "y":1},
- {"x":3, "y":1.5}
+ {"x":1, "y":0, "h":2, "matrix": [0, 6]},
+ {"x":2, "y":0, "h":2, "matrix": [0, 0]},
+ {"x":3, "y":0.25, "h":1.25, "matrix": [0, 1]},
+ {"x":4, "y":0, "h":2, "matrix": [0, 2]},
+ {"x":5, "y":0, "h":2, "matrix": [0, 5]},
+ {"x":0, "y":0, "matrix": [0, 3]},
+ {"x":0, "y":1, "matrix": [0, 4]},
+ {"x":3, "y":1.5, "matrix": [0, 7]}
]
}
}
diff --git a/keyboards/ploopyco/mouse/keymaps/default/keymap.c b/keyboards/ploopyco/mouse/keymaps/default/keymap.c
index 8145ffb1c3..29d81b8061 100644
--- a/keyboards/ploopyco/mouse/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/mouse/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 */
C(KC_C), KC_BTN1, KC_BTN3, KC_BTN2, C(KC_V), KC_BTN4, KC_BTN5, DPI_CONFIG)
diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
index 056a1f7903..cf0b57d433 100644
--- a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
@@ -17,8 +17,6 @@
*/
#include QMK_KEYBOARD_H
-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
diff --git a/keyboards/ploopyco/mouse/mouse.h b/keyboards/ploopyco/mouse/mouse.h
index 8383049aa5..9123315fd4 100644
--- a/keyboards/ploopyco/mouse/mouse.h
+++ b/keyboards/ploopyco/mouse/mouse.h
@@ -30,9 +30,6 @@
void process_wheel(void);
-#define LAYOUT(BLL, BL, BM, BR, BRR, BF, BB, BDPI) \
- { {BL, BM, BR, BF, BB, BRR, BLL, BDPI}, }
-
typedef union {
uint32_t raw;
struct {
@@ -44,17 +41,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);
diff --git a/keyboards/ploopyco/mouse/rules.mk b/keyboards/ploopyco/mouse/rules.mk
index 840b5eba39..8d62f78ed7 100644
--- a/keyboards/ploopyco/mouse/rules.mk
+++ b/keyboards/ploopyco/mouse/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32u4
-
# Processor frequency
F_CPU = 8000000
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
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);
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);
diff --git a/keyboards/ploopyco/trackball_nano/config.h b/keyboards/ploopyco/trackball_nano/config.h
index fb340a4ec3..c8e74cc271 100644
--- a/keyboards/ploopyco/trackball_nano/config.h
+++ b/keyboards/ploopyco/trackball_nano/config.h
@@ -19,15 +19,6 @@
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 0
-
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
diff --git a/keyboards/ploopyco/trackball_nano/info.json b/keyboards/ploopyco/trackball_nano/info.json
index cf9b78a4f3..522ff43d99 100644
--- a/keyboards/ploopyco/trackball_nano/info.json
+++ b/keyboards/ploopyco/trackball_nano/info.json
@@ -8,10 +8,13 @@
"pid": "0x54A3",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 0,
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}
+ {"x":0, "y":0, "matrix": [0, 0]}
]
}
}
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
index dfc19787a6..871f8006ea 100644
--- a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
@@ -18,7 +18,5 @@
*/
#include QMK_KEYBOARD_H
-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
// Dummy
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
index 5e9b3e8e19..370eb95aa0 100644
--- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
@@ -23,7 +23,6 @@
#define DELTA_X_THRESHOLD 60
#define DELTA_Y_THRESHOLD 15
-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
bool scroll_enabled = false;
bool lock_state = false;
diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/config.h b/keyboards/ploopyco/trackball_nano/rev1_001/config.h
index 3bde88487a..14fcb8ca95 100644
--- a/keyboards/ploopyco/trackball_nano/rev1_001/config.h
+++ b/keyboards/ploopyco/trackball_nano/rev1_001/config.h
@@ -19,18 +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 {{NO_PIN}}