initial (#18859)

9 files changed, 45 insertions, 179 deletions

diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c
index 991848c6d3..c0f7f96b9e 100644
--- a/keyboards/doio/kb16/kb16.c
+++ b/keyboards/doio/kb16/kb16.c
@@ -45,3 +45,22 @@
         return true;
     }
 #endif
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    {  0,      1,      2,      3, NO_LED },
+    {  4,      5,      6,      7, NO_LED },
+    {  8,      9,     10,     11, NO_LED },
+    { 12,     13,     14,     15, NO_LED }
+}, {
+    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
+    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
+    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
+    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
+}, {
+    1, 1, 1, 1,
+    1, 4, 4, 1,
+    1, 4, 4, 1,
+    1, 1, 1, 1,
+} };
+#endif
diff --git a/keyboards/doio/kb16/kb16.h b/keyboards/doio/kb16/kb16.h
index 4d3a1e3a03..6e6ab2f7f4 100644
--- a/keyboards/doio/kb16/kb16.h
+++ b/keyboards/doio/kb16/kb16.h
@@ -19,8 +19,27 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_doio_kb16_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_doio_kb16_rev2)
-    #include "rev2.h"
-#endif
\ No newline at end of file
+#define XXX KC_NO
+
+/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
+ * │00 │01 │02 │03 │  │04 │ │14 │
+ * ├───┼───┼───┼───┤  └───┘ └───┘
+ * │10 │11 │12 │13 │
+ * ├───┼───┼───┼───┤
+ * │20 │21 │22 │23 │     ┌───┐
+ * ├───┼───┼───┼───┤     │24 │
+ * │30 │31 │32 │33 │     └───┘
+ * └───┴───┴───┴───┘
+ */
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, \
+    K10, K11, K12, K13, K14, \
+    K20, K21, K22, K23, K24, \
+    K30, K31, K32, K33       \
+) { \
+    { K00, K01, K02, K03, K04 }, \
+    { K10, K11, K12, K13, K14 }, \
+    { K20, K21, K22, K23, K24 }, \
+    { K30, K31, K32, K33, XXX }  \
+}
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
index 1714c41b01..5187354513 100644
--- a/keyboards/doio/kb16/rev1/config.h
+++ b/keyboards/doio/kb16/rev1/config.h
@@ -27,9 +27,6 @@
 #define MATRIX_ROW_PINS { D5, D4, D3, D2 }
 #define MATRIX_COL_PINS { F5, F4, F1, F0, B7 }
 
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/doio/kb16/rev1/rev1.c b/keyboards/doio/kb16/rev1/rev1.c
deleted file mode 100644
index 9c7fc823a6..0000000000
--- a/keyboards/doio/kb16/rev1/rev1.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    {  0,      1,      2,      3, NO_LED },
-    {  4,      5,      6,      7, NO_LED },
-    {  8,      9,     10,     11, NO_LED },
-    { 12,     13,     14,     15, NO_LED }
-}, {
-    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
-    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
-    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
-    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
-}, {
-    1, 1, 1, 1,
-    1, 4, 4, 1,
-    1, 4, 4, 1,
-    1, 1, 1, 1,
-} };
-#endif
diff --git a/keyboards/doio/kb16/rev1/rev1.h b/keyboards/doio/kb16/rev1/rev1.h
deleted file mode 100644
index f1e86fb674..0000000000
--- a/keyboards/doio/kb16/rev1/rev1.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
- * │00 │01 │02 │03 │  │04 │ │14 │
- * ├───┼───┼───┼───┤  └───┘ └───┘
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │23 │     ┌───┐
- * ├───┼───┼───┼───┤     │24 │
- * │30 │31 │32 │33 │     └───┘
- * └───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23, K24, \
-    K30, K31, K32, K33       \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, XXX }  \
-}
-
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
index d5152f3ec7..d75c69c9a2 100644
--- a/keyboards/doio/kb16/rev2/config.h
+++ b/keyboards/doio/kb16/rev2/config.h
@@ -27,9 +27,6 @@
 #define MATRIX_ROW_PINS { B3, B4, B9, B8 }
 #define MATRIX_COL_PINS { B14, B13, B12, B0, A7 }
 
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
@@ -56,7 +53,7 @@
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
     #define RGB_DI_PIN A10
-    #define DRIVER_LED_TOTAL 16
+    #define RGB_MATRIX_LED_COUNT 16
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 9bb19482e3..28aa77b127 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -6,7 +6,7 @@
     "usb": {
         "vid": "0xD010",
         "pid": "0x1601",
-        "device_version": "0.0.1"
+        "device_version": "0.0.2"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/doio/kb16/rev2/rev2.c b/keyboards/doio/kb16/rev2/rev2.c
deleted file mode 100644
index 78637842c5..0000000000
--- a/keyboards/doio/kb16/rev2/rev2.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    {  0,      1,      2,      3, NO_LED },
-    {  4,      5,      6,      7, NO_LED },
-    {  8,      9,     10,     11, NO_LED },
-    { 12,     13,     14,     15, NO_LED }
-}, {
-    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
-    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
-    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
-    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
-}, {
-    1, 1, 1, 1,
-    1, 4, 4, 1,
-    1, 4, 4, 1,
-    1, 1, 1, 1,
-} };
-#endif
diff --git a/keyboards/doio/kb16/rev2/rev2.h b/keyboards/doio/kb16/rev2/rev2.h
deleted file mode 100644
index f1e86fb674..0000000000
--- a/keyboards/doio/kb16/rev2/rev2.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
- * │00 │01 │02 │03 │  │04 │ │14 │
- * ├───┼───┼───┼───┤  └───┘ └───┘
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │23 │     ┌───┐
- * ├───┼───┼───┼───┤     │24 │
- * │30 │31 │32 │33 │     └───┘
- * └───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23, K24, \
-    K30, K31, K32, K33       \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, XXX }  \
-}
-