aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2025-01-03 20:33:57 +0000
committerQMK Bot <[email protected]>2025-01-03 20:33:57 +0000
commite6a08dbc64ff0f0aa1a664d554236b27970ddbba (patch)
treefcdc14390d9f529f3b6677e5cdaf5423580d6eae
parent69f4d2a0868a08b78a06a18cd39e81cf8f356ba8 (diff)
parentcc3823f767a704cc465fbfdfef5d272aab018bd0 (diff)
downloadqmk_firmware-e6a08dbc64ff0f0aa1a664d554236b27970ddbba.tar.gz
qmk_firmware-e6a08dbc64ff0f0aa1a664d554236b27970ddbba.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/handwired/onekey/at_start_f415/config.h4
-rw-r--r--keyboards/handwired/onekey/at_start_f415/rules.mk1
-rw-r--r--platforms/chibios/drivers/spi_master.c4
3 files changed, 7 insertions, 2 deletions
diff --git a/keyboards/handwired/onekey/at_start_f415/config.h b/keyboards/handwired/onekey/at_start_f415/config.h
index 266e45dd00..0e47e813c5 100644
--- a/keyboards/handwired/onekey/at_start_f415/config.h
+++ b/keyboards/handwired/onekey/at_start_f415/config.h
@@ -8,3 +8,7 @@
#define BACKLIGHT_PWM_DRIVER PWMD5
#define BACKLIGHT_PWM_CHANNEL 1
+
+#define SOLENOID_PIN B12
+#define SOLENOID_PINS { B12, B13, B14, B15 }
+#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/at_start_f415/rules.mk b/keyboards/handwired/onekey/at_start_f415/rules.mk
new file mode 100644
index 0000000000..7f2fa62b32
--- /dev/null
+++ b/keyboards/handwired/onekey/at_start_f415/rules.mk
@@ -0,0 +1 @@
+MCU_LDSCRIPT = AT32F415xC
diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index 6417b7077f..414e5b10a3 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -249,11 +249,11 @@ bool spi_start_extended(spi_start_config_t *start_config) {
#elif defined(AT32F415)
spiConfig.ctrl1 = 0;
- if (lsbFirst) {
+ if (start_config->lsb_first) {
spiConfig.ctrl1 |= SPI_CTRL1_LTF;
}
- switch (mode) {
+ switch (start_config->mode) {
case 0:
break;
case 1: