From 2757251218a84195f4d1a5d7654c31378f28a94c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 1 Jul 2022 15:38:57 +0100 Subject: Specify blackpill board files where relevant (#17521) --- keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboards/handwired/tractyl_manuform/5x6_right/f411') diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk index 0a4fbee0e5..dcbcc7ee7e 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F411 +BOARD = BLACKPILL_STM32_F411 # Bootloader selection BOOTLOADER = stm32-dfu -- cgit v1.2.1 From 3c58f989295e17d03b66db9a154e02cde7336ece Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Thu, 14 Jul 2022 11:50:00 +0200 Subject: [Core] PMW33XX drivers overhaul (#17613) * PMW33XX drivers overhaul This combines the PMW3389 and PM3360 drivers as they only differ in the firmware blobs and CPI get and set functions. The following changes have been made: * PMW3389 now gets the same multi-sensor feature that is already available on the PMW3360. * Introduced a shared pmw33xx_report_t struct is now directly readable via SPI transactions instead of individual byte-sized reads, saving multiple copies and bitshift operations. * pmw33(89/60)_get_report functions had unreachable branches in their motion detection logic these have been simplied as much as possible. * The fast firmware upload option has been removed as this becomes obsolete by the newly introduced polled waiting functions for ChibiOS polled waiting * PMW33(60/89)_SPI_LSBFIRST and PMW33(60/89)_SPI_MODE config options have been removed as they don't need to be configurable. * All PMW3389 and PMW3360 defines have been unified to a PMW33XX prefix to reduce code duplication and make the defines interchangeable * Adjust keyboards to PMW33XX naming scheme --- keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform/5x6_right/f411') diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 5f0350810c..0eb5b2a217 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -102,7 +102,4 @@ along with this program. If not, see . #define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 64 /* pmw3360 config */ -#define PMW3360_CS_PIN B0 -#define PMW3360_SPI_MODE 3 -#define PMW3360_SPI_DIVISOR 64 -#define PMW3360_FIRMWARE_UPLOAD_FAST +#define PMW33XX_CS_PIN B0 -- cgit v1.2.1 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform/5x6_right/f411') diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 0eb5b2a217..b31f450553 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS \ { B12, B13, B14, B15, A8, A10 } -#define UNUSED_PINS \ - { C15 } - #define DIODE_DIRECTION COL2ROW // #define USB_VBUS_PIN B10 // doesn't seem to work for me on one of my controllers... */ -- cgit v1.2.1 From d2accb48e784030637f5517dfec66b13f1eab609 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 20 Aug 2022 11:34:17 +0100 Subject: RESET -> QK_BOOT keyboard readme (#18110) --- keyboards/handwired/tractyl_manuform/5x6_right/f411/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/handwired/tractyl_manuform/5x6_right/f411') diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/readme.md b/keyboards/handwired/tractyl_manuform/5x6_right/f411/readme.md index f732295ba3..6b98bdc9b9 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/readme.md +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/readme.md @@ -35,4 +35,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to * **Bootmagic reset**: Hold down the top right key on the right side, or the top left key on the left side while plugging in. * **Physical reset button**: Briefly press the "USER" button on the BlackPill -* **Keycode in layout**: Press the key mapped to `RESET`. +* **Keycode in layout**: Press the key mapped to `QK_BOOT`. -- cgit v1.2.1 From b0eda7701a372e820264c6a78afa1f8c410845f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 22 Aug 2022 08:08:50 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 3 (#18111) --- keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h | 2 -- keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json (limited to 'keyboards/handwired/tractyl_manuform/5x6_right/f411') diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 5f0350810c..3fc1bc10a2 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #pragma once -#define PRODUCT Tractyl Manuform(5x6) BlackPill - // wiring of each half #define MATRIX_COL_PINS \ { A15, B3, B4, B5, B6, B7 } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json new file mode 100644 index 0000000000..7466004165 --- /dev/null +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Tractyl Manuform (5x6) BlackPill" +} -- cgit v1.2.1 From fa08cb2478e8c13a9f1c785956c95cb49bbebba3 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sun, 28 Aug 2022 12:55:19 -0700 Subject: [Keymap] Drashna keymap updates for 0.18.0 (#18184) Co-authored-by: Ryan --- keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h | 2 +- keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/handwired/tractyl_manuform/5x6_right/f411') diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 791317b9e9..f7e9cfb7d6 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -75,7 +75,7 @@ along with this program. If not, see . #define I2C1_SCL_PAL_MODE 4 #define I2C1_SDA_PAL_MODE 4 #define I2C1_CLOCK_SPEED 400000 -#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 +#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9 /* encoder config */ #define ENCODERS_PAD_A \ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index 990b835843..09f1b57008 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -24,7 +24,7 @@ void matrix_scan_sub_kb(void) { } } -void bootmagic_lite(void) { +__attribute__((weak)) void bootmagic_lite(void) { // We need multiple scans because debouncing can't be turned off. matrix_scan(); #if defined(DEBOUNCE) && DEBOUNCE > 0 -- cgit v1.2.1