summaryrefslogtreecommitdiff
path: root/keyboards/zvecr/zv48
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/zvecr/zv48')
-rw-r--r--keyboards/zvecr/zv48/config.h20
-rw-r--r--keyboards/zvecr/zv48/info.json69
-rw-r--r--keyboards/zvecr/zv48/rules.mk1
-rw-r--r--keyboards/zvecr/zv48/zv48.c2
-rw-r--r--keyboards/zvecr/zv48/zv48.h35
5 files changed, 69 insertions, 58 deletions
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index 97b0393aab..9274f5101b 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -15,32 +15,12 @@
*/
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_COL_PINS { B15, B10, B0, A5, A4, A3 }
-#define MATRIX_ROW_PINS { A10, A15, B3, B4 }
-#define MATRIX_COL_PINS_RIGHT { B10, B15, A10, A15, B3, B4 }
-#define MATRIX_ROW_PINS_RIGHT { B0, A5, A4, A3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define MATRIX_IO_DELAY 5
#define SPLIT_HAND_PIN B9
//#define SELECT_SOFT_SERIAL_SPEED 0
#define SERIAL_USART_SPEED 921600
-#define RGB_DI_PIN B1
#define RGBLED_NUM 48
#define RGBLED_SPLIT {24, 24}
#define RGBLIGHT_LIMIT_VAL 120
diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json
index f3519b94f4..df18f9f0ed 100644
--- a/keyboards/zvecr/zv48/info.json
+++ b/keyboards/zvecr/zv48/info.json
@@ -8,21 +8,88 @@
"pid": "0x0048",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B15", "B10", "B0", "A5", "A4", "A3"],
+ "rows": ["A10", "A15", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "A2"}
]
},
+ "ws2812": {
+ "pin": "B1",
+ "driver": "pwm"
+ },
"split": {
"soft_serial_pin": "B6",
"bootmagic": {
"matrix": [4, 0]
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["B10", "B15", "A10", "A15", "B3", "B4"],
+ "rows": ["B0", "A5", "A4", "A3"]
+ }
}
},
"community_layouts": ["ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x12": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+ "layout": [
+ {"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": [4, 5], "x": 6, "y": 0},
+ {"matrix": [4, 4], "x": 7, "y": 0},
+ {"matrix": [4, 3], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0},
+ {"matrix": [4, 0], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [5, 5], "x": 6, "y": 1},
+ {"matrix": [5, 4], "x": 7, "y": 1},
+ {"matrix": [5, 3], "x": 8, "y": 1},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1},
+ {"matrix": [5, 0], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [6, 5], "x": 6, "y": 2},
+ {"matrix": [6, 4], "x": 7, "y": 2},
+ {"matrix": [6, 3], "x": 8, "y": 2},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 1], "x": 10, "y": 2},
+ {"matrix": [6, 0], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [7, 5], "x": 6, "y": 3},
+ {"matrix": [7, 4], "x": 7, "y": 3},
+ {"matrix": [7, 3], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 1], "x": 10, "y": 3},
+ {"matrix": [7, 0], "x": 11, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/zvecr/zv48/rules.mk b/keyboards/zvecr/zv48/rules.mk
index 0db8344a63..7b615f95fa 100644
--- a/keyboards/zvecr/zv48/rules.mk
+++ b/keyboards/zvecr/zv48/rules.mk
@@ -15,6 +15,5 @@ AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
DEFAULT_FOLDER = zvecr/zv48/f401
diff --git a/keyboards/zvecr/zv48/zv48.c b/keyboards/zvecr/zv48/zv48.c
index 3c3d1ab777..2716b78080 100644
--- a/keyboards/zvecr/zv48/zv48.c
+++ b/keyboards/zvecr/zv48/zv48.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 "zv48.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void){
// Workaround for reversible pcb/mcu
diff --git a/keyboards/zvecr/zv48/zv48.h b/keyboards/zvecr/zv48/zv48.h
deleted file mode 100644
index 27504492ef..0000000000
--- a/keyboards/zvecr/zv48/zv48.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 zvecr <git@zvecr.com>
- *
- * 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_ortho_4x12( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { R35, R34, R33, R32, R31, R30 } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:33:17 +0000