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

author: QMK Bot <hello@qmk.fm> 2023-01-02 22:13:00 +0000
committer: QMK Bot <hello@qmk.fm> 2023-01-02 22:13:00 +0000
commit: b497d58d6d0ca5a0d1432272147fe06e0ebfb802 (patch)
tree: 3acc7b936e37875816fe2d21736f6463287aa94e
parent: 4b2fd4212254a8fed0d7e59aba3e43671f5bfbd2 (diff)
parent: 975d64cc2b344cc785f5c207740381acbd1d1d39 (diff)
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(
author	QMK Bot <hello@qmk.fm>	2023-01-02 22:13:00 +0000
committer	QMK Bot <hello@qmk.fm>	2023-01-02 22:13:00 +0000
commit	b497d58d6d0ca5a0d1432272147fe06e0ebfb802 (patch)
tree	3acc7b936e37875816fe2d21736f6463287aa94e
parent	4b2fd4212254a8fed0d7e59aba3e43671f5bfbd2 (diff)
parent	975d64cc2b344cc785f5c207740381acbd1d1d39 (diff)

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 @@
2	// SPDX-License-Identifier: GPL-2.0-or-later	2	// SPDX-License-Identifier: GPL-2.0-or-later
3		3
4	#include "akemipad.h"	4	#include "akemipad.h"
		5
		6	#ifdef RGB_MATRIX_ENABLE
		7
		8	/* Setting up the LED matrix */
		9	led_config_t g_led_config = { {
		10	// Key Matrix to LED Index
		11	{ 0, 1, 2, 3, NO_LED },
		12	{ 4, 5, 6, 7, NO_LED },
		13	{ 8, 9, 10, 11, 12 },
		14	{ 13, 14, 15, 16, NO_LED },
		15	{ 17, 18, 19, 20, 21 },
		16	{ 22, 23, 24, 25, 26 },
		17	}, {
		18	// LED Index to Physical Position
		19	{ 0,0 }, { 37,0 }, { 74,0 }, {111,0 }, { 0,34 }, { 37,34 }, { 74,34 }, {111,34 }, { 0,62 }, { 37,62 },
		20	{ 74,62 }, {111,62 }, {120,75 }, { 0,89 }, { 37,89 }, { 74,89 }, {111,89 }, { 0,117}, { 37,117}, { 74,117},
		21	{111,117}, {120,130}, { 0,137}, { 18,144}, { 37,137}, { 74,144}, {111,144}
		22	}, {
		23	// LED Index to Flag
		24	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
		25	} };
		26
		27	#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 @@
3		3
4	#include QMK_KEYBOARD_H	4	#include QMK_KEYBOARD_H
5		5
6	/* Setting up the LED matrix */
7	led_config_t g_led_config = { {
8	// Key Matrix to LED Index
9	{ 0, 1, 2, 3, NO_LED },
10	{ 4, 5, 6, 7, NO_LED },
11	{ 8, 9, 10, 11, 12 },
12	{ 13, 14, 15, 16, NO_LED },
13	{ 17, 18, 19, 20, 21 },
14	{ 22, 23, 24, 25, 26 },
15	}, {
16	// LED Index to Physical Position
17	{ 0,0 }, { 37,0 }, { 74,0 }, {111,0 }, { 0,34 }, { 37,34 }, { 74,34 }, {111,34 }, { 0,62 }, { 37,62 },
18	{ 74,62 }, {111,62 }, {120,75 }, { 0,89 }, { 37,89 }, { 74,89 }, {111,89 }, { 0,117}, { 37,117}, { 74,117},
19	{111,117}, {120,130}, { 0,137}, { 18,144}, { 37,137}, { 74,144}, {111,144}
20	}, {
21	// LED Index to Flag
22	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
23	} };
24
25	/* Keymap */	6	/* Keymap */
26	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	7	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27	[0] = LAYOUT_all(	8	[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 @@
1	// Copyright 2022 Arturo Avila (@ADPenrose)	1	// Copyright 2022 Arturo Avila (@ADPenrose)
2	// SPDX-License-Identifier: GPL-2.0-or-later	2	// SPDX-License-Identifier: GPL-2.0-or-later
3		3
		4	#pragma once
		5
4	#ifdef AUDIO_ENABLE	6	#ifdef AUDIO_ENABLE
5	# define NO_MUSIC_MODE	7	# define NO_MUSIC_MODE
6	#endif	8	#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 {
16		16
17	via_layout_t via_layouts;	17	via_layout_t via_layouts;
18		18
19	/* Setting up the LED matrix */
20	led_config_t g_led_config = { {
21	// Key Matrix to LED Index
22	{ 0, 1, 2, 3, NO_LED },
23	{ 4, 5, 6, 7, NO_LED },
24	{ 8, 9, 10, 11, 12 },
25	{ 13, 14, 15, 16, NO_LED },
26	{ 17, 18, 19, 20, 21 },
27	{ 22, 23, 24, 25, 26 },
28	}, {
29	// LED Index to Physical Position
30	{ 0,0 }, { 37,0 }, { 74,0 }, {111,0 }, { 0,34 }, { 37,34 }, { 74,34 }, {111,34 }, { 0,62 }, { 37,62 },
31	{ 74,62 }, {111,62 }, {120,75 }, { 0,89 }, { 37,89 }, { 74,89 }, {111,89 }, { 0,117}, { 37,117}, { 74,117},
32	{111,117}, {120,130}, { 0,137}, { 18,144}, { 37,137}, { 74,144}, {111,144}
33	}, {
34	// LED Index to Flag
35	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
36	} };
37
38	/* Keymap */	19	/* Keymap */
39	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	20	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
40	[0] = LAYOUT_all(	21	[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 {
15		15
16	via_layout_t via_layouts;	16	via_layout_t via_layouts;
17		17
18	/* Setting up the LED matrix */
19	led_config_t g_led_config = { {
20	// Key Matrix to LED Index
21	{ 0, 1, 2, 3, NO_LED },
22	{ 4, 5, 6, 7, NO_LED },
23	{ 8, 9, 10, 11, 12 },
24	{ 13, 14, 15, 16, NO_LED },
25	{ 17, 18, 19, 20, 21 },
26	{ 22, 23, 24, 25, 26 },
27	}, {
28	// LED Index to Physical Position
29	{ 0,0 }, { 37,0 }, { 74,0 }, {111,0 }, { 0,34 }, { 37,34 }, { 74,34 }, {111,34 }, { 0,62 }, { 37,62 },
30	{ 74,62 }, {111,62 }, {120,75 }, { 0,89 }, { 37,89 }, { 74,89 }, {111,89 }, { 0,117}, { 37,117}, { 74,117},
31	{111,117}, {120,130}, { 0,137}, { 18,144}, { 37,137}, { 74,144}, {111,144}
32	}, {
33	// LED Index to Flag
34	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
35	} };
36
37	/* Keymap */	18	/* Keymap */
38	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	19	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39	[0] = LAYOUT_all(	20	[0] = LAYOUT_all(