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 | |
parent | 485cf920b4f2d7bf5702573d008c5e435ee570a2 (diff) | |
download | qmk_firmware-ac8bee7091d5a5fc55afb7054562c0d23f932880.tar.gz qmk_firmware-ac8bee7091d5a5fc55afb7054562c0d23f932880.zip |
Fix multiple definition errors for trackball "boards" with no keys (#16350)
-rw-r--r-- | keyboards/handwired/aball/aball.c | 1 | ||||
-rw-r--r-- | keyboards/handwired/aball/aball.h | 10 | ||||
-rw-r--r-- | keyboards/handwired/aball/keymaps/default/keymap.c | 3 | ||||
-rw-r--r-- | keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c | 3 | ||||
-rw-r--r-- | keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c | 3 | ||||
-rw-r--r-- | keyboards/ploopyco/trackball_nano/trackball_nano.c | 2 | ||||
-rw-r--r-- | 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 0b3d2f165..3f12243ac 100644 --- a/keyboards/handwired/aball/aball.c +++ b/keyboards/handwired/aball/aball.c | |||
@@ -15,4 +15,3 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "aball.h" | 17 | #include "aball.h" |
18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; | ||
diff --git a/keyboards/handwired/aball/aball.h b/keyboards/handwired/aball/aball.h index 8daf6bf68..d6cb21baf 100644 --- a/keyboards/handwired/aball/aball.h +++ b/keyboards/handwired/aball/aball.h | |||
@@ -18,12 +18,4 @@ | |||
18 | 18 | ||
19 | #include "quantum.h" | 19 | #include "quantum.h" |
20 | 20 | ||
21 | /* This is a shortcut to help you visually see your layout. | 21 | #define LAYOUT(k00) {{ k00 }} |
22 | * | ||
23 | * The first section contains all of the arguments representing the physical | ||
24 | * layout of the board and position of the keys. | ||
25 | * | ||
26 | * The second converts the arguments into a two-dimensional array which | ||
27 | * represents the switch matrix. | ||
28 | */ | ||
29 | #define LAYOUT(k00) {{ KC_NO }} | ||
diff --git a/keyboards/handwired/aball/keymaps/default/keymap.c b/keyboards/handwired/aball/keymaps/default/keymap.c index 00826a026..1e9605e66 100644 --- a/keyboards/handwired/aball/keymaps/default/keymap.c +++ b/keyboards/handwired/aball/keymaps/default/keymap.c | |||
@@ -15,4 +15,5 @@ | |||
15 | */ | 15 | */ |
16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
17 | 17 | ||
18 | 18 | // Dummy | |
19 | 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 1140c30a1..167cf2c06 100644 --- a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c +++ b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c | |||
@@ -20,4 +20,5 @@ | |||
20 | 20 | ||
21 | // safe range starts at `PLOOPY_SAFE_RANGE` instead. | 21 | // safe range starts at `PLOOPY_SAFE_RANGE` instead. |
22 | 22 | ||
23 | // placeholder file so it will compile \ No newline at end of file | 23 | // Dummy |
24 | 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 9e33db378..66d5441ab 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; | |||
24 | int8_t delta_x = 0; | 24 | int8_t delta_x = 0; |
25 | int8_t delta_y = 0; | 25 | int8_t delta_y = 0; |
26 | 26 | ||
27 | // Dummy | ||
28 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }}; | ||
29 | |||
27 | void process_mouse_user(report_mouse_t *mouse_report, int8_t x, int8_t y) { | 30 | void process_mouse_user(report_mouse_t *mouse_report, int8_t x, int8_t y) { |
28 | if (scroll_enabled) { | 31 | if (scroll_enabled) { |
29 | delta_x += x; | 32 | delta_x += x; |
diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.c b/keyboards/ploopyco/trackball_nano/trackball_nano.c index 2702f6055..e208a728c 100644 --- a/keyboards/ploopyco/trackball_nano/trackball_nano.c +++ b/keyboards/ploopyco/trackball_nano/trackball_nano.c | |||
@@ -48,8 +48,6 @@ | |||
48 | # define PLOOPY_DPI_DEFAULT 2 | 48 | # define PLOOPY_DPI_DEFAULT 2 |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; | ||
52 | |||
53 | keyboard_config_t keyboard_config; | 51 | keyboard_config_t keyboard_config; |
54 | uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS; | 52 | uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS; |
55 | #define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t)) | 53 | #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 88725eab6..5f16e96c4 100644 --- a/keyboards/ploopyco/trackball_nano/trackball_nano.h +++ b/keyboards/ploopyco/trackball_nano/trackball_nano.h | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | #include "quantum.h" | 22 | #include "quantum.h" |
23 | 23 | ||
24 | #define LAYOUT(k00) {{ KC_NO }} | 24 | #define LAYOUT(k00) {{ k00 }} |
25 | 25 | ||
26 | typedef union { | 26 | typedef union { |
27 | uint32_t raw; | 27 | uint32_t raw; |