summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-05-20 05:44:45 +0000
committerQMK Bot <hello@qmk.fm>2022-05-20 05:44:45 +0000
commit1557455f7f8dceef876209370b0735808292429c (patch)
tree125b226ae16cbccc22835866c19e56ea8db38cf5 /keyboards
parent0dbaa7e057d8614b9f7edc7568f3fa8ba17cee2b (diff)
parent90612fce92f560b4d8963482d75f36e642c1fb9f (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/s_ol/0xc_pad/0xc_pad.c20
-rw-r--r--keyboards/system76/launch_1/launch_1.c24
2 files changed, 27 insertions, 17 deletions
diff --git a/keyboards/s_ol/0xc_pad/0xc_pad.c b/keyboards/s_ol/0xc_pad/0xc_pad.c
index b8dd2976ef..c471da92cc 100644
--- a/keyboards/s_ol/0xc_pad/0xc_pad.c
+++ b/keyboards/s_ol/0xc_pad/0xc_pad.c
@@ -16,15 +16,19 @@
#include "0xc_pad.h"
#ifdef RGB_MATRIX_ENABLE
-# define Q(...) __VA_ARGS__
-
-led_config_t g_led_config = {
+led_config_t g_led_config = { {
// indices
- LAYOUT(0, 6, 1, 5, 7, 2, 4, 8, 11, 3, 9, 10),
+ { 0, 6, KC_NO, KC_NO },
+ { 1, 5, 7, KC_NO },
+ { 2, 4, 8, 11 },
+ { KC_NO, 3, 9, 10 }
+}, {
// phys position
- LED_LAYOUT(Q({96, 110}), Q({128, 110}), Q({80, 83}), Q({112, 83}), Q({144, 83}), Q({64, 55}), Q({96, 55}), Q({128, 55}), Q({160, 55}), Q({80, 28}), Q({112, 28}), Q({144, 28})),
+ { 96, 110}, { 80, 83}, { 64, 55}, { 80, 28},
+ { 96, 55}, {112, 83}, {128, 110}, {144, 83},
+ {128, 55}, {112, 28}, {144, 28}, {160, 55}
+}, {
// flags
- LED_LAYOUT(4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4),
-};
-# undef Q
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+} };
#endif
diff --git a/keyboards/system76/launch_1/launch_1.c b/keyboards/system76/launch_1/launch_1.c
index 0250b9d9cc..74288edf03 100644
--- a/keyboards/system76/launch_1/launch_1.c
+++ b/keyboards/system76/launch_1/launch_1.c
@@ -32,16 +32,22 @@
// 60 LI1 LH1 LG1 LF1 LE1 LD1 LC1 LB1 LA1 LA0
// 70 LB0 LC0 LD0 LE0 LF0 LG0 LH0 LI0 LJ0 LK0
// 80 LL0 LM0 LN0 LO0
-led_config_t g_led_config = { LAYOUT(
+led_config_t g_led_config = { {
// Key matrix to LED index
- /* A B C D E F G H I J K L M N O */
-/* 0 */ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
-/* 1 */ 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54,
-/* 2 */ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
-/* 3 */ 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25,
-/* 4 */ 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
-/* 5 */ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24
-), {
+/* A B C D E F G H I J K L M N O */
+/* 0 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, */
+/* 1 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, */
+/* 2 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, */
+/* 3 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, */
+/* 4 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, */
+/* 5 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 */
+ { 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82 },
+ { 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55 },
+ { 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52 },
+ { 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 83 },
+ { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 54 },
+ { 13, 14, 15, 16, 17, 25, 18, 19, 20, 21, 22, 23, 24, 53 },
+}, {
// LED index to physical position (see leds.sh in `launch' repo)
/* 00 */ {209, 51}, {190, 51}, {171, 51}, {156, 51}, {140, 51}, {125, 51}, {110, 51}, {95, 51}, {80, 51}, {65, 51},
/* 10 */ {49, 51}, {34, 51}, {11, 51}, {8, 64}, {27, 64}, {42, 64}, {57, 64}, {80, 64}, {110, 64}, {133, 64},