From b7274343913eb3e019f0dc08fa8f7774165e787d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 29 Jan 2023 02:42:44 +1100 Subject: Remove commented out backlight config & stray "backlight levels" (#19703) --- keyboards/handwired/tractyl_manuform/4x6_right/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index ffc75d00cf..7be2988298 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -48,9 +48,6 @@ along with this program. If not, see . /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - // #define DEBUG_LED_PIN D6 #define ROTATIONAL_TRANSFORM_ANGLE -25 -- cgit v1.2.3 From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/handwired/tractyl_manuform/4x6_right/config.h | 1 - keyboards/handwired/tractyl_manuform/5x6_right/config.h | 1 - keyboards/handwired/tractyl_manuform/config.h | 1 - 3 files changed, 3 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index 7be2988298..d82a7ecb63 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ // Rows are doubled-up diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h index 53a2b41e06..237ff5ec76 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ // Rows are doubled-up diff --git a/keyboards/handwired/tractyl_manuform/config.h b/keyboards/handwired/tractyl_manuform/config.h index 6f62685f4e..9f4dd8651b 100644 --- a/keyboards/handwired/tractyl_manuform/config.h +++ b/keyboards/handwired/tractyl_manuform/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* disable debug print */ // #define NO_DEBUG -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/handwired/tractyl_manuform/4x6_right/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index d82a7ecb63..c0d6c16178 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -43,10 +43,6 @@ along with this program. If not, see . #define SPLIT_TRANSPORT_MIRROR #define SPLIT_HAND_PIN A6 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - // #define DEBUG_LED_PIN D6 #define ROTATIONAL_TRANSFORM_ANGLE -25 -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/handwired/tractyl_manuform/4x6_right/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index c0d6c16178..a861c59889 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -64,10 +64,6 @@ along with this program. If not, see . #define SOFT_SERIAL_PIN D3 #define EE_HANDS - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/handwired/tractyl_manuform/4x6_right/info.json | 2 ++ keyboards/handwired/tractyl_manuform/4x6_right/rules.mk | 6 ------ .../handwired/tractyl_manuform/5x6_right/arduinomicro/info.json | 4 +++- .../handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk | 5 ----- keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json | 4 +++- keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk | 6 ------ keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json | 4 +++- keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk | 6 ------ keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json | 5 ++++- keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk | 7 ------- keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json | 4 +++- keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk | 5 ----- 12 files changed, 18 insertions(+), 40 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index 62b61072ec..9ea6febd4a 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -6,6 +6,8 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "processor": "at90usb1286", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_4x6_right": { "layout": [ diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk index c497bb2ee8..8c9bf430d8 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json index 63663f337d..322dd9f782 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)" + "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)", + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk index cf663a7ed6..e69de29bb2 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json index b3cb5928de..3bc4455c55 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Tractyl Manuform (5x6) Elite-C" + "keyboard_name": "Tractyl Manuform (5x6) Elite-C", + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk index e594097f8b..16c76d7f49 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - LTO_ENABLE := yes RGBLIGHT_ENABLE = no OLED_ENABLE = no diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json index d88708d17d..3ad29d36b8 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Tractyl Manuform (5x6) Proton-C" + "keyboard_name": "Tractyl Manuform (5x6) Proton-C", + "processor": "STM32F303", + "bootloader": "stm32-dfu" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk index 622d22704d..7abe7f4ca2 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # KEYBOARD_SHARED_EP = yes CONSOLE_ENABLE = yes diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json index 7466004165..9b81dc18eb 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -1,3 +1,6 @@ { - "keyboard_name": "Tractyl Manuform (5x6) BlackPill" + "keyboard_name": "Tractyl Manuform (5x6) BlackPill", + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk index dcbcc7ee7e..4b8fe43b84 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - KEYBOARD_SHARED_EP = yes CONSOLE_ENABLE = yes MOUSE_SHARED_EP = yes diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json index dfdbc435bc..9dc037b2c4 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json @@ -1,3 +1,5 @@ { - "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++" + "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++", + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk index 149471682d..e69de29bb2 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay -- cgit v1.2.3 From d784f78bd0a034c1d6085379615014fd701536ab Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:49:49 +1100 Subject: Move Bootmagic config to data driven (#19860) --- keyboards/handwired/tractyl_manuform/4x6_right/config.h | 6 ------ keyboards/handwired/tractyl_manuform/4x6_right/info.json | 5 +++++ keyboards/handwired/tractyl_manuform/5x6_right/config.h | 6 ------ keyboards/handwired/tractyl_manuform/5x6_right/info.json | 5 +++++ 4 files changed, 10 insertions(+), 12 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index a861c59889..9bdb4f268e 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -47,12 +47,6 @@ along with this program. If not, see . #define ROTATIONAL_TRANSFORM_ANGLE -25 -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 -#define BOOTMAGIC_LITE_ROW_RIGHT 4 -#define BOOTMAGIC_LITE_COLUMN_RIGHT 5 - #define AUDIO_PIN C6 #define AUDIO_PIN_ALT B7 diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index 9ea6febd4a..1880e66b8d 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -6,6 +6,11 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "split": { + "bootmagic": { + "matrix": [4, 5] + } + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h index 237ff5ec76..d89cf6f2b4 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h @@ -29,12 +29,6 @@ along with this program. If not, see . #define ROTATIONAL_TRANSFORM_ANGLE -25 #define POINTING_DEVICE_INVERT_X -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 -#define BOOTMAGIC_LITE_ROW_RIGHT 6 -#define BOOTMAGIC_LITE_COLUMN_RIGHT 5 - #define DYNAMIC_KEYMAP_LAYER_COUNT 16 #define LAYER_STATE_16BIT diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json index 5000486242..1ea3e6ab8b 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json @@ -4,6 +4,11 @@ "pid": "0x3536", "device_version": "0.0.1" }, + "split": { + "bootmagic": { + "matrix": [6, 5] + } + }, "layouts": { "LAYOUT_5x6_right": { "layout": [ -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/handwired/tractyl_manuform/4x6_right/config.h | 5 ----- keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h | 5 ----- keyboards/handwired/tractyl_manuform/5x6_right/config.h | 5 ----- 3 files changed, 15 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index 9bdb4f268e..46ee92fbf6 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 -#define MATRIX_COLS 6 - // wiring of each half #define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 } #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h index 396508380e..832b1a03af 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h @@ -18,11 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 12 -#define MATRIX_COLS 6 - // wiring of each half // left #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h index d89cf6f2b4..8eff4ae0df 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 12 -#define MATRIX_COLS 6 - #define DIODE_DIRECTION COL2ROW #define ROTATIONAL_TRANSFORM_ANGLE -25 -- cgit v1.2.3 From 8f6c228adbfec98828f0411f62bab07f96e5c020 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:40:49 +1100 Subject: Move `SOFT_SERIAL_PIN` to data driven (#19863) --- keyboards/handwired/tractyl_manuform/4x6_right/config.h | 2 -- keyboards/handwired/tractyl_manuform/4x6_right/info.json | 1 + keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h | 2 -- keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h | 2 -- keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h | 2 -- keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json | 3 +++ 8 files changed, 10 insertions(+), 8 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index 46ee92fbf6..f602a26b42 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -49,8 +49,6 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 16 #define LAYER_STATE_16BIT -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D3 #define EE_HANDS /* disable action features */ diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index 1880e66b8d..ab4b08c8eb 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -7,6 +7,7 @@ "device_version": "0.0.1" }, "split": { + "soft_serial_pin": "D3", "bootmagic": { "matrix": [4, 5] } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h index 832b1a03af..902f292b10 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h @@ -28,9 +28,7 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -/* serial.c configuration for split keyboard */ //#undef USE_I2C -#define SOFT_SERIAL_PIN D0 #define MASTER_RIGHT /* PMW3360 Settings */ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json index 322dd9f782..e58e87b2dd 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json @@ -1,5 +1,8 @@ { "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)", + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h index 402f0c99e5..e4856c4eec 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h @@ -36,8 +36,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D2 #define EE_HANDS #define ENCODERS_PAD_A \ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json index 3bc4455c55..4fcfeed921 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json @@ -1,5 +1,8 @@ { "keyboard_name": "Tractyl Manuform (5x6) Elite-C", + "split": { + "soft_serial_pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h index 735fe96f0f..cae5b7fc14 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h @@ -40,8 +40,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 #define AUDIO_PIN_ALT B7 -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D2 #define EE_HANDS #define ENCODERS_PAD_A \ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json index 9dc037b2c4..a7fb36c71e 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json @@ -1,5 +1,8 @@ { "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++", + "split": { + "soft_serial_pin": "D2" + }, "processor": "at90usb1286", "bootloader": "halfkay" } -- cgit v1.2.3 From 7f805cc7799deb0ca75f751cebd32c6640058af9 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 23 Feb 2023 09:19:00 +1100 Subject: VIA Protocol 12 + fixes (#19916) Co-authored-by: Wilba Co-authored-by: zvecr --- keyboards/handwired/tractyl_manuform/tractyl_manuform.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h index b62b6f7553..8ec9bceaf4 100644 --- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h +++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h @@ -25,11 +25,7 @@ #endif enum charybdis_keycodes { -# ifdef VIA_ENABLE - POINTER_DEFAULT_DPI_FORWARD = USER00, -# else - POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE, -# endif // VIA_ENABLE + POINTER_DEFAULT_DPI_FORWARD = QK_KB_0, POINTER_DEFAULT_DPI_REVERSE, POINTER_SNIPING_DPI_FORWARD, POINTER_SNIPING_DPI_REVERSE, -- cgit v1.2.3 From 961f0b7b2de54f988daf4ce7b791f91a33e55612 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Feb 2023 22:49:07 +0000 Subject: Reallocate SAFE_RANGE (#19909) --- keyboards/handwired/tractyl_manuform/tractyl_manuform.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h index 8ec9bceaf4..14e95b8a3d 100644 --- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h +++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h @@ -33,9 +33,7 @@ enum charybdis_keycodes { SNIPING_MODE_TOGGLE, DRAGSCROLL_MODE, DRAGSCROLL_MODE_TOGGLE, - KEYMAP_SAFE_RANGE, }; -# define CHARYBDIS_SAFE_RANGE KEYMAP_SAFE_RANGE # define DPI_MOD POINTER_DEFAULT_DPI_FORWARD # define DPI_RMOD POINTER_DEFAULT_DPI_REVERSE # define S_D_MOD POINTER_SNIPING_DPI_FORWARD -- cgit v1.2.3 From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 09:45:12 +1100 Subject: Move encoder config to data driven (#19923) Co-authored-by: Nick Brassel --- keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h | 5 ----- keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json | 5 +++++ keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h | 6 ------ keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json | 5 +++++ keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h | 6 ------ keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json | 5 +++++ keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h | 5 ----- keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json | 5 +++++ 8 files changed, 20 insertions(+), 22 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform') diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h index e4856c4eec..c52610e9d3 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h @@ -38,10 +38,5 @@ along with this program. If not, see . #define EE_HANDS -#define ENCODERS_PAD_A \ - { D5 } -#define ENCODERS_PAD_B \ - { C7 } - /* PMW33XX Settings */ #define PMW33XX_CS_PIN B6 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json index 4fcfeed921..dabab602dd 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) Elite-C", + "encoder": { + "rotary": [ + {"pin_a": "D5", "pin_b": "C7"} + ] + }, "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h index f3f3fb7e22..d10cb0bd8b 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h @@ -70,12 +70,6 @@ along with this program. If not, see . #define I2C1_SDA_PAL_MODE 4 #define I2C1_CLOCK_SPEED 400000 -/* encoder config */ -#define ENCODERS_PAD_A \ - { A7 } -#define ENCODERS_PAD_B \ - { A8 } - /* spi config for eeprom and pmw3360 sensor */ #define SPI_DRIVER SPID2 #define SPI_SCK_PIN B13 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json index 3ad29d36b8..bed70941bf 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) Proton-C", + "encoder": { + "rotary": [ + {"pin_a": "A7", "pin_b": "A8"} + ] + }, "processor": "STM32F303", "bootloader": "stm32-dfu" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index e93e70f569..227863aaa5 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -76,12 +76,6 @@ along with this program. If not, see . #define I2C1_CLOCK_SPEED 400000 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9 -/* encoder config */ -#define ENCODERS_PAD_A \ - { A13 } -#define ENCODERS_PAD_B \ - { A14 } - /* spi config for eeprom and pmw3360 sensor */ #define SPI_DRIVER SPID1 #define SPI_SCK_PIN A5 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json index 9b81dc18eb..0791e50ebf 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) BlackPill", + "encoder": { + "rotary": [ + {"pin_a": "A13", "pin_b": "A14"} + ] + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h index cae5b7fc14..51ff0d3123 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h @@ -42,10 +42,5 @@ along with this program. If not, see . #define EE_HANDS -#define ENCODERS_PAD_A \ - { D5 } -#define ENCODERS_PAD_B \ - { D4 } - /* PMW33XX Settings */ #define PMW33XX_CS_PIN B0 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json index a7fb36c71e..7f60ae0edc 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++", + "encoder": { + "rotary": [ + {"pin_a": "D5", "pin_b": "D4"} + ] + }, "split": { "soft_serial_pin": "D2" }, -- cgit v1.2.3