From ac8bee7091d5a5fc55afb7054562c0d23f932880 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 15 Feb 2022 12:15:53 +1100 Subject: Fix multiple definition errors for trackball "boards" with no keys (#16350) --- keyboards/handwired/aball/aball.c | 1 - keyboards/handwired/aball/aball.h | 10 +--------- keyboards/handwired/aball/keymaps/default/keymap.c | 3 ++- keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c | 3 ++- keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c | 3 +++ keyboards/ploopyco/trackball_nano/trackball_nano.c | 2 -- keyboards/ploopyco/trackball_nano/trackball_nano.h | 2 +- 7 files changed, 9 insertions(+), 15 deletions(-) diff --git a/keyboards/handwired/aball/aball.c b/keyboards/handwired/aball/aball.c index 0b3d2f165c..3f12243ac6 100644 --- a/keyboards/handwired/aball/aball.c +++ b/keyboards/handwired/aball/aball.c @@ -15,4 +15,3 @@ */ #include "aball.h" -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; diff --git a/keyboards/handwired/aball/aball.h b/keyboards/handwired/aball/aball.h index 8daf6bf680..d6cb21bafc 100644 --- a/keyboards/handwired/aball/aball.h +++ b/keyboards/handwired/aball/aball.h @@ -18,12 +18,4 @@ #include "quantum.h" -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT(k00) {{ KC_NO }} +#define LAYOUT(k00) {{ k00 }} diff --git a/keyboards/handwired/aball/keymaps/default/keymap.c b/keyboards/handwired/aball/keymaps/default/keymap.c index 00826a0262..1e9605e661 100644 --- a/keyboards/handwired/aball/keymaps/default/keymap.c +++ b/keyboards/handwired/aball/keymaps/default/keymap.c @@ -15,4 +15,5 @@ */ #include QMK_KEYBOARD_H - +// Dummy +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }}; 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; -- cgit v1.2.1