aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechlovin/olly
diff options
context:
space:
mode:
authorRyan <[email protected]>2024-07-19 08:13:49 +1000
committerGitHub <[email protected]>2024-07-19 08:13:49 +1000
commit7b4e806c25f791ffec0c5f336164d33dccab21b8 (patch)
treec930c09f9edfedca8ee942ca9feffd81f13764d7 /keyboards/mechlovin/olly
parent8b46500a74fa85e06249c2bd74125e0d534320ee (diff)
downloadqmk_firmware-7b4e806c25f791ffec0c5f336164d33dccab21b8.tar.gz
qmk_firmware-7b4e806c25f791ffec0c5f336164d33dccab21b8.zip
Move LED Matrix LED config to data driven (#24122)
Diffstat (limited to 'keyboards/mechlovin/olly')
-rw-r--r--keyboards/mechlovin/olly/jf/rev2/keyboard.json227
-rw-r--r--keyboards/mechlovin/olly/jf/rev2/rev2.c2
2 files changed, 124 insertions, 105 deletions
diff --git a/keyboards/mechlovin/olly/jf/rev2/keyboard.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
index 3771188638..aa87d59847 100644
--- a/keyboards/mechlovin/olly/jf/rev2/keyboard.json
+++ b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
@@ -42,111 +42,130 @@
"driver": "is31fl3731",
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
- {"matrix": [0, 2], "x": 24, "y": 0, "flags": 4},
- {"matrix": [0, 3], "x": 37, "y": 0, "flags": 4},
- {"matrix": [0, 4], "x": 49, "y": 0, "flags": 4},
- {"matrix": [0, 5], "x": 62, "y": 0, "flags": 4},
- {"matrix": [0, 6], "x": 74, "y": 0, "flags": 4},
- {"matrix": [0, 7], "x": 87, "y": 0, "flags": 4},
- {"matrix": [0, 8], "x": 99, "y": 0, "flags": 4},
- {"matrix": [0, 9], "x": 122, "y": 0, "flags": 4},
- {"matrix": [0, 10], "x": 124, "y": 0, "flags": 4},
- {"matrix": [0, 11], "x": 137, "y": 0, "flags": 4},
- {"matrix": [0, 12], "x": 140, "y": 0, "flags": 4},
- {"matrix": [0, 13], "x": 162, "y": 0, "flags": 4},
- {"matrix": [0, 14], "x": 174, "y": 0, "flags": 4},
- {"matrix": [0, 15], "x": 186, "y": 0, "flags": 4},
- {"matrix": [0, 16], "x": 199, "y": 0, "flags": 4},
- {"matrix": [0, 17], "x": 211, "y": 0, "flags": 4},
+
+ {"matrix": [0, 2], "x": 17, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 29, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 40, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 52, "y": 0, "flags": 4},
+
+ {"matrix": [0, 6], "x": 69, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 92, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 103, "y": 0, "flags": 4},
+
+ {"matrix": [0, 10], "x": 121, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 132, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 155, "y": 0, "flags": 4},
+
+ {"matrix": [0, 14], "x": 175, "y": 0, "flags": 4},
+
+ {"matrix": [0, 15], "x": 190, "y": 0, "flags": 4},
+ {"matrix": [0, 16], "x": 201, "y": 0, "flags": 4},
+ {"matrix": [0, 17], "x": 213, "y": 0, "flags": 4},
{"matrix": [0, 18], "x": 224, "y": 0, "flags": 4},
- {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
- {"matrix": [1, 1], "x": 12, "y": 13, "flags": 4},
- {"matrix": [1, 2], "x": 24, "y": 13, "flags": 4},
- {"matrix": [1, 3], "x": 37, "y": 13, "flags": 4},
- {"matrix": [1, 4], "x": 49, "y": 13, "flags": 4},
- {"matrix": [1, 5], "x": 62, "y": 13, "flags": 4},
- {"matrix": [1, 6], "x": 74, "y": 13, "flags": 4},
- {"matrix": [1, 7], "x": 87, "y": 13, "flags": 4},
- {"matrix": [1, 8], "x": 99, "y": 13, "flags": 4},
- {"matrix": [1, 9], "x": 122, "y": 13, "flags": 4},
- {"matrix": [1, 10], "x": 124, "y": 13, "flags": 4},
- {"matrix": [1, 11], "x": 137, "y": 13, "flags": 4},
- {"matrix": [1, 12], "x": 140, "y": 13, "flags": 4},
- {"matrix": [1, 13], "x": 162, "y": 13, "flags": 4},
- {"matrix": [1, 14], "x": 174, "y": 13, "flags": 4},
- {"matrix": [1, 15], "x": 186, "y": 13, "flags": 4},
- {"matrix": [1, 16], "x": 199, "y": 13, "flags": 4},
- {"matrix": [1, 17], "x": 211, "y": 13, "flags": 4},
- {"matrix": [1, 18], "x": 224, "y": 13, "flags": 4},
- {"matrix": [2, 0], "x": 0, "y": 25, "flags": 4},
- {"matrix": [2, 1], "x": 12, "y": 25, "flags": 4},
- {"matrix": [2, 2], "x": 24, "y": 25, "flags": 4},
- {"matrix": [2, 3], "x": 37, "y": 25, "flags": 4},
- {"matrix": [2, 4], "x": 49, "y": 25, "flags": 4},
- {"matrix": [2, 5], "x": 62, "y": 25, "flags": 4},
- {"matrix": [2, 6], "x": 74, "y": 25, "flags": 4},
- {"matrix": [2, 7], "x": 87, "y": 25, "flags": 4},
- {"matrix": [2, 8], "x": 99, "y": 25, "flags": 4},
- {"matrix": [2, 9], "x": 122, "y": 25, "flags": 4},
- {"matrix": [2, 10], "x": 124, "y": 25, "flags": 4},
- {"matrix": [2, 11], "x": 137, "y": 25, "flags": 4},
- {"matrix": [2, 12], "x": 140, "y": 25, "flags": 4},
- {"matrix": [2, 13], "x": 162, "y": 25, "flags": 4},
- {"matrix": [2, 14], "x": 174, "y": 25, "flags": 4},
- {"matrix": [2, 15], "x": 186, "y": 25, "flags": 4},
- {"matrix": [2, 16], "x": 199, "y": 25, "flags": 4},
- {"matrix": [2, 17], "x": 211, "y": 25, "flags": 4},
- {"matrix": [2, 18], "x": 224, "y": 25, "flags": 4},
- {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4},
- {"matrix": [3, 1], "x": 12, "y": 38, "flags": 4},
- {"matrix": [3, 2], "x": 24, "y": 38, "flags": 4},
- {"matrix": [3, 3], "x": 37, "y": 38, "flags": 4},
- {"matrix": [3, 4], "x": 49, "y": 38, "flags": 4},
- {"matrix": [3, 5], "x": 62, "y": 38, "flags": 4},
- {"matrix": [3, 6], "x": 74, "y": 38, "flags": 4},
- {"matrix": [3, 7], "x": 87, "y": 38, "flags": 4},
- {"matrix": [3, 8], "x": 99, "y": 38, "flags": 4},
- {"matrix": [3, 9], "x": 122, "y": 38, "flags": 4},
- {"matrix": [3, 10], "x": 124, "y": 38, "flags": 4},
- {"matrix": [3, 11], "x": 137, "y": 38, "flags": 4},
- {"matrix": [3, 12], "x": 140, "y": 38, "flags": 4},
- {"matrix": [3, 13], "x": 162, "y": 38, "flags": 4},
- {"matrix": [3, 15], "x": 186, "y": 38, "flags": 4},
- {"matrix": [3, 16], "x": 199, "y": 38, "flags": 4},
- {"matrix": [3, 17], "x": 211, "y": 38, "flags": 4},
- {"matrix": [3, 18], "x": 224, "y": 38, "flags": 4},
- {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4},
- {"matrix": [4, 1], "x": 12, "y": 51, "flags": 4},
- {"matrix": [4, 2], "x": 24, "y": 51, "flags": 4},
- {"matrix": [4, 3], "x": 37, "y": 51, "flags": 4},
- {"matrix": [4, 4], "x": 49, "y": 51, "flags": 4},
- {"matrix": [4, 5], "x": 62, "y": 51, "flags": 4},
- {"matrix": [4, 6], "x": 74, "y": 51, "flags": 4},
- {"matrix": [4, 7], "x": 87, "y": 51, "flags": 4},
- {"matrix": [4, 8], "x": 99, "y": 51, "flags": 4},
- {"matrix": [4, 9], "x": 122, "y": 51, "flags": 4},
- {"matrix": [4, 10], "x": 124, "y": 51, "flags": 4},
- {"matrix": [4, 11], "x": 137, "y": 51, "flags": 4},
- {"matrix": [4, 12], "x": 140, "y": 51, "flags": 4},
- {"matrix": [4, 13], "x": 162, "y": 51, "flags": 4},
- {"matrix": [4, 14], "x": 174, "y": 51, "flags": 4},
- {"matrix": [4, 15], "x": 186, "y": 51, "flags": 4},
- {"matrix": [4, 16], "x": 199, "y": 51, "flags": 4},
- {"matrix": [4, 17], "x": 211, "y": 51, "flags": 4},
- {"matrix": [4, 18], "x": 224, "y": 51, "flags": 4},
- {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
- {"matrix": [5, 1], "x": 12, "y": 64, "flags": 4},
- {"matrix": [5, 3], "x": 37, "y": 64, "flags": 4},
- {"matrix": [5, 6], "x": 74, "y": 64, "flags": 4},
- {"matrix": [5, 10], "x": 124, "y": 64, "flags": 4},
- {"matrix": [5, 11], "x": 137, "y": 64, "flags": 4},
- {"matrix": [5, 12], "x": 140, "y": 64, "flags": 4},
- {"matrix": [5, 13], "x": 162, "y": 64, "flags": 4},
- {"matrix": [5, 14], "x": 174, "y": 64, "flags": 4},
- {"matrix": [5, 15], "x": 186, "y": 64, "flags": 4},
- {"matrix": [5, 16], "x": 199, "y": 64, "flags": 4},
- {"matrix": [5, 17], "x": 211, "y": 64, "flags": 4},
- {"matrix": [5, 18], "x": 224, "y": 64, "flags": 4}
+
+ {"matrix": [1, 0], "x": 0, "y": 17, "flags": 4},
+ {"matrix": [1, 1], "x": 11, "y": 17, "flags": 4},
+ {"matrix": [1, 2], "x": 23, "y": 17, "flags": 4},
+ {"matrix": [1, 3], "x": 34, "y": 17, "flags": 4},
+ {"matrix": [1, 4], "x": 46, "y": 17, "flags": 4},
+ {"matrix": [1, 5], "x": 57, "y": 17, "flags": 4},
+ {"matrix": [1, 6], "x": 69, "y": 17, "flags": 4},
+ {"matrix": [1, 7], "x": 80, "y": 17, "flags": 4},
+ {"matrix": [1, 8], "x": 92, "y": 17, "flags": 4},
+ {"matrix": [1, 9], "x": 103, "y": 17, "flags": 4},
+ {"matrix": [1, 10], "x": 115, "y": 17, "flags": 4},
+ {"matrix": [1, 11], "x": 126, "y": 17, "flags": 4},
+ {"matrix": [1, 12], "x": 138, "y": 17, "flags": 4},
+ {"matrix": [1, 13], "x": 149, "y": 17, "flags": 4},
+
+ {"matrix": [1, 14], "x": 175, "y": 17, "flags": 4},
+
+ {"matrix": [1, 15], "x": 190, "y": 17, "flags": 4},
+ {"matrix": [1, 16], "x": 201, "y": 17, "flags": 4},
+ {"matrix": [1, 17], "x": 213, "y": 17, "flags": 4},
+ {"matrix": [1, 18], "x": 224, "y": 17, "flags": 4},
+
+ {"matrix": [2, 0], "x": 3, "y": 28, "flags": 4},
+ {"matrix": [2, 1], "x": 17, "y": 28, "flags": 4},
+ {"matrix": [2, 2], "x": 29, "y": 28, "flags": 4},
+ {"matrix": [2, 3], "x": 40, "y": 28, "flags": 4},
+ {"matrix": [2, 4], "x": 52, "y": 28, "flags": 4},
+ {"matrix": [2, 5], "x": 63, "y": 28, "flags": 4},
+ {"matrix": [2, 6], "x": 75, "y": 28, "flags": 4},
+ {"matrix": [2, 7], "x": 86, "y": 28, "flags": 4},
+ {"matrix": [2, 8], "x": 98, "y": 28, "flags": 4},
+ {"matrix": [2, 9], "x": 109, "y": 28, "flags": 4},
+ {"matrix": [2, 10], "x": 121, "y": 28, "flags": 4},
+ {"matrix": [2, 11], "x": 132, "y": 28, "flags": 4},
+ {"matrix": [2, 12], "x": 144, "y": 28, "flags": 4},
+ {"matrix": [2, 13], "x": 161, "y": 17, "flags": 4},
+
+ {"matrix": [2, 14], "x": 175, "y": 28, "flags": 4},
+
+ {"matrix": [2, 15], "x": 190, "y": 28, "flags": 4},
+ {"matrix": [2, 16], "x": 201, "y": 28, "flags": 4},
+ {"matrix": [2, 17], "x": 213, "y": 28, "flags": 4},
+ {"matrix": [2, 18], "x": 224, "y": 28, "flags": 4},
+
+ {"matrix": [3, 0], "x": 4, "y": 39, "flags": 4},
+ {"matrix": [3, 1], "x": 20, "y": 39, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 39, "flags": 4},
+ {"matrix": [3, 3], "x": 43, "y": 39, "flags": 4},
+ {"matrix": [3, 4], "x": 55, "y": 39, "flags": 4},
+ {"matrix": [3, 5], "x": 66, "y": 39, "flags": 4},
+ {"matrix": [3, 6], "x": 78, "y": 39, "flags": 4},
+ {"matrix": [3, 7], "x": 89, "y": 39, "flags": 4},
+ {"matrix": [3, 8], "x": 101, "y": 39, "flags": 4},
+ {"matrix": [3, 9], "x": 112, "y": 39, "flags": 4},
+ {"matrix": [3, 10], "x": 123, "y": 39, "flags": 4},
+ {"matrix": [3, 11], "x": 135, "y": 39, "flags": 4},
+ {"matrix": [3, 12], "x": 146, "y": 39, "flags": 4},
+ {"matrix": [3, 13], "x": 154, "y": 39, "flags": 4},
+
+ {"matrix": [3, 15], "x": 190, "y": 39, "flags": 4},
+ {"matrix": [3, 16], "x": 201, "y": 39, "flags": 4},
+ {"matrix": [3, 17], "x": 213, "y": 39, "flags": 4},
+ {"matrix": [3, 18], "x": 224, "y": 39, "flags": 4},
+
+ {"matrix": [4, 0], "x": 1, "y": 50, "flags": 4},
+ {"matrix": [4, 1], "x": 14, "y": 50, "flags": 4},
+ {"matrix": [4, 2], "x": 26, "y": 50, "flags": 4},
+ {"matrix": [4, 3], "x": 37, "y": 50, "flags": 4},
+ {"matrix": [4, 4], "x": 49, "y": 50, "flags": 4},
+ {"matrix": [4, 5], "x": 60, "y": 50, "flags": 4},
+ {"matrix": [4, 6], "x": 72, "y": 50, "flags": 4},
+ {"matrix": [4, 7], "x": 83, "y": 50, "flags": 4},
+ {"matrix": [4, 8], "x": 95, "y": 50, "flags": 4},
+ {"matrix": [4, 9], "x": 106, "y": 50, "flags": 4},
+ {"matrix": [4, 10], "x": 118, "y": 50, "flags": 4},
+ {"matrix": [4, 11], "x": 129, "y": 50, "flags": 4},
+ {"matrix": [4, 12], "x": 145, "y": 50, "flags": 4},
+ {"matrix": [4, 13], "x": 161, "y": 50, "flags": 4},
+
+ {"matrix": [4, 14], "x": 175, "y": 53, "flags": 4},
+
+ {"matrix": [4, 15], "x": 190, "y": 50, "flags": 4},
+ {"matrix": [4, 16], "x": 201, "y": 50, "flags": 4},
+ {"matrix": [4, 17], "x": 213, "y": 50, "flags": 4},
+ {"matrix": [4, 18], "x": 224, "y": 50, "flags": 4},
+
+ {"matrix": [5, 0], "x": 3, "y": 61, "flags": 4},
+ {"matrix": [5, 1], "x": 17, "y": 61, "flags": 4},
+ {"matrix": [5, 3], "x": 32, "y": 61, "flags": 4},
+ {"matrix": [5, 6], "x": 76, "y": 61, "flags": 4},
+ {"matrix": [5, 10], "x": 119, "y": 61, "flags": 4},
+ {"matrix": [5, 11], "x": 134, "y": 61, "flags": 4},
+ {"matrix": [5, 12], "x": 148, "y": 61, "flags": 4},
+
+ {"matrix": [5, 13], "x": 164, "y": 64, "flags": 4},
+ {"matrix": [5, 14], "x": 175, "y": 64, "flags": 4},
+ {"matrix": [5, 15], "x": 187, "y": 64, "flags": 4},
+
+ {"matrix": [5, 16], "x": 201, "y": 61, "flags": 4},
+ {"matrix": [5, 17], "x": 213, "y": 61, "flags": 4},
+ {"matrix": [5, 18], "x": 224, "y": 61, "flags": 4}
]
},
"matrix_pins": {
diff --git a/keyboards/mechlovin/olly/jf/rev2/rev2.c b/keyboards/mechlovin/olly/jf/rev2/rev2.c
index 04cf3b836d..0f8bc0be48 100644
--- a/keyboards/mechlovin/olly/jf/rev2/rev2.c
+++ b/keyboards/mechlovin/olly/jf/rev2/rev2.c
@@ -85,7 +85,7 @@ bool led_matrix_indicators_kb(void) {
if (layer_state_is(4)) {
led_matrix_set_value(113, 0xFF);
} else {
- led_matrix_set_value(114, 0x00);
+ led_matrix_set_value(113, 0x00);
}
return true;