diff options
| author | Ryan <fauxpark@gmail.com> | 2022-02-15 12:15:53 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-15 01:15:53 +0000 |
| commit | ac8bee7091d5a5fc55afb7054562c0d23f932880 (patch) | |
| tree | a884f69d9617f30f3e99dad3b5a7416f5102e8a7 /keyboards/ploopyco/trackball_nano | |
| parent | 485cf920b4f2d7bf5702573d008c5e435ee570a2 (diff) | |
Fix multiple definition errors for trackball "boards" with no keys (#16350)
Diffstat (limited to 'keyboards/ploopyco/trackball_nano')
4 files changed, 6 insertions, 4 deletions
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c index 1140c30a1d..167cf2c064 100644 --- a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c +++ b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c @@ -20,4 +20,5 @@ // safe range starts at `PLOOPY_SAFE_RANGE` instead. -// placeholder file so it will compile
\ No newline at end of file +// 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 9e33db3783..66d5441abd 100644 --- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c +++ b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c @@ -24,6 +24,9 @@ uint8_t lock_state = 0; int8_t delta_x = 0; int8_t delta_y = 0; +// Dummy +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }}; + void process_mouse_user(report_mouse_t *mouse_report, int8_t x, int8_t y) { if (scroll_enabled) { delta_x += x; diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.c b/keyboards/ploopyco/trackball_nano/trackball_nano.c index 2702f60557..e208a728cb 100644 --- a/keyboards/ploopyco/trackball_nano/trackball_nano.c +++ b/keyboards/ploopyco/trackball_nano/trackball_nano.c @@ -48,8 +48,6 @@ # define PLOOPY_DPI_DEFAULT 2 #endif -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; - keyboard_config_t keyboard_config; uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS; #define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t)) diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.h b/keyboards/ploopyco/trackball_nano/trackball_nano.h index 88725eab68..5f16e96c41 100644 --- a/keyboards/ploopyco/trackball_nano/trackball_nano.h +++ b/keyboards/ploopyco/trackball_nano/trackball_nano.h @@ -21,7 +21,7 @@ #include "quantum.h" -#define LAYOUT(k00) {{ KC_NO }} +#define LAYOUT(k00) {{ k00 }} typedef union { uint32_t raw; |