Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2024-03-20 19:51:33 +00:00
commit f8b427d5ab
15 changed files with 39 additions and 60 deletions

View File

@ -39,15 +39,14 @@
/* SPI config for pmw3360 sensor. */ /* SPI config for pmw3360 sensor. */
#define SPI_DRIVER SPID1 #define SPI_DRIVER SPID1
#define SPI_SCK_PIN B1 #define SPI_SCK_PIN A5
#define SPI_SCK_PAL_MODE 5 #define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN B2 #define SPI_MOSI_PIN A7
#define SPI_MOSI_PAL_MODE 5 #define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN B3 #define SPI_MISO_PIN A6
#define SPI_MISO_PAL_MODE 5 #define SPI_MISO_PAL_MODE 5
/* PMW3360 settings. */ /* PMW3360 settings. */
#define A1 PAL_LINE(GPIOA, 1)
#define POINTING_DEVICE_CS_PIN A1 #define POINTING_DEVICE_CS_PIN A1
#define PMW3360_CS_MODE 3 #define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64 #define PMW3360_CS_DIVISOR 64

View File

@ -7,20 +7,19 @@
"driver": "ws2812" "driver": "ws2812"
}, },
"ws2812": { "ws2812": {
"pin": "D3", "pin": "A2",
"driver": "pwm" "driver": "pwm"
}, },
"build": { "build": {
"debounce_type": "asym_eager_defer_pk" "debounce_type": "asym_eager_defer_pk"
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["F5", "B6", "D7", "E6", "B4"], "cols": ["B2", "A4", "B4", "B5", "B8"],
"rows": ["F7", "C6", "D4", "B5"] "rows": ["B0", "B3", "A15", "B9"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"split": { "split": {
"soft_serial_pin": "D2" "soft_serial_pin": "A3"
}, },
"processor": "STM32F411", "development_board": "stemcell"
"bootloader": "stm32-dfu"
} }

View File

@ -1,5 +1,3 @@
CONVERT_TO = stemcell
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View File

@ -39,15 +39,14 @@
/* SPI config for pmw3360 sensor. */ /* SPI config for pmw3360 sensor. */
#define SPI_DRIVER SPID1 #define SPI_DRIVER SPID1
#define SPI_SCK_PIN B1 #define SPI_SCK_PIN A5
#define SPI_SCK_PAL_MODE 5 #define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN B2 #define SPI_MOSI_PIN A7
#define SPI_MOSI_PAL_MODE 5 #define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN B3 #define SPI_MISO_PIN A6
#define SPI_MISO_PAL_MODE 5 #define SPI_MISO_PAL_MODE 5
/* PMW3360 settings. */ /* PMW3360 settings. */
#define A1 PAL_LINE(GPIOA, 1)
#define POINTING_DEVICE_CS_PIN A1 #define POINTING_DEVICE_CS_PIN A1
#define PMW3360_CS_MODE 3 #define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64 #define PMW3360_CS_DIVISOR 64

View File

@ -7,20 +7,19 @@
"driver": "ws2812" "driver": "ws2812"
}, },
"ws2812": { "ws2812": {
"pin": "D3", "pin": "A2",
"driver": "pwm" "driver": "pwm"
}, },
"build": { "build": {
"debounce_type": "asym_eager_defer_pk" "debounce_type": "asym_eager_defer_pk"
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["F6", "F5", "B6", "D7", "E6", "B4"], "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
"rows": ["F7", "C6", "D4", "B5"] "rows": ["B0", "B3", "A15", "B9"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"split": { "split": {
"soft_serial_pin": "D2" "soft_serial_pin": "A3"
}, },
"processor": "STM32F411", "development_board": "stemcell"
"bootloader": "stm32-dfu"
} }

View File

@ -1,5 +1,3 @@
CONVERT_TO = stemcell
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View File

@ -39,15 +39,14 @@
/* SPI config for pmw3360 sensor. */ /* SPI config for pmw3360 sensor. */
#define SPI_DRIVER SPID1 #define SPI_DRIVER SPID1
#define SPI_SCK_PIN B1 #define SPI_SCK_PIN A5
#define SPI_SCK_PAL_MODE 5 #define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN B2 #define SPI_MOSI_PIN A7
#define SPI_MOSI_PAL_MODE 5 #define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN B3 #define SPI_MISO_PIN A6
#define SPI_MISO_PAL_MODE 5 #define SPI_MISO_PAL_MODE 5
/* PMW3360 settings. */ /* PMW3360 settings. */
#define A1 PAL_LINE(GPIOA, 1)
#define POINTING_DEVICE_CS_PIN A1 #define POINTING_DEVICE_CS_PIN A1
#define PMW3360_CS_MODE 3 #define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64 #define PMW3360_CS_DIVISOR 64

View File

@ -7,20 +7,19 @@
"driver": "ws2812" "driver": "ws2812"
}, },
"ws2812": { "ws2812": {
"pin": "D3", "pin": "A2",
"driver": "pwm" "driver": "pwm"
}, },
"build": { "build": {
"debounce_type": "asym_eager_defer_pk" "debounce_type": "asym_eager_defer_pk"
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["F6", "F5", "B6", "D7", "E6", "B4"], "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
"rows": ["F4", "F7", "C6", "D4", "B5"] "rows": ["B10", "B0", "B3", "A15", "B9"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"split": { "split": {
"soft_serial_pin": "D2" "soft_serial_pin": "A3"
}, },
"processor": "STM32F411", "development_board": "stemcell"
"bootloader": "stm32-dfu"
} }

View File

@ -1,5 +1,3 @@
CONVERT_TO = stemcell
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View File

@ -7,20 +7,19 @@
"driver": "ws2812" "driver": "ws2812"
}, },
"ws2812": { "ws2812": {
"pin": "D3", "pin": "A2",
"driver": "pwm" "driver": "pwm"
}, },
"build": { "build": {
"debounce_type": "asym_eager_defer_pk" "debounce_type": "asym_eager_defer_pk"
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["F6", "F5", "B6", "D7", "E6", "B4"], "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
"rows": ["F4", "F7", "C6", "D4", "B5"] "rows": ["B10", "B0", "B3", "A15", "B9"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"split": { "split": {
"soft_serial_pin": "D2" "soft_serial_pin": "A3"
}, },
"processor": "STM32F411", "development_board": "stemcell"
"bootloader": "stm32-dfu"
} }

View File

@ -1,5 +1,3 @@
CONVERT_TO = stemcell
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View File

@ -7,20 +7,19 @@
"driver": "ws2812" "driver": "ws2812"
}, },
"ws2812": { "ws2812": {
"pin": "D3", "pin": "A2",
"driver": "pwm" "driver": "pwm"
}, },
"build": { "build": {
"debounce_type": "asym_eager_defer_pk" "debounce_type": "asym_eager_defer_pk"
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["F5", "B6", "D7", "E6", "B4"], "cols": ["B2", "A4", "B4", "B5", "B8"],
"rows": ["F7", "C6", "D4", "B5"] "rows": ["B0", "B3", "A15", "B9"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"split": { "split": {
"soft_serial_pin": "D2" "soft_serial_pin": "A3"
}, },
"processor": "STM32F411", "development_board": "stemcell"
"bootloader": "stm32-dfu"
} }

View File

@ -1,5 +1,3 @@
CONVERT_TO = stemcell
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View File

@ -7,20 +7,19 @@
"driver": "ws2812" "driver": "ws2812"
}, },
"ws2812": { "ws2812": {
"pin": "D3", "pin": "A2",
"driver": "pwm" "driver": "pwm"
}, },
"build": { "build": {
"debounce_type": "asym_eager_defer_pk" "debounce_type": "asym_eager_defer_pk"
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["F6", "F5", "B6", "D7", "E6", "B4"], "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
"rows": ["F7", "C6", "D4", "B5"] "rows": ["B0", "B3", "A15", "B9"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"split": { "split": {
"soft_serial_pin": "D2" "soft_serial_pin": "A3"
}, },
"processor": "STM32F411", "development_board": "stemcell"
"bootloader": "stm32-dfu"
} }

View File

@ -1,5 +1,3 @@
CONVERT_TO = stemcell
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #