aboutsummaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/um70/keyboard.json85
-rw-r--r--keyboards/merge/um70/um70.c77
2 files changed, 85 insertions, 77 deletions
diff --git a/keyboards/merge/um70/keyboard.json b/keyboards/merge/um70/keyboard.json
index 7ebb61f7fe..0499ef5060 100644
--- a/keyboards/merge/um70/keyboard.json
+++ b/keyboards/merge/um70/keyboard.json
@@ -38,6 +38,91 @@
},
"rgb_matrix": {
"driver": "ws2812",
+ "layout": [
+ {"x": 224, "y": 0, "flags": 2},
+ {"x": 224, "y": 13, "flags": 2},
+ {"x": 224, "y": 26, "flags": 2},
+ {"x": 148, "y": 39, "flags": 2},
+ {"x": 185, "y": 52, "flags": 2},
+ {"x": 224, "y": 64, "flags": 2},
+ {"matrix": [0, 0], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 96, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 32, "y": 16, "flags": 1},
+ {"matrix": [1, 1], "x": 64, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 96, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 128, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 160, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 192, "y": 16, "flags": 4},
+ {"matrix": [4, 5], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 32, "y": 32, "flags": 1},
+ {"matrix": [2, 1], "x": 64, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 96, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 128, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 160, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 192, "y": 32, "flags": 4},
+ {"matrix": [4, 6], "x": 0, "y": 48, "flags": 4},
+ {"matrix": [3, 0], "x": 32, "y": 48, "flags": 1},
+ {"matrix": [3, 1], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 96, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 128, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 160, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 192, "y": 48, "flags": 4},
+ {"matrix": [4, 7], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [4, 0], "x": 32, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 64, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 96, "y": 64, "flags": 1},
+ {"matrix": [4, 3], "x": 128, "y": 64, "flags": 1},
+ {"matrix": [4, 4], "x": 160, "y": 64, "flags": 1},
+ {"x": 224, "y": 0, "flags": 2},
+ {"x": 224, "y": 13, "flags": 2},
+ {"x": 224, "y": 26, "flags": 2},
+ {"x": 148, "y": 39, "flags": 2},
+ {"x": 185, "y": 52, "flags": 2},
+ {"x": 224, "y": 64, "flags": 2},
+ {"matrix": [5, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [5, 1], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [5, 2], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [5, 3], "x": 96, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [5, 5], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [5, 6], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [5, 7], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [6, 0], "x": 0, "y": 16, "flags": 4},
+ {"matrix": [6, 1], "x": 32, "y": 16, "flags": 4},
+ {"matrix": [6, 2], "x": 64, "y": 16, "flags": 4},
+ {"matrix": [6, 3], "x": 96, "y": 16, "flags": 4},
+ {"matrix": [6, 4], "x": 128, "y": 16, "flags": 4},
+ {"matrix": [6, 5], "x": 160, "y": 16, "flags": 4},
+ {"matrix": [6, 6], "x": 192, "y": 16, "flags": 4},
+ {"matrix": [6, 7], "x": 223, "y": 16, "flags": 1},
+ {"matrix": [8, 7], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [7, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [7, 1], "x": 32, "y": 32, "flags": 4},
+ {"matrix": [7, 2], "x": 64, "y": 32, "flags": 4},
+ {"matrix": [7, 3], "x": 96, "y": 32, "flags": 4},
+ {"matrix": [7, 4], "x": 128, "y": 32, "flags": 4},
+ {"matrix": [7, 5], "x": 160, "y": 32, "flags": 4},
+ {"matrix": [7, 6], "x": 192, "y": 32, "flags": 1},
+ {"matrix": [9, 7], "x": 223, "y": 32, "flags": 4},
+ {"matrix": [8, 0], "x": 0, "y": 48, "flags": 4},
+ {"matrix": [8, 1], "x": 32, "y": 48, "flags": 4},
+ {"matrix": [8, 2], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [8, 3], "x": 96, "y": 48, "flags": 4},
+ {"matrix": [8, 4], "x": 128, "y": 48, "flags": 4},
+ {"matrix": [8, 5], "x": 160, "y": 48, "flags": 1},
+ {"matrix": [8, 6], "x": 192, "y": 48, "flags": 4},
+ {"matrix": [9, 0], "x": 0, "y": 46, "flags": 1},
+ {"matrix": [9, 1], "x": 32, "y": 46, "flags": 1},
+ {"matrix": [9, 2], "x": 64, "y": 64, "flags": 1},
+ {"matrix": [9, 3], "x": 96, "y": 64, "flags": 4},
+ {"matrix": [9, 4], "x": 128, "y": 64, "flags": 4},
+ {"matrix": [9, 5], "x": 160, "y": 64, "flags": 4}
+ ],
"split_count": [39, 44]
},
"rgblight": {
diff --git a/keyboards/merge/um70/um70.c b/keyboards/merge/um70/um70.c
deleted file mode 100644
index b63fcdbedd..0000000000
--- a/keyboards/merge/um70/um70.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 duoshock
- *
- * 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
-/*
- Underglow Underglow 13,14 = split bksp, 14 = 2u bksp
- 07 08 09 10 11 12 13 01 01 07 08 09 10 11 12 13 14
- 14 15 16 17 18 19 02 02 15 16 17 18 19 20 21 22 23
-20 21 22 23 24 25 26 03 03 24 25 26 27 28 29 30 31
-27 28 29 30 31 32 33 04 04 32 33 34 35 36 37 38
-34 35 36 37 38 39 05 05 39 40 41 42 43 44
- 06 06
-*/
-
-#define XX NO_LED
-
-led_config_t g_led_config = { {
- { 6, 7, 8, 9, 10, 11, 12, XX },
- { 13, 14, 15, 16, 17, 18, XX, XX },
- { 20, 21, 22, 23, 24, 25, XX, XX },
- { 27, 28, 29, 30, 31, 32, XX, XX },
- { 34, 35, 36, 37, 38, 19, 26, 33 },
-
- { 45, 46, 47, 48, 49, 50, 51, 52 },
- { 53, 54, 55, 56, 57, 58, 59, 60 },
- { 62, 63, 64, 65, 66, 67, 68, XX },
- { 70, 71, 72, 73, 74, 75, 76, 61 },
- { 77, 78, 79, 80, 81, 82, XX, 69 },
-}, {
- { 224, 0 }, { 224, 13 }, { 224, 26 }, { 148, 39 }, { 185, 52 }, { 224, 64 },
-
- { 32, 0 }, { 64, 0 }, { 96, 0 }, { 128, 0 }, { 160, 0 }, { 192, 0 }, { 224, 0 },
- { 32, 16 }, { 64, 16 }, { 96, 16 }, { 128, 16 }, { 160, 16 }, { 192, 16 },
- { 0, 32 }, { 32, 32 }, { 64, 32 }, { 96, 32 }, { 128, 32 }, { 160, 32 }, { 192, 32 },
- { 0, 48 }, { 32, 48 }, { 64, 48 }, { 96, 48 }, { 128, 48 }, { 160, 48 }, { 192, 48 },
- { 0, 64 }, { 32, 64 }, { 64, 64 }, { 96, 64 }, { 128, 64 }, { 160, 64 },
-
- { 224, 0 }, { 224, 13 }, { 224, 26 }, { 148, 39 }, { 185, 52 }, { 224, 64 },
-
- { 0, 0 }, { 32, 0 }, { 64, 0 }, { 96, 0 }, { 128, 0 }, { 160, 0 }, { 192, 0 }, { 224, 0 },
- { 0, 16 }, { 32, 16 }, { 64, 16 }, { 96, 16 }, { 128, 16 }, { 160, 16 }, { 192, 16 }, { 223, 16 }, { 224, 16 },
- { 0, 32 }, { 32, 32 }, { 64, 32 }, { 96, 32 }, { 128, 32 }, { 160, 32 }, { 192, 32 }, { 223, 32 },
- { 0, 48 }, { 32, 48 }, { 64, 48 }, { 96, 48 }, { 128, 48 }, { 160, 48 }, { 192, 48 },
- { 0, 46 }, { 32, 46 }, { 64, 64 }, { 96, 64 }, { 128, 64 }, { 160, 64 }
-
-}, {
- 2, 2, 2, 2, 2, 2,
- 4, 4, 4, 4, 4, 4, 4,
- 1, 4, 4, 4, 4, 4,
- 4, 1, 4, 4, 4, 4, 4,
- 4, 1, 4, 4, 4, 4, 4,
- 4, 1, 1, 1, 1, 1,
-
- 2, 2, 2, 2, 2, 2,
- 4, 4, 4, 4, 4, 4, 4, 1,
- 4, 4, 4, 4, 4, 4, 4, 1, 4,
- 4, 4, 4, 4, 4, 4, 1, 4,
- 4, 4, 4, 4, 4, 1, 4,
- 1, 1, 1, 4, 4, 4
-} };
-
-#endif \ No newline at end of file