summaryrefslogtreecommitdiff
path: root/keyboards/preonic/rev3_drop
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/preonic/rev3_drop')
-rw-r--r--keyboards/preonic/rev3_drop/config.h5
-rw-r--r--keyboards/preonic/rev3_drop/info.json601
-rw-r--r--keyboards/preonic/rev3_drop/rev3_drop.c2
-rw-r--r--keyboards/preonic/rev3_drop/rev3_drop.h115
-rw-r--r--keyboards/preonic/rev3_drop/rules.mk1
5 files changed, 307 insertions, 417 deletions
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index 4d1bfe67b9..f05911872b 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -17,11 +17,6 @@
#pragma once
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2, A3, A6 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
-
#define DIP_SWITCH_PINS { B14, A15, A0, B9 }
#define MUSIC_MAP
diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json
index 3f32a10b36..a327c2cf40 100644
--- a/keyboards/preonic/rev3_drop/info.json
+++ b/keyboards/preonic/rev3_drop/info.json
@@ -6,6 +6,14 @@
"pid": "0xA649",
"device_version": "0.0.3"
},
+ "ws2812": {
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+ "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B12", "pin_b": "B13"}
@@ -14,340 +22,343 @@
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"community_layouts": ["ortho_5x12"],
+ "layout_aliases": {
+ "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
+ },
"layouts": {
"LAYOUT_preonic_1x2uC": {
"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},
+ {"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, 0], "x": 6, "y": 0},
+ {"matrix": [4, 1], "x": 7, "y": 0},
+ {"matrix": [4, 2], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 4], "x": 10, "y": 0},
+ {"matrix": [4, 5], "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},
+ {"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, 0], "x": 6, "y": 1},
+ {"matrix": [5, 1], "x": 7, "y": 1},
+ {"matrix": [5, 2], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 4], "x": 10, "y": 1},
+ {"matrix": [5, 5], "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},
+ {"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, 0], "x": 6, "y": 2},
+ {"matrix": [6, 1], "x": 7, "y": 2},
+ {"matrix": [6, 2], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 4], "x": 10, "y": 2},
+ {"matrix": [6, 5], "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},
+ {"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, 0], "x": 6, "y": 3},
+ {"matrix": [7, 1], "x": 7, "y": 3},
+ {"matrix": [7, 2], "x": 8, "y": 3},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4, "w": 2},
- {"x": 7, "y": 4},
- {"x": 8, "y": 4},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4}
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [8, 1], "x": 1, "y": 4},
+ {"matrix": [8, 2], "x": 2, "y": 4},
+ {"matrix": [9, 3], "x": 3, "y": 4},
+ {"matrix": [9, 4], "x": 4, "y": 4},
+ {"matrix": [9, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [9, 1], "x": 7, "y": 4},
+ {"matrix": [9, 2], "x": 8, "y": 4},
+ {"matrix": [8, 3], "x": 9, "y": 4},
+ {"matrix": [8, 4], "x": 10, "y": 4},
+ {"matrix": [8, 5], "x": 11, "y": 4}
]
},
"LAYOUT_preonic_1x2uR": {
"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},
+ {"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, 0], "x": 6, "y": 0},
+ {"matrix": [4, 1], "x": 7, "y": 0},
+ {"matrix": [4, 2], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 4], "x": 10, "y": 0},
+ {"matrix": [4, 5], "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},
+ {"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, 0], "x": 6, "y": 1},
+ {"matrix": [5, 1], "x": 7, "y": 1},
+ {"matrix": [5, 2], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 4], "x": 10, "y": 1},
+ {"matrix": [5, 5], "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},
+ {"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, 0], "x": 6, "y": 2},
+ {"matrix": [6, 1], "x": 7, "y": 2},
+ {"matrix": [6, 2], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 4], "x": 10, "y": 2},
+ {"matrix": [6, 5], "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},
+ {"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, 0], "x": 6, "y": 3},
+ {"matrix": [7, 1], "x": 7, "y": 3},
+ {"matrix": [7, 2], "x": 8, "y": 3},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
- {"x": 6, "y": 4, "w": 2},
- {"x": 8, "y": 4},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4}
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [8, 1], "x": 1, "y": 4},
+ {"matrix": [8, 2], "x": 2, "y": 4},
+ {"matrix": [9, 3], "x": 3, "y": 4},
+ {"matrix": [9, 4], "x": 4, "y": 4},
+ {"matrix": [9, 5], "x": 5, "y": 4},
+ {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
+ {"matrix": [9, 2], "x": 8, "y": 4},
+ {"matrix": [8, 3], "x": 9, "y": 4},
+ {"matrix": [8, 4], "x": 10, "y": 4},
+ {"matrix": [8, 5], "x": 11, "y": 4}
]
},
"LAYOUT_preonic_1x2uL": {
"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},
+ {"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, 0], "x": 6, "y": 0},
+ {"matrix": [4, 1], "x": 7, "y": 0},
+ {"matrix": [4, 2], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 4], "x": 10, "y": 0},
+ {"matrix": [4, 5], "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},
+ {"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, 0], "x": 6, "y": 1},
+ {"matrix": [5, 1], "x": 7, "y": 1},
+ {"matrix": [5, 2], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 4], "x": 10, "y": 1},
+ {"matrix": [5, 5], "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},
+ {"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, 0], "x": 6, "y": 2},
+ {"matrix": [6, 1], "x": 7, "y": 2},
+ {"matrix": [6, 2], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 4], "x": 10, "y": 2},
+ {"matrix": [6, 5], "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},
+ {"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, 0], "x": 6, "y": 3},
+ {"matrix": [7, 1], "x": 7, "y": 3},
+ {"matrix": [7, 2], "x": 8, "y": 3},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4, "w": 2},
- {"x": 6, "y": 4},
- {"x": 7, "y": 4},
- {"x": 8, "y": 4},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4}
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [8, 1], "x": 1, "y": 4},
+ {"matrix": [8, 2], "x": 2, "y": 4},
+ {"matrix": [9, 3], "x": 3, "y": 4},
+ {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
+ {"matrix": [9, 0], "x": 6, "y": 4},
+ {"matrix": [9, 1], "x": 7, "y": 4},
+ {"matrix": [9, 2], "x": 8, "y": 4},
+ {"matrix": [8, 3], "x": 9, "y": 4},
+ {"matrix": [8, 4], "x": 10, "y": 4},
+ {"matrix": [8, 5], "x": 11, "y": 4}
]
},
"LAYOUT_preonic_2x2u": {
"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},
+ {"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, 0], "x": 6, "y": 0},
+ {"matrix": [4, 1], "x": 7, "y": 0},
+ {"matrix": [4, 2], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 4], "x": 10, "y": 0},
+ {"matrix": [4, 5], "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},
+ {"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, 0], "x": 6, "y": 1},
+ {"matrix": [5, 1], "x": 7, "y": 1},
+ {"matrix": [5, 2], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 4], "x": 10, "y": 1},
+ {"matrix": [5, 5], "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},
+ {"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, 0], "x": 6, "y": 2},
+ {"matrix": [6, 1], "x": 7, "y": 2},
+ {"matrix": [6, 2], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 4], "x": 10, "y": 2},
+ {"matrix": [6, 5], "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},
+ {"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, 0], "x": 6, "y": 3},
+ {"matrix": [7, 1], "x": 7, "y": 3},
+ {"matrix": [7, 2], "x": 8, "y": 3},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4, "w": 2},
- {"x": 6, "y": 4, "w": 2},
- {"x": 8, "y": 4},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4}
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [8, 1], "x": 1, "y": 4},
+ {"matrix": [8, 2], "x": 2, "y": 4},
+ {"matrix": [9, 3], "x": 3, "y": 4},
+ {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
+ {"matrix": [9, 0], "x": 6, "y": 4, "w": 2},
+ {"matrix": [9, 2], "x": 8, "y": 4},
+ {"matrix": [8, 3], "x": 9, "y": 4},
+ {"matrix": [8, 4], "x": 10, "y": 4},
+ {"matrix": [8, 5], "x": 11, "y": 4}
]
},
"LAYOUT_ortho_5x12": {
"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},
+ {"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, 0], "x": 6, "y": 0},
+ {"matrix": [4, 1], "x": 7, "y": 0},
+ {"matrix": [4, 2], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 4], "x": 10, "y": 0},
+ {"matrix": [4, 5], "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},
+ {"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, 0], "x": 6, "y": 1},
+ {"matrix": [5, 1], "x": 7, "y": 1},
+ {"matrix": [5, 2], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 4], "x": 10, "y": 1},
+ {"matrix": [5, 5], "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},
+ {"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, 0], "x": 6, "y": 2},
+ {"matrix": [6, 1], "x": 7, "y": 2},
+ {"matrix": [6, 2], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 4], "x": 10, "y": 2},
+ {"matrix": [6, 5], "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},
+ {"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, 0], "x": 6, "y": 3},
+ {"matrix": [7, 1], "x": 7, "y": 3},
+ {"matrix": [7, 2], "x": 8, "y": 3},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
- {"x": 6, "y": 4},
- {"x": 7, "y": 4},
- {"x": 8, "y": 4},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4}
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [8, 1], "x": 1, "y": 4},
+ {"matrix": [8, 2], "x": 2, "y": 4},
+ {"matrix": [9, 3], "x": 3, "y": 4},
+ {"matrix": [9, 4], "x": 4, "y": 4},
+ {"matrix": [9, 5], "x": 5, "y": 4},
+ {"matrix": [9, 0], "x": 6, "y": 4},
+ {"matrix": [9, 1], "x": 7, "y": 4},
+ {"matrix": [9, 2], "x": 8, "y": 4},
+ {"matrix": [8, 3], "x": 9, "y": 4},
+ {"matrix": [8, 4], "x": 10, "y": 4},
+ {"matrix": [8, 5], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/preonic/rev3_drop/rev3_drop.c b/keyboards/preonic/rev3_drop/rev3_drop.c
index 279f367876..5cca62521c 100644
--- a/keyboards/preonic/rev3_drop/rev3_drop.c
+++ b/keyboards/preonic/rev3_drop/rev3_drop.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 "rev3_drop.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/preonic/rev3_drop/rev3_drop.h b/keyboards/preonic/rev3_drop/rev3_drop.h
deleted file mode 100644
index 3cb9368757..0000000000
--- a/keyboards/preonic/rev3_drop/rev3_drop.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.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 "preonic.h"
-
-// clang-format off
-#define LAYOUT_preonic_1x2uC( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k06, k07, k08, k09, k0a, k0b }, \
- { k16, k17, k18, k19, k1a, k1b }, \
- { k26, k27, k28, k29, k2a, k2b }, \
- { k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k49, k4a, k4b }, \
- { k45, k47, k48, k43, k44, k45 } \
-}
-
-#define LAYOUT_preonic_1x2uR( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \
- ) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k06, k07, k08, k09, k0a, k0b }, \
- { k16, k17, k18, k19, k1a, k1b }, \
- { k26, k27, k28, k29, k2a, k2b }, \
- { k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k49, k4a, k4b }, \
- { k47, k47, k48, k43, k44, k45 } \
-}
-
-#define LAYOUT_preonic_1x2uL( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k06, k07, k08, k09, k0a, k0b }, \
- { k16, k17, k18, k19, k1a, k1b }, \
- { k26, k27, k28, k29, k2a, k2b }, \
- { k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k49, k4a, k4b }, \
- { k46, k47, k48, k43, k44, k44 } \
-}
-
-#define LAYOUT_preonic_2x2u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k46, k48, k49, k4a, k4b \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k06, k07, k08, k09, k0a, k0b }, \
- { k16, k17, k18, k19, k1a, k1b }, \
- { k26, k27, k28, k29, k2a, k2b }, \
- { k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k49, k4a, k4b }, \
- { k46, k46, k48, k43, k44, k44 } \
-}
-
-#define LAYOUT_ortho_5x12( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k06, k07, k08, k09, k0a, k0b }, \
- { k16, k17, k18, k19, k1a, k1b }, \
- { k26, k27, k28, k29, k2a, k2b }, \
- { k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k49, k4a, k4b }, \
- { k46, k47, k48, k43, k44, k45 } \
-}
diff --git a/keyboards/preonic/rev3_drop/rules.mk b/keyboards/preonic/rev3_drop/rules.mk
index e3f9e52110..762dd6ff6c 100644
--- a/keyboards/preonic/rev3_drop/rules.mk
+++ b/keyboards/preonic/rev3_drop/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output
-WS2812_DRIVER = pwm
CUSTOM_MATRIX = yes
ENCODER_ENABLE = yes
DIP_SWITCH_ENABLE = yes