diff options
Diffstat (limited to 'keyboards/acheron')
28 files changed, 70 insertions, 102 deletions
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 490c13c2e9..377801604d 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } -#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 } -// R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json index 4e14f51df0..0ad176f451 100644 --- a/keyboards/acheron/apollo/87h/delta/info.json +++ b/keyboards/acheron/apollo/87h/delta/info.json @@ -4,6 +4,11 @@ "pid": "0x8775", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], + "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index 07da517e24..6209fa21f7 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15 } -#define MATRIX_COL_PINS { B3 , A15, A10, A8 , B14, B12, B10, B1 , B0 , A7 , A4 , A5 , A6 , C15, A0 , A1 } -// R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { C14, C13, B9 , B4 , A3 , A2 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json index 4a93afd70c..424f64405d 100644 --- a/keyboards/acheron/apollo/87h/gamma/info.json +++ b/keyboards/acheron/apollo/87h/gamma/info.json @@ -4,6 +4,11 @@ "pid": "0x8774", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"], + "rows": ["C14", "C13", "B9", "B4", "A3", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 8b61b285fd..7447e1dd29 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } -#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 } -// R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json index 68fc1b018a..36897ff86e 100644 --- a/keyboards/acheron/apollo/87htsc/info.json +++ b/keyboards/acheron/apollo/87htsc/info.json @@ -8,6 +8,11 @@ "pid": "0x8776", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], + "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 490c13c2e9..377801604d 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } -#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 } -// R0 , R1 , R2 , R3 , R4 , R5 -#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json index 92dd801826..3a7e0f7e5a 100644 --- a/keyboards/acheron/apollo/88htsc/info.json +++ b/keyboards/acheron/apollo/88htsc/info.json @@ -8,6 +8,11 @@ "pid": "0x8873", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], + "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h index 0187e823fc..f608132b5a 100644 --- a/keyboards/acheron/arctic/config.h +++ b/keyboards/acheron/arctic/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, F1, F0, C15, C14, C13, B9, B8} -#define MATRIX_ROW_PINS { B7, B6, A6, A7, B1} -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json index 42a7bb7b42..f51a4c383e 100644 --- a/keyboards/acheron/arctic/info.json +++ b/keyboards/acheron/arctic/info.json @@ -8,6 +8,11 @@ "pid": "0x4152", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8"], + "rows": ["B7", "B6", "A6", "A7", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index e99fb83328..fba5b051cc 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_COL_PINS { A8 , B14, B12, B10, B1 , B0 , A5 , A4 , A3 , A2 , A1 , A0 , C15, A7 , B4 , B3 , A15 } -#define MATRIX_ROW_PINS { B9 , C13, B8 , B5 , A14 , C14 } - -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index 2ebf2da8de..a59bf20ff9 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -4,6 +4,11 @@ "pid": "0x6584", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"], + "rows": ["B9", "C13", "B8", "B5", "A14", "C14"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index 7fbc624522..dc5f354876 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_COL_PINS { C7 , C6 , B14, B12, B10, B1 , C4 , A7 , A6 , A5 , A4 , A3 , A2 , C5 , A10, A8 , C9 } -#define MATRIX_ROW_PINS { C11, C12, C10, A15, C0 , A1 } - -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index dd8e766f90..a303c5a25c 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -4,6 +4,11 @@ "pid": "0x6585", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"], + "rows": ["C11", "C12", "C10", "A15", "C0", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B0", "levels": 20, diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index ce12edfd33..a47b76953a 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, A8, A9, A10, A5, A15, B3, B4, B5, B8, A3, C15, C14, F1 } -#define MATRIX_ROW_PINS { C13, A4, A7, B0, B1, B2 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json index dad488df8f..0cc16067e5 100755 --- a/keyboards/acheron/austin/info.json +++ b/keyboards/acheron/austin/info.json @@ -8,6 +8,11 @@ "pid": "0x4175", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"], + "rows": ["C13", "A4", "A7", "B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index a3b19e7fe6..30b0b74c95 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/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 { D3, B7, D5, B5, D6 } -#define MATRIX_COL_PINS { F5, F6, F4, F1, F0, B2, B1, C6, B0, B3, E6, D4, B4} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D7 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json index 1f625bca83..e373bb6654 100644 --- a/keyboards/acheron/elongate/beta/info.json +++ b/keyboards/acheron/elongate/beta/info.json @@ -8,6 +8,11 @@ "pid": "0x454C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"], + "rows": ["D3", "B7", "D5", "B5", "D6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D1", "num_lock": "D2", diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 0ceba36100..60362ab065 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_COL_PINS { A10, A9, A8, B14, B12, B11, B10, B2, B1, A7, A5, B9, B8, B7, B6 } -#define MATRIX_ROW_PINS { B3, A15, B0, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json index f5f87333eb..5341ab654e 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/info.json @@ -8,6 +8,11 @@ "pid": "0x454D", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"], + "rows": ["B3", "A15", "B0", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h index 1a8eab8b80..4b007cf387 100644 --- a/keyboards/acheron/keebspcb/config.h +++ b/keyboards/acheron/keebspcb/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B12, A1, A0, F1, F0, C15, C14, C13, B9, B8, B7, B6, B5} -#define MATRIX_ROW_PINS { B4, B3, A2, A3, A4} -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json index 9c96a01191..5c53bc70e2 100644 --- a/keyboards/acheron/keebspcb/info.json +++ b/keyboards/acheron/keebspcb/info.json @@ -8,6 +8,11 @@ "pid": "0x4B45", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"], + "rows": ["B4", "B3", "A2", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["60_ansi_tsangan"], diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h index e41924d0c6..f608132b5a 100644 --- a/keyboards/acheron/lasgweloth/config.h +++ b/keyboards/acheron/lasgweloth/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B12, A2 , A1 , A0 , F1 , F0 , C15, C14, C13, A7 , A6 , A5 , A4 , B7} -#define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json index b97521e48e..47d4b55105 100644 --- a/keyboards/acheron/lasgweloth/info.json +++ b/keyboards/acheron/lasgweloth/info.json @@ -8,6 +8,11 @@ "pid": "0x7641", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"], + "rows": ["B9", "B8", "A3", "B0", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"], diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index 9c36ac3a1f..91f51146f0 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -17,28 +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 {B4, A15, B10, B2} -#define MATRIX_COL_PINS {B1, B12, A1, A7, A5, A4, A3, A2, A0, C15, C14, C13} -//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1} -/* Unused pins, in the default layout, are: -EncA (B6) because it is not used in the default PCB -All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason; -B0, which is unconnected on the PCB -*/ - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index d6b5dfcd0f..07c6550cb8 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,11 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"], + "rows": ["B4", "A15", "B10", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B7"} diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 8cfc57b9d5..9a08dd1234 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_COL_PINS { A5 , A10, C13, B9 , B8 , B5 , B4 , B3 , A15, A0 , A1 , A2 } -#define MATRIX_ROW_PINS { A8 , B14, A4 , A3 } -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index 73025df6c4..313e877c8e 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,6 +4,11 @@ "pid": "0x5369", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"], + "rows": ["A8", "B14", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14"} |