summaryrefslogtreecommitdiff
path: root/keyboards/pteron36
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/pteron36')
-rw-r--r--keyboards/pteron36/config.h18
-rw-r--r--keyboards/pteron36/info.json164
-rw-r--r--keyboards/pteron36/pteron36.c2
-rw-r--r--keyboards/pteron36/pteron36.h59
4 files changed, 91 insertions, 152 deletions
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index be1de23f83..d661f794cc 100644
--- a/keyboards/pteron36/config.h
+++ b/keyboards/pteron36/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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_ROW_PINS { E6, D7, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -59,5 +42,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DYNAMIC_KEYMAP_LAYER_COUNT 7
//RGB Underglow
-#define RGB_DI_PIN B6
#define RGBLED_NUM 10
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
index c65b15cfb2..bb5a8ee1eb 100644
--- a/keyboards/pteron36/info.json
+++ b/keyboards/pteron36/info.json
@@ -8,6 +8,11 @@
"pid": "0x5054",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2"],
+ "rows": ["E6", "D7", "B4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F4"}
@@ -23,96 +28,107 @@
}
}
},
+ "ws2812": {
+ "pin": "B6"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"x":0, "y":1},
- {"x":1, "y":0.5},
- {"x":2, "y":0},
- {"x":3, "y":0.5},
- {"x":4, "y":0.75},
- {"x":10, "y":0.75},
- {"x":11, "y":0.5},
- {"x":12, "y":0},
- {"x":13, "y":0.5},
- {"x":14, "y":1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0.75},
+
+ {"matrix": [4, 4], "x": 10, "y": 0.75},
+ {"matrix": [4, 3], "x": 11, "y": 0.5},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 1], "x": 13, "y": 0.5},
+ {"matrix": [4, 0], "x": 14, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.75},
+
+ {"matrix": [5, 4], "x": 10, "y": 1.75},
+ {"matrix": [5, 3], "x": 11, "y": 1.5},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 1], "x": 13, "y": 1.5},
+ {"matrix": [5, 0], "x": 14, "y": 2},
- {"x":0, "y":2},
- {"x":1, "y":1.5},
- {"x":2, "y":1},
- {"x":3, "y":1.5},
- {"x":4, "y":1.75},
- {"x":10, "y":1.75},
- {"x":11, "y":1.5},
- {"x":12, "y":1},
- {"x":13, "y":1.5},
- {"x":14, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.75},
- {"x":0, "y":3},
- {"x":1, "y":2.5},
- {"x":2, "y":2},
- {"x":3, "y":2.5},
- {"x":4, "y":2.75},
- {"x":10, "y":2.75},
- {"x":11, "y":2.5},
- {"x":12, "y":2},
- {"x":13, "y":2.5},
- {"x":14, "y":3},
+ {"matrix": [6, 4], "x": 10, "y": 2.75},
+ {"matrix": [6, 3], "x": 11, "y": 2.5},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 1], "x": 13, "y": 2.5},
+ {"matrix": [6, 0], "x": 14, "y": 3},
- {"x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4},
- {"x":10, "y":4}
+ {"matrix": [3, 0], "x": 4, "y": 4},
+ {"matrix": [3, 1], "x": 5, "y": 4},
+ {"matrix": [3, 2], "x": 6, "y": 4},
+
+ {"matrix": [7, 2], "x": 8, "y": 4},
+ {"matrix": [7, 1], "x": 9, "y": 4},
+ {"matrix": [7, 0], "x": 10, "y": 4}
]
},
"LAYOUT_split_3x5_3_encoder": {
"layout": [
- {"x":0, "y":1},
- {"x":1, "y":0.5},
- {"x":2, "y":0},
- {"x":3, "y":0.5},
- {"x":4, "y":0.75},
- {"x":10, "y":0.75},
- {"x":11, "y":0.5},
- {"x":12, "y":0},
- {"x":13, "y":0.5},
- {"x":14, "y":1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0.75},
+
+ {"matrix": [4, 4], "x": 10, "y": 0.75},
+ {"matrix": [4, 3], "x": 11, "y": 0.5},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 1], "x": 13, "y": 0.5},
+ {"matrix": [4, 0], "x": 14, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.75},
+
+ {"matrix": [5, 4], "x": 10, "y": 1.75},
+ {"matrix": [5, 3], "x": 11, "y": 1.5},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 1], "x": 13, "y": 1.5},
+ {"matrix": [5, 0], "x": 14, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.75},
+ {"matrix": [3, 4], "x": 5.5, "y": 2.75},
- {"x":0, "y":2},
- {"x":1, "y":1.5},
- {"x":2, "y":1},
- {"x":3, "y":1.5},
- {"x":4, "y":1.75},
- {"x":10, "y":1.75},
- {"x":11, "y":1.5},
- {"x":12, "y":1},
- {"x":13, "y":1.5},
- {"x":14, "y":2},
+ {"matrix": [7, 4], "x": 8.5, "y": 2.75},
+ {"matrix": [6, 4], "x": 10, "y": 2.75},
+ {"matrix": [6, 3], "x": 11, "y": 2.5},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 1], "x": 13, "y": 2.5},
+ {"matrix": [6, 0], "x": 14, "y": 3},
- {"x":0, "y":3},
- {"x":1, "y":2.5},
- {"x":2, "y":2},
- {"x":3, "y":2.5},
- {"x":4, "y":2.75},
- {"label":"enc1", "x":5.5, "y":2.75},
- {"label":"enc2", "x":8.5, "y":2.75},
- {"x":10, "y":2.75},
- {"x":11, "y":2.5},
- {"x":12, "y":2},
- {"x":13, "y":2.5},
- {"x":14, "y":3},
+ {"matrix": [3, 0], "x": 4, "y": 4},
+ {"matrix": [3, 1], "x": 5, "y": 4},
+ {"matrix": [3, 2], "x": 6, "y": 4},
- {"x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4},
- {"x":10, "y":4}
+ {"matrix": [7, 2], "x": 8, "y": 4},
+ {"matrix": [7, 1], "x": 9, "y": 4},
+ {"matrix": [7, 0], "x": 10, "y": 4}
]
}
}
diff --git a/keyboards/pteron36/pteron36.c b/keyboards/pteron36/pteron36.c
index 4c14e6ebd5..fbcc64b706 100644
--- a/keyboards/pteron36/pteron36.c
+++ b/keyboards/pteron36/pteron36.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pteron36.h"
+#include "quantum.h"
//common encoder setup
diff --git a/keyboards/pteron36/pteron36.h b/keyboards/pteron36/pteron36.h
deleted file mode 100644
index 113e7270db..0000000000
--- a/keyboards/pteron36/pteron36.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 Harshit Goel
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_split_3x5_3( \
- L00, L01, L02,L03, L04 , R04, R03, R02, R01, R00,\
- L10, L11, L12,L13, L14 , R14, R13, R12, R11, R10,\
- L20, L21, L22,L23, L24 , R24, R23, R22, R21, R20, \
- L30, L31, L32, R32, R31, R30\
-) {\
- {L00, L01, L02,L03, L04 },\
- {L10, L11, L12,L13, L14 },\
- {L20, L21, L22,L23, L24 },\
- {L30, L31, L32, KC_NO, KC_NO },\
- {R00, R01, R02,R03, R04 },\
- {R10, R11, R12,R13, R14 },\
- {R20, R21, R22,R23, R24 },\
- {R30, R31, R32,KC_NO, KC_NO }\
-}
-#define LAYOUT_split_3x5_3_encoder(\
- L00, L01, L02,L03, L04 , R04, R03, R02, R01, R00,\
- L10, L11, L12,L13, L14 , R14, R13, R12, R11, R10,\
- L20, L21, L22,L23, L24 ,L34, R34,R24, R23, R22, R21, R20, \
- L30, L31, L32, R32, R31, R30\
-){\
- {L00, L01, L02,L03, L04 },\
- {L10, L11, L12,L13, L14 },\
- {L20, L21, L22,L23, L24 },\
- {L30, L31, L32, KC_NO, L34 },\
- {R00, R01, R02,R03, R04 },\
- {R10, R11, R12,R13, R14 },\
- {R20, R21, R22,R23, R24 },\
- {R30, R31, R32,KC_NO, R34 }\
-}