aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/latincompass
diff options
context:
space:
mode:
authorJack Sangdahl2025-09-09 12:50:36 +0200
committerGitHub2025-09-09 12:50:36 +0200
commitdb9b295aa720721ea3e3f94617a90dfc7dcbad58 (patch)
tree994d9f3b6a4c3d9b87ffc63e2a47bcdd03878463 /keyboards/latincompass
parent3934a7f3c8e153d020d84fc5823379d3af21cfe9 (diff)
Migrate `g_led_config` to DD (L) (#25617)
Diffstat (limited to 'keyboards/latincompass')
-rw-r--r--keyboards/latincompass/latin17rgb/keyboard.json19
-rw-r--r--keyboards/latincompass/latin17rgb/latin17rgb.c54
-rw-r--r--keyboards/latincompass/latin6rgb/keyboard.json8
-rw-r--r--keyboards/latincompass/latin6rgb/latin6rgb.c43
-rw-r--r--keyboards/latincompass/latinpad/keyboard.json22
-rw-r--r--keyboards/latincompass/latinpad/latinpad.c38
6 files changed, 77 insertions, 107 deletions
diff --git a/keyboards/latincompass/latin17rgb/keyboard.json b/keyboards/latincompass/latin17rgb/keyboard.json
index 6dab2faf68..d6689f203a 100644
--- a/keyboards/latincompass/latin17rgb/keyboard.json
+++ b/keyboards/latincompass/latin17rgb/keyboard.json
@@ -61,6 +61,25 @@
"solid_reactive": true
},
"driver": "is31fl3731",
+ "layout": [
+ {"matrix": [0, 0], "x": 48, "y": 32, "flags": 4},
+ {"matrix": [0, 1], "x": 48, "y": 48, "flags": 4},
+ {"matrix": [0, 2], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [0, 3], "x": 80, "y": 48, "flags": 1},
+ {"matrix": [1, 0], "x": 16, "y": 32, "flags": 1},
+ {"matrix": [1, 1], "x": 16, "y": 48, "flags": 1},
+ {"matrix": [1, 2], "x": 32, "y": 48, "flags": 4},
+ {"matrix": [1, 3], "x": 64, "y": 64, "flags": 1},
+ {"matrix": [2, 0], "x": 80, "y": 16, "flags": 1},
+ {"matrix": [2, 1], "x": 64, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 80, "y": 32, "flags": 4},
+ {"matrix": [3, 0], "x": 112, "y": 0, "flags": 1},
+ {"matrix": [3, 1], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [3, 2], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [3, 3], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [4, 0], "x": 128, "y": 16, "flags": 4},
+ {"matrix": [4, 1], "x": 144, "y": 16, "flags": 4}
+ ],
"sleep": true
},
"features": {
diff --git a/keyboards/latincompass/latin17rgb/latin17rgb.c b/keyboards/latincompass/latin17rgb/latin17rgb.c
index 54705bf4f7..c9120920eb 100644
--- a/keyboards/latincompass/latin17rgb/latin17rgb.c
+++ b/keyboards/latincompass/latin17rgb/latin17rgb.c
@@ -1,18 +1,18 @@
/* Copyright 2021 18438880
- *
- * 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/>.
- */
+ *
+ * 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 "quantum.h"
#ifdef RGB_MATRIX_ENABLE
@@ -31,7 +31,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
{0, C1_12, C2_12, C3_12},// BL5
{0, C1_13, C2_13, C3_13},// BL6
{0, C1_6, C2_6, C3_6},// BL7
- {0, C1_7, C2_7, C3_7},//BL8
+ {0, C1_7, C2_7, C3_7},//BL8
{0, C1_8, C2_8, C3_8},// BL9
{0, C1_14, C2_14, C3_14},// BL10
{0, C1_15, C2_15, C3_15},// BL11
@@ -41,30 +41,6 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
{0, C9_3, C8_3, C7_3},//BL15
{0, C9_5, C8_5, C7_5},// BL16
{0, C9_6, C8_6, C7_6},// BL17
-
-};
-led_config_t g_led_config = {
- {
- { 0, 1, 2, 3},
- { 4, 5, 6, 7},
- { 8, 9, 10, NO_LED},
- { 11, 12, 13, 14},
- { 15, 16, NO_LED, NO_LED},
- },
- {
- { 48, 32},{ 48, 48},{ 64, 48},{ 80, 48},
- { 16, 32},{ 16, 48}, { 32, 48},{ 64, 64},
- { 80, 16},{ 64, 32},{ 80, 32},
- {112, 0},{128, 0},{144, 0},{160, 0},
- {128, 16},{144, 16}
- },
- {
- 4, 4, 4, 1,
- 1, 1, 4, 1,
- 1, 4, 4,
- 1, 4, 4, 4,
- 4, 4
- }
};
#endif
diff --git a/keyboards/latincompass/latin6rgb/keyboard.json b/keyboards/latincompass/latin6rgb/keyboard.json
index d2708df399..6674b58205 100644
--- a/keyboards/latincompass/latin6rgb/keyboard.json
+++ b/keyboards/latincompass/latin6rgb/keyboard.json
@@ -39,6 +39,14 @@
"solid_reactive": true
},
"driver": "is31fl3731",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [0, 1], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [0, 2], "x": 112, "y": 64, "flags": 4},
+ {"matrix": [1, 0], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 1], "x": 112, "y": 32, "flags": 1},
+ {"matrix": [1, 2], "x": 224, "y": 32, "flags": 4}
+ ],
"sleep": true
},
"matrix_pins": {
diff --git a/keyboards/latincompass/latin6rgb/latin6rgb.c b/keyboards/latincompass/latin6rgb/latin6rgb.c
index 779373ae8f..1176063c37 100644
--- a/keyboards/latincompass/latin6rgb/latin6rgb.c
+++ b/keyboards/latincompass/latin6rgb/latin6rgb.c
@@ -1,18 +1,18 @@
/* Copyright 2021 18438880
- *
- * 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/>.
- */
+ *
+ * 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 "quantum.h"
#ifdef RGB_MATRIX_ENABLE
@@ -31,19 +31,4 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
{0, C1_12, C2_12, C3_12},// BL5
{0, C1_13, C2_13, C3_13},// BL6
};
-
-led_config_t g_led_config = {
- {
- { 0, 1, 2},
- { 3, 4, 5},
- },
- {
- { 48, 32},{ 48, 48},{ 64, 48},
- { 80, 16},{ 64, 32},{ 80, 32}
- },
- {
- 4, 4, 4,
- 1, 1, 4
- }
-};
#endif
diff --git a/keyboards/latincompass/latinpad/keyboard.json b/keyboards/latincompass/latinpad/keyboard.json
index 3b4563b1ca..930cdadad8 100644
--- a/keyboards/latincompass/latinpad/keyboard.json
+++ b/keyboards/latincompass/latinpad/keyboard.json
@@ -40,7 +40,27 @@
"pixel_flow": true,
"pixel_fractal": true
},
- "driver": "ws2812"
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 16, "flags": 1},
+ {"matrix": [0, 1], "x": 74, "y": 16, "flags": 1},
+ {"matrix": [0, 2], "x": 148, "y": 16, "flags": 1},
+ {"matrix": [0, 3], "x": 224, "y": 16, "flags": 1},
+ {"matrix": [1, 0], "x": 0, "y": 32, "flags": 1},
+ {"matrix": [1, 1], "x": 74, "y": 32, "flags": 1},
+ {"matrix": [1, 2], "x": 148, "y": 32, "flags": 1},
+ {"matrix": [1, 3], "x": 224, "y": 32, "flags": 1},
+ {"matrix": [2, 0], "x": 0, "y": 48, "flags": 1},
+ {"matrix": [2, 1], "x": 74, "y": 48, "flags": 1},
+ {"matrix": [2, 2], "x": 148, "y": 48, "flags": 1},
+ {"matrix": [2, 3], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+ {"matrix": [3, 1], "x": 74, "y": 64, "flags": 1},
+ {"matrix": [3, 2], "x": 148, "y": 64, "flags": 1},
+ {"matrix": [3, 3], "x": 224, "y": 64, "flags": 1},
+ {"matrix": [4, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [4, 1], "x": 74, "y": 0, "flags": 1}
+ ]
},
"features": {
"bootmagic": true,
diff --git a/keyboards/latincompass/latinpad/latinpad.c b/keyboards/latincompass/latinpad/latinpad.c
deleted file mode 100644
index b476b4c238..0000000000
--- a/keyboards/latincompass/latinpad/latinpad.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 latincompass
- *
- * 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 "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- { 0, 1, 2, 3 },
- { 4, 5, 6, 7 },
- { 8, 9, 10, 11 },
- { 12, 13, 14, 15 },
- { 16, 17, NO_LED, NO_LED }
-},{
- { 74, 21 }, { 37, 21 }, { 24, 21 }, { 18, 21 },
- { 74, 10 }, { 37, 10 }, { 28, 10 }, { 18, 10 },
- { 74, 7 }, { 37, 7 }, { 20, 7 }, { 18, 7 },
- { 74, 5 }, { 37, 5 }, { 22, 5 }, { 18, 5 },
- { 74, 5 }, { 37, 5 },
-},{
- 1, 1, 1, 1,
- 1, 1, 1, 1,
- 1, 1, 1, 1,
- 1, 1, 1, 1,
- 1, 1
-} };
-#endif