aboutsummaryrefslogtreecommitdiff
path: root/keyboards/geekboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/geekboards')
-rw-r--r--keyboards/geekboards/macropad_v2/keyboard.json44
-rw-r--r--keyboards/geekboards/macropad_v2/macropad_v2.c56
-rw-r--r--keyboards/geekboards/tester/keyboard.json10
-rw-r--r--keyboards/geekboards/tester/tester.c13
4 files changed, 54 insertions, 69 deletions
diff --git a/keyboards/geekboards/macropad_v2/keyboard.json b/keyboards/geekboards/macropad_v2/keyboard.json
index a34912aee3..2719faa764 100644
--- a/keyboards/geekboards/macropad_v2/keyboard.json
+++ b/keyboards/geekboards/macropad_v2/keyboard.json
@@ -51,6 +51,50 @@
"val": 192
},
"driver": "ws2812",
+ "layout": [
+ {"matrix": [1, 1], "x": 85, "y": 46, "flags": 4},
+ {"x": 85, "y": 64, "flags": 2},
+ {"x": 67, "y": 64, "flags": 2},
+ {"x": 49, "y": 64, "flags": 2},
+ {"x": 31, "y": 64, "flags": 2},
+ {"x": 13, "y": 64, "flags": 2},
+ {"matrix": [1, 0], "x": 31, "y": 46, "flags": 4},
+ {"x": 0, "y": 55, "flags": 2},
+ {"x": 0, "y": 46, "flags": 2},
+ {"x": 0, "y": 37, "flags": 2},
+ {"x": 0, "y": 27, "flags": 2},
+ {"x": 0, "y": 18, "flags": 2},
+ {"x": 0, "y": 9, "flags": 2},
+ {"matrix": [0, 0], "x": 31, "y": 18, "flags": 4},
+ {"x": 13, "y": 0, "flags": 2},
+ {"x": 31, "y": 0, "flags": 2},
+ {"x": 49, "y": 0, "flags": 2},
+ {"x": 67, "y": 0, "flags": 2},
+ {"x": 85, "y": 0, "flags": 2},
+ {"matrix": [0, 1], "x": 85, "y": 18, "flags": 4},
+ {"matrix": [0, 2], "x": 139, "y": 18, "flags": 4},
+ {"x": 139, "y": 0, "flags": 2},
+ {"x": 157, "y": 0, "flags": 2},
+ {"x": 175, "y": 0, "flags": 2},
+ {"x": 193, "y": 0, "flags": 2},
+ {"x": 211, "y": 0, "flags": 2},
+ {"matrix": [0, 3], "x": 193, "y": 18, "flags": 4},
+ {"x": 224, "y": 9, "flags": 2},
+ {"x": 224, "y": 18, "flags": 2},
+ {"x": 224, "y": 27, "flags": 2},
+ {"x": 224, "y": 37, "flags": 2},
+ {"x": 224, "y": 46, "flags": 2},
+ {"x": 224, "y": 55, "flags": 2},
+ {"matrix": [1, 3], "x": 193, "y": 46, "flags": 4},
+ {"x": 211, "y": 64, "flags": 2},
+ {"x": 193, "y": 64, "flags": 2},
+ {"x": 175, "y": 64, "flags": 2},
+ {"x": 157, "y": 64, "flags": 2},
+ {"matrix": [1, 2], "x": 139, "y": 46, "flags": 4},
+ {"x": 139, "y": 64, "flags": 2},
+ {"x": 121, "y": 64, "flags": 2},
+ {"x": 103, "y": 64, "flags": 2}
+ ],
"sleep": true
},
"processor": "STM32F072",
diff --git a/keyboards/geekboards/macropad_v2/macropad_v2.c b/keyboards/geekboards/macropad_v2/macropad_v2.c
deleted file mode 100644
index ba65697988..0000000000
--- a/keyboards/geekboards/macropad_v2/macropad_v2.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
- *
- * 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 = { {
- // Key Matrix to LED Index
- {13,19,20,26}, {6,0,38,33},
-}, {
- // LED Index to Physical Position
- {85,46},
- {85,64},{67,64},{49,64},{31,64},{13,64},
- {31,46},
- {0,55},{0,46},{0,37},{0,27},{0,18},{0,9},
- {31,18},
- {13,0},{31,0},{49,0},{67,0},{85,0},
- {85,18},{139,18},
- {139,0},{157,0},{175,0},{193,0},{211,0},
- {193,18},
- {224,9},{224,18},{224,27},{224,37},{224,46},{224,55},
- {193,46},
- {211,64},{193,64},{175,64},{157,64},
- {139,46},
- {139,64},{121,64},{103,64},
-}, {
- // LED Index to Flag, 2=backlight, 4=key
- 4,
- 2, 2, 2, 2, 2,
- 4,
- 2, 2, 2, 2, 2, 2,
- 4,
- 2, 2, 2, 2, 2,
- 4, 4,
- 2, 2, 2, 2, 2,
- 4,
- 2, 2, 2, 2, 2, 2,
- 4,
- 2, 2, 2, 2,
- 4,
- 2, 2, 2
-} };
-
-#endif
diff --git a/keyboards/geekboards/tester/keyboard.json b/keyboards/geekboards/tester/keyboard.json
index 2b85961df8..236c2c697f 100644
--- a/keyboards/geekboards/tester/keyboard.json
+++ b/keyboards/geekboards/tester/keyboard.json
@@ -50,6 +50,16 @@
"solid_reactive_multinexus": true
},
"driver": "is31fl3731",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 151, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [1, 1], "x": 75, "y": 64, "flags": 4},
+ {"matrix": [1, 2], "x": 151, "y": 64, "flags": 4},
+ {"matrix": [1, 3], "x": 224, "y": 64, "flags": 4}
+ ],
"sleep": true
},
"features": {
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index 4daa4ef062..001fd06e9d 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -16,16 +16,3 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
{0, C1_7, C2_7, C3_7}, //A7
{0, C1_8, C2_8, C3_8}, //A8
};
-
-led_config_t g_led_config = {
-{
- { 0, 1, 2, 3},
- { 4, 5, 6, 7}
-},
-{
- { 0, 0 }, { 75, 0 }, { 151, 0 }, { 224, 0 }, { 0, 64 }, { 75, 64 }, { 151, 64 }, { 224, 64 }
-},
-{
- 4, 4, 4, 4, 4, 4, 4, 4
-}
-};