summaryrefslogtreecommitdiff
path: root/keyboards/ilumkb
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-27 07:49:03 +1000
committerGitHub <noreply@github.com>2023-04-27 07:49:03 +1000
commit4d8dd55bf9b36f5d60afbf01fe192f9a1a7627f3 (patch)
treee2bcf6c8883e21cc8bece10ead2b21c0b49766b6 /keyboards/ilumkb
parent4871f651c5328cc8c16d1ec991f3e865094b24c8 (diff)
Move 60% layouts to data driven (#20477)
Diffstat (limited to 'keyboards/ilumkb')
-rw-r--r--keyboards/ilumkb/simpler61/info.json123
-rw-r--r--keyboards/ilumkb/simpler61/simpler61.c2
-rw-r--r--keyboards/ilumkb/simpler61/simpler61.h35
-rw-r--r--keyboards/ilumkb/simpler64/info.json128
-rw-r--r--keyboards/ilumkb/simpler64/simpler64.c2
-rw-r--r--keyboards/ilumkb/simpler64/simpler64.h35
6 files changed, 128 insertions, 197 deletions
diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json
index 8b2d379a38..53e00d8027 100644
--- a/keyboards/ilumkb/simpler61/info.json
+++ b/keyboards/ilumkb/simpler61/info.json
@@ -22,72 +22,73 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT_61_ansi": { 23 "LAYOUT_61_ansi": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":6, "y":0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"x":7, "y":0}, 32 {"matrix": [0, 7], "x": 7, "y": 0},
33 {"x":8, "y":0}, 33 {"matrix": [0, 8], "x": 8, "y": 0},
34 {"x":9, "y":0}, 34 {"matrix": [0, 9], "x": 9, "y": 0},
35 {"x":10, "y":0}, 35 {"matrix": [0, 10], "x": 10, "y": 0},
36 {"x":11, "y":0}, 36 {"matrix": [0, 11], "x": 11, "y": 0},
37 {"x":12, "y":0}, 37 {"matrix": [0, 12], "x": 12, "y": 0},
38 {"x":13, "y":0, "w":2}, 38 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
39 39
40 {"x":0, "y":1, "w":1.5}, 40 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
41 {"x":1.5, "y":1}, 41 {"matrix": [1, 1], "x": 1.5, "y": 1},
42 {"x":2.5, "y":1}, 42 {"matrix": [1, 2], "x": 2.5, "y": 1},
43 {"x":3.5, "y":1}, 43 {"matrix": [1, 3], "x": 3.5, "y": 1},
44 {"x":4.5, "y":1}, 44 {"matrix": [1, 4], "x": 4.5, "y": 1},
45 {"x":5.5, "y":1}, 45 {"matrix": [1, 5], "x": 5.5, "y": 1},
46 {"x":6.5, "y":1}, 46 {"matrix": [1, 6], "x": 6.5, "y": 1},
47 {"x":7.5, "y":1}, 47 {"matrix": [1, 7], "x": 7.5, "y": 1},
48 {"x":8.5, "y":1}, 48 {"matrix": [1, 8], "x": 8.5, "y": 1},
49 {"x":9.5, "y":1}, 49 {"matrix": [1, 9], "x": 9.5, "y": 1},
50 {"x":10.5, "y":1}, 50 {"matrix": [1, 10], "x": 10.5, "y": 1},
51 {"x":11.5, "y":1}, 51 {"matrix": [1, 11], "x": 11.5, "y": 1},
52 {"x":12.5, "y":1}, 52 {"matrix": [1, 12], "x": 12.5, "y": 1},
53 {"x":13.5, "y":1, "w":1.5}, 53 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
54 54
55 {"x":0, "y":2, "w":1.75}, 55 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
56 {"x":1.75, "y":2}, 56 {"matrix": [2, 1], "x": 1.75, "y": 2},
57 {"x":2.75, "y":2}, 57 {"matrix": [2, 2], "x": 2.75, "y": 2},
58 {"x":3.75, "y":2}, 58 {"matrix": [2, 3], "x": 3.75, "y": 2},
59 {"x":4.75, "y":2}, 59 {"matrix": [2, 4], "x": 4.75, "y": 2},
60 {"x":5.75, "y":2}, 60 {"matrix": [2, 5], "x": 5.75, "y": 2},
61 {"x":6.75, "y":2}, 61 {"matrix": [2, 6], "x": 6.75, "y": 2},
62 {"x":7.75, "y":2}, 62 {"matrix": [2, 7], "x": 7.75, "y": 2},
63 {"x":8.75, "y":2}, 63 {"matrix": [2, 8], "x": 8.75, "y": 2},
64 {"x":9.75, "y":2}, 64 {"matrix": [2, 9], "x": 9.75, "y": 2},
65 {"x":10.75, "y":2}, 65 {"matrix": [2, 10], "x": 10.75, "y": 2},
66 {"x":11.75, "y":2}, 66 {"matrix": [2, 11], "x": 11.75, "y": 2},
67 {"x":12.75, "y":2, "w":2.25}, 67 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
68 68
69 {"x":0, "y":3, "w":2.25}, 69 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
70 {"x":2.25, "y":3}, 70 {"matrix": [3, 1], "x": 2.25, "y": 3},
71 {"x":3.25, "y":3}, 71 {"matrix": [3, 2], "x": 3.25, "y": 3},
72 {"x":4.25, "y":3}, 72 {"matrix": [3, 3], "x": 4.25, "y": 3},
73 {"x":5.25, "y":3}, 73 {"matrix": [3, 4], "x": 5.25, "y": 3},
74 {"x":6.25, "y":3}, 74 {"matrix": [3, 5], "x": 6.25, "y": 3},
75 {"x":7.25, "y":3}, 75 {"matrix": [3, 6], "x": 7.25, "y": 3},
76 {"x":8.25, "y":3}, 76 {"matrix": [3, 7], "x": 8.25, "y": 3},
77 {"x":9.25, "y":3}, 77 {"matrix": [3, 8], "x": 9.25, "y": 3},
78 {"x":10.25, "y":3}, 78 {"matrix": [3, 9], "x": 10.25, "y": 3},
79 {"x":11.25, "y":3}, 79 {"matrix": [3, 10], "x": 11.25, "y": 3},
80 {"x":12.25, "y":3, "w":1.75}, 80 {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
81 {"x":14, "y":3}, 81 {"matrix": [3, 13], "x": 14, "y": 3},
82 82
83 {"x":0, "y":4, "w":1.5}, 83 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
84 {"x":1.5, "y":4}, 84 {"matrix": [4, 1], "x": 1.5, "y": 4},
85 {"x":2.5, "y":4, "w":1.5}, 85 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
86 {"x":4, "y":4, "w":7}, 86 {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
87 {"x":11, "y":4, "w":1.5}, 87 {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
88 {"x":12.5, "y":4}, 88 {"matrix": [4, 11], "x": 12.5, "y": 4},
89 {"x":13.5, "y":4, "w":1.5} 89 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
90 ] 90 ]
91 } 91 }
92 } 92 }
93
93} 94}
diff --git a/keyboards/ilumkb/simpler61/simpler61.c b/keyboards/ilumkb/simpler61/simpler61.c
index 4fcc5c9245..32670396da 100644
--- a/keyboards/ilumkb/simpler61/simpler61.c
+++ b/keyboards/ilumkb/simpler61/simpler61.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "simpler61.h" 17#include "quantum.h"
18 18
19#ifdef RGB_MATRIX_ENABLE 19#ifdef RGB_MATRIX_ENABLE
20const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { 20const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/ilumkb/simpler61/simpler61.h b/keyboards/ilumkb/simpler61/simpler61.h
deleted file mode 100644
index afa308b12d..0000000000
--- a/keyboards/ilumkb/simpler61/simpler61.h
+++ /dev/null
@@ -1,35 +0,0 @@
1/* Copyright 2021 Equalz
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define XXX KC_NO
22
23#define LAYOUT_61_ansi( \
24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
27 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
28 K40, K41, K42, K45, K4A, K4B, K4D \
29) { \
30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
32 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
33 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
34 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, K4B, XXX, K4D } \
35}
diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json
index b13b3fbf3c..575b1681e4 100644
--- a/keyboards/ilumkb/simpler64/info.json
+++ b/keyboards/ilumkb/simpler64/info.json
@@ -22,74 +22,74 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT_64_ansi": { 23 "LAYOUT_64_ansi": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":6, "y":0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"x":7, "y":0}, 32 {"matrix": [0, 7], "x": 7, "y": 0},
33 {"x":8, "y":0}, 33 {"matrix": [0, 8], "x": 8, "y": 0},
34 {"x":9, "y":0}, 34 {"matrix": [0, 9], "x": 9, "y": 0},
35 {"x":10, "y":0}, 35 {"matrix": [0, 10], "x": 10, "y": 0},
36 {"x":11, "y":0}, 36 {"matrix": [0, 11], "x": 11, "y": 0},
37 {"x":12, "y":0}, 37 {"matrix": [0, 12], "x": 12, "y": 0},
38 {"x":13, "y":0, "w":2}, 38 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
39 39
40 {"x":0, "y":1, "w":1.5}, 40 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
41 {"x":1.5, "y":1}, 41 {"matrix": [1, 1], "x": 1.5, "y": 1},
42 {"x":2.5, "y":1}, 42 {"matrix": [1, 2], "x": 2.5, "y": 1},
43 {"x":3.5, "y":1}, 43 {"matrix": [1, 3], "x": 3.5, "y": 1},
44 {"x":4.5, "y":1}, 44 {"matrix": [1, 4], "x": 4.5, "y": 1},
45 {"x":5.5, "y":1}, 45 {"matrix": [1, 5], "x": 5.5, "y": 1},
46 {"x":6.5, "y":1}, 46 {"matrix": [1, 6], "x": 6.5, "y": 1},
47 {"x":7.5, "y":1}, 47 {"matrix": [1, 7], "x": 7.5, "y": 1},
48 {"x":8.5, "y":1}, 48 {"matrix": [1, 8], "x": 8.5, "y": 1},
49 {"x":9.5, "y":1}, 49 {"matrix": [1, 9], "x": 9.5, "y": 1},
50 {"x":10.5, "y":1}, 50 {"matrix": [1, 10], "x": 10.5, "y": 1},
51 {"x":11.5, "y":1}, 51 {"matrix": [1, 11], "x": 11.5, "y": 1},
52 {"x":12.5, "y":1}, 52 {"matrix": [1, 12], "x": 12.5, "y": 1},
53 {"x":13.5, "y":1, "w":1.5}, 53 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
54 54
55 {"x":0, "y":2, "w":1.75}, 55 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
56 {"x":1.75, "y":2}, 56 {"matrix": [2, 1], "x": 1.75, "y": 2},
57 {"x":2.75, "y":2}, 57 {"matrix": [2, 2], "x": 2.75, "y": 2},
58 {"x":3.75, "y":2}, 58 {"matrix": [2, 3], "x": 3.75, "y": 2},
59 {"x":4.75, "y":2}, 59 {"matrix": [2, 4], "x": 4.75, "y": 2},
60 {"x":5.75, "y":2}, 60 {"matrix": [2, 5], "x": 5.75, "y": 2},
61 {"x":6.75, "y":2}, 61 {"matrix": [2, 6], "x": 6.75, "y": 2},
62 {"x":7.75, "y":2}, 62 {"matrix": [2, 7], "x": 7.75, "y": 2},
63 {"x":8.75, "y":2}, 63 {"matrix": [2, 8], "x": 8.75, "y": 2},
64 {"x":9.75, "y":2}, 64 {"matrix": [2, 9], "x": 9.75, "y": 2},
65 {"x":10.75, "y":2}, 65 {"matrix": [2, 10], "x": 10.75, "y": 2},
66 {"x":11.75, "y":2}, 66 {"matrix": [2, 11], "x": 11.75, "y": 2},
67 {"x":12.75, "y":2, "w":2.25}, 67 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
68 68
69 {"x":0, "y":3, "w":2}, 69 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
70 {"x":2, "y":3}, 70 {"matrix": [3, 1], "x": 2, "y": 3},
71 {"x":3, "y":3}, 71 {"matrix": [3, 2], "x": 3, "y": 3},
72 {"x":4, "y":3}, 72 {"matrix": [3, 3], "x": 4, "y": 3},
73 {"x":5, "y":3}, 73 {"matrix": [3, 4], "x": 5, "y": 3},
74 {"x":6, "y":3}, 74 {"matrix": [3, 5], "x": 6, "y": 3},
75 {"x":7, "y":3}, 75 {"matrix": [3, 6], "x": 7, "y": 3},
76 {"x":8, "y":3}, 76 {"matrix": [3, 7], "x": 8, "y": 3},
77 {"x":9, "y":3}, 77 {"matrix": [3, 8], "x": 9, "y": 3},
78 {"x":10, "y":3}, 78 {"matrix": [3, 9], "x": 10, "y": 3},
79 {"x":11, "y":3}, 79 {"matrix": [3, 10], "x": 11, "y": 3},
80 {"x":12, "y":3}, 80 {"matrix": [3, 11], "x": 12, "y": 3},
81 {"x":13, "y":3}, 81 {"matrix": [3, 12], "x": 13, "y": 3},
82 {"x":14, "y":3}, 82 {"matrix": [3, 13], "x": 14, "y": 3},
83 83
84 {"x":0, "y":4, "w":1.25}, 84 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
85 {"x":1.25, "y":4, "w":1.25}, 85 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
86 {"x":2.5, "y":4, "w":1.25}, 86 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
87 {"x":3.75, "y":4, "w":6.25}, 87 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
88 {"x":10, "y":4}, 88 {"matrix": [4, 9], "x": 10, "y": 4},
89 {"x":11, "y":4}, 89 {"matrix": [4, 10], "x": 11, "y": 4},
90 {"x":12, "y":4}, 90 {"matrix": [4, 11], "x": 12, "y": 4},
91 {"x":13, "y":4}, 91 {"matrix": [4, 12], "x": 13, "y": 4},
92 {"x":14, "y":4} 92 {"matrix": [4, 13], "x": 14, "y": 4}
93 ] 93 ]
94 } 94 }
95 } 95 }
diff --git a/keyboards/ilumkb/simpler64/simpler64.c b/keyboards/ilumkb/simpler64/simpler64.c
index c42a444576..130898f037 100644
--- a/keyboards/ilumkb/simpler64/simpler64.c
+++ b/keyboards/ilumkb/simpler64/simpler64.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "simpler64.h" 17#include "quantum.h"
18 18
19#ifdef RGB_MATRIX_ENABLE 19#ifdef RGB_MATRIX_ENABLE
20const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { 20const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/ilumkb/simpler64/simpler64.h b/keyboards/ilumkb/simpler64/simpler64.h
deleted file mode 100644
index 01a8bbc34f..0000000000
--- a/keyboards/ilumkb/simpler64/simpler64.h
+++ /dev/null
@@ -1,35 +0,0 @@
1/* Copyright 2021 Equalz
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define XXX KC_NO
22
23#define LAYOUT_64_ansi( \
24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
27 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
28 K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D \
29) { \
30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
32 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
33 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
34 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D } \
35}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 06:05:02 +0000