summaryrefslogtreecommitdiff
path: root/keyboards/weirdo/ls_60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/weirdo/ls_60')
-rw-r--r--keyboards/weirdo/ls_60/config.h5
-rw-r--r--keyboards/weirdo/ls_60/info.json142
-rw-r--r--keyboards/weirdo/ls_60/ls_60.c2
-rw-r--r--keyboards/weirdo/ls_60/ls_60.h30
4 files changed, 78 insertions, 101 deletions
diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h
index 46340f7833..d2b9299c8f 100644
--- a/keyboards/weirdo/ls_60/config.h
+++ b/keyboards/weirdo/ls_60/config.h
@@ -15,11 +15,6 @@
*/
#pragma once
-#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15}
-#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8}
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN A6
#define RGBLED_NUM 1
//#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json
index 906a993884..f386d40b66 100644
--- a/keyboards/weirdo/ls_60/info.json
+++ b/keyboards/weirdo/ls_60/info.json
@@ -8,77 +8,89 @@
"pid": "0x4C53",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "A6"
+ },
+ "matrix_pins": {
+ "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+ "rows": ["A9", "A10", "B10", "B11", "B15"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K0", "x":3, "y":0},
- {"label":"K04", "x":4, "y":0},
- {"label":"K05", "x":5, "y":0},
- {"label":"K06", "x":6, "y":0},
- {"label":"K07", "x":7, "y":0},
- {"label":"K08", "x":8, "y":0},
- {"label":"K09", "x":9, "y":0},
- {"label":"K010", "x":10, "y":0},
- {"label":"K011", "x":11, "y":0},
- {"label":"K012", "x":12, "y":0},
- {"label":"K013", "x":13, "y":0},
- {"label":"K014", "x":14, "y":0},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K11", "x":1.5, "y":1},
- {"label":"K12", "x":2.5, "y":1},
- {"label":"K13", "x":3.5, "y":1},
- {"label":"K14", "x":4.5, "y":1},
- {"label":"K15", "x":5.5, "y":1},
- {"label":"K16", "x":6.5, "y":1},
- {"label":"K17", "x":7.5, "y":1},
- {"label":"K18", "x":8.5, "y":1},
- {"label":"K19", "x":9.5, "y":1},
- {"label":"K110", "x":10.5, "y":1},
- {"label":"K111", "x":11.5, "y":1},
- {"label":"K112", "x":12.5, "y":1},
- {"label":"K113", "x":13.5, "y":1, "w":1.5},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K21", "x":1.75, "y":2},
- {"label":"K22", "x":2.75, "y":2},
- {"label":"K23", "x":3.75, "y":2},
- {"label":"K24", "x":4.75, "y":2},
- {"label":"K25", "x":5.75, "y":2},
- {"label":"K26", "x":6.75, "y":2},
- {"label":"K27", "x":7.75, "y":2},
- {"label":"K28", "x":8.75, "y":2},
- {"label":"K29", "x":9.75, "y":2},
- {"label":"K210", "x":10.75, "y":2},
- {"label":"K211", "x":11.75, "y":2},
- {"label":"K212", "x":12.75, "y":2},
- {"label":"K213", "x":13.75, "y":2, "w":1.25},
- {"label":"K30", "x":0, "y":3, "w":1.25},
- {"label":"K31", "x":1.25, "y":3},
- {"label":"K32", "x":2.25, "y":3},
- {"label":"K33", "x":3.25, "y":3},
- {"label":"K34", "x":4.25, "y":3},
- {"label":"K35", "x":5.25, "y":3},
- {"label":"K36", "x":6.25, "y":3},
- {"label":"K37", "x":7.25, "y":3},
- {"label":"K38", "x":8.25, "y":3},
- {"label":"K39", "x":9.25, "y":3},
- {"label":"K310", "x":10.25, "y":3},
- {"label":"K311", "x":11.25, "y":3},
- {"label":"K312", "x":12.25, "y":3, "w":1.75},
- {"label":"K313", "x":14, "y":3},
- {"label":"K40", "x":0, "y":4, "w":1.25},
- {"label":"K41", "x":1.25, "y":4, "w":1.25},
- {"label":"K42", "x":2.5, "y":4, "w":1.25},
- {"label":"K46", "x":3.75, "y":4, "w":6.25},
- {"label":"K410", "x":10, "y":4, "w":1.25},
- {"label":"K411", "x":11.25, "y":4, "w":1.25},
- {"label":"K412", "x":12.5, "y":4, "w":1.25},
- {"label":"K413", "x":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/weirdo/ls_60/ls_60.c b/keyboards/weirdo/ls_60/ls_60.c
index 12950fdba5..d21a250d70 100644
--- a/keyboards/weirdo/ls_60/ls_60.c
+++ b/keyboards/weirdo/ls_60/ls_60.c
@@ -13,7 +13,7 @@
* 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 "ls_60.h"
+#include "quantum.h"
void led_update_ports(led_t led_state) {
diff --git a/keyboards/weirdo/ls_60/ls_60.h b/keyboards/weirdo/ls_60/ls_60.h
deleted file mode 100644
index b099521b9e..0000000000
--- a/keyboards/weirdo/ls_60/ls_60.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2021 Weirdo
-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/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313, \
- K40, K41, K42, K46, K410, K411, K412, K413 ) \
- { \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \
- {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \
- {K40, K41, K42, K46, K410, K411, K412, K413 } \
- }