Merge remote-tracking branch 'origin/master' into develop

5 files changed, 25 insertions, 57 deletions

diff --git a/keyboards/adpenrose/akemipad/akemipad.c b/keyboards/adpenrose/akemipad/akemipad.c
index 9c5319bc81..647740927c 100644
--- a/keyboards/adpenrose/akemipad/akemipad.c
+++ b/keyboards/adpenrose/akemipad/akemipad.c
@@ -2,3 +2,26 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "akemipad.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+/* Setting up the LED matrix */
+led_config_t g_led_config = { {
+  // Key Matrix to LED Index
+  { 0, 1, 2, 3, NO_LED },
+  { 4, 5, 6, 7, NO_LED },
+  { 8, 9, 10, 11, 12 },
+  { 13, 14, 15, 16, NO_LED },
+  { 17, 18, 19, 20, 21 },
+  { 22, 23, 24, 25, 26 },
+}, {
+  // LED Index to Physical Position
+  {  0,0  }, { 37,0  }, { 74,0  }, {111,0  }, {  0,34 }, { 37,34 }, { 74,34 }, {111,34 }, {  0,62 }, { 37,62 }, 
+  { 74,62 }, {111,62 }, {120,75 }, {  0,89 }, { 37,89 }, { 74,89 }, {111,89 }, {  0,117}, { 37,117}, { 74,117}, 
+  {111,117}, {120,130}, {  0,137}, { 18,144}, { 37,137}, { 74,144}, {111,144}
+}, {
+  // LED Index to Flag
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+} };
+
+#endif
diff --git a/keyboards/adpenrose/akemipad/keymaps/default/keymap.c b/keyboards/adpenrose/akemipad/keymaps/default/keymap.c
index 2a6ed46c70..2a3de42e2d 100644
--- a/keyboards/adpenrose/akemipad/keymaps/default/keymap.c
+++ b/keyboards/adpenrose/akemipad/keymaps/default/keymap.c
@@ -3,25 +3,6 @@
 
 #include QMK_KEYBOARD_H
 
-/* Setting up the LED matrix */
-led_config_t g_led_config = { {
-  // Key Matrix to LED Index
-  { 0, 1, 2, 3, NO_LED },
-  { 4, 5, 6, 7, NO_LED },
-  { 8, 9, 10, 11, 12 },
-  { 13, 14, 15, 16, NO_LED },
-  { 17, 18, 19, 20, 21 },
-  { 22, 23, 24, 25, 26 },
-}, {
-  // LED Index to Physical Position
-  {  0,0  }, { 37,0  }, { 74,0  }, {111,0  }, {  0,34 }, { 37,34 }, { 74,34 }, {111,34 }, {  0,62 }, { 37,62 }, 
-  { 74,62 }, {111,62 }, {120,75 }, {  0,89 }, { 37,89 }, { 74,89 }, {111,89 }, {  0,117}, { 37,117}, { 74,117}, 
-  {111,117}, {120,130}, {  0,137}, { 18,144}, { 37,137}, { 74,144}, {111,144}
-}, {
-  // LED Index to Flag
-  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-} };
-
 /* Keymap */
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/config.h b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/config.h
index 2a70bc5c9a..8667314cd4 100644
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/config.h
+++ b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/config.h
@@ -1,6 +1,8 @@
 // Copyright 2022 Arturo Avila (@ADPenrose)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#pragma once
+
 #ifdef AUDIO_ENABLE
 #    define NO_MUSIC_MODE
 #endif
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c
index be0d94a676..5839acbbfe 100644
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c
+++ b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c
@@ -16,25 +16,6 @@ typedef union {
 
 via_layout_t via_layouts;
 
-/* Setting up the LED matrix */
-led_config_t g_led_config = { {
-  // Key Matrix to LED Index
-  { 0, 1, 2, 3, NO_LED },
-  { 4, 5, 6, 7, NO_LED },
-  { 8, 9, 10, 11, 12 },
-  { 13, 14, 15, 16, NO_LED },
-  { 17, 18, 19, 20, 21 },
-  { 22, 23, 24, 25, 26 },
-}, {
-  // LED Index to Physical Position
-  {  0,0  }, { 37,0  }, { 74,0  }, {111,0  }, {  0,34 }, { 37,34 }, { 74,34 }, {111,34 }, {  0,62 }, { 37,62 }, 
-  { 74,62 }, {111,62 }, {120,75 }, {  0,89 }, { 37,89 }, { 74,89 }, {111,89 }, {  0,117}, { 37,117}, { 74,117}, 
-  {111,117}, {120,130}, {  0,137}, { 18,144}, { 37,137}, { 74,144}, {111,144}
-}, {
-  // LED Index to Flag
-  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-} };
-
 /* Keymap */
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
diff --git a/keyboards/adpenrose/akemipad/keymaps/via/keymap.c b/keyboards/adpenrose/akemipad/keymaps/via/keymap.c
index 6395b361c9..fa3673b8cb 100644
--- a/keyboards/adpenrose/akemipad/keymaps/via/keymap.c
+++ b/keyboards/adpenrose/akemipad/keymaps/via/keymap.c
@@ -15,25 +15,6 @@ typedef union {
 
 via_layout_t via_layouts;
 
-/* Setting up the LED matrix */
-led_config_t g_led_config = { {
-  // Key Matrix to LED Index
-  { 0, 1, 2, 3, NO_LED },
-  { 4, 5, 6, 7, NO_LED },
-  { 8, 9, 10, 11, 12 },
-  { 13, 14, 15, 16, NO_LED },
-  { 17, 18, 19, 20, 21 },
-  { 22, 23, 24, 25, 26 },
-}, {
-  // LED Index to Physical Position
-  {  0,0  }, { 37,0  }, { 74,0  }, {111,0  }, {  0,34 }, { 37,34 }, { 74,34 }, {111,34 }, {  0,62 }, { 37,62 }, 
-  { 74,62 }, {111,62 }, {120,75 }, {  0,89 }, { 37,89 }, { 74,89 }, {111,89 }, {  0,117}, { 37,117}, { 74,117}, 
-  {111,117}, {120,130}, {  0,137}, { 18,144}, { 37,137}, { 74,144}, {111,144}
-}, {
-  // LED Index to Flag
-  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-} };
-
 /* Keymap */
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(