From ac8bee7091d5a5fc55afb7054562c0d23f932880 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 15 Feb 2022 12:15:53 +1100
Subject: [PATCH] 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 ++-
 .../ploopyco/trackball_nano/keymaps/default/keymap.c   |  3 ++-
 .../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 0b3d2f165c58304a4b7b41249e558b2010e064c3..3f12243ac68d515bfce617d9728988fac3b1311e 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 8daf6bf6804cbc550ab19eac53e4a160fc8f577b..d6cb21bafccca04edb69e29cbdcfcdb0e06a99c0 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 00826a0262bc45bd1980587056cb88e5b257e4b4..1e9605e66184b157eed0ee4dd61c920806033758 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 1140c30a1d850551f3e4e6c243407f66998209cd..167cf2c0641d8297a922dbf568f3b4cc93ff96dd 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 9e33db3783a2535951a9f77115c755813276c659..66d5441abd0009a444f9ce55d777144f284597bb 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 2702f6055727a6804c65e2cb4bb92aece0298d7d..e208a728cb1306157d709a917b2c738e3c3804c4 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 88725eab686c602e7f47b9d7ae6c262638e72f8f..5f16e96c416fcfef0e4277695cbd1199db285c2e 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;