From cbb0665e54b3bc9759b62c2d88870256550c4738 Mon Sep 17 00:00:00 2001 From: rusefillc <48498823+rusefillc@users.noreply.github.com> Date: Sat, 1 Jan 2022 23:01:05 -0500 Subject: [PATCH] Correct dac timer (#38) * io mapping typo * DAC uses proper timer now Co-authored-by: rusefillc --- firmware/boards/f1_dave/io/io_pins.h | 4 ++-- firmware/boards/f1_dave/mcuconf.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/boards/f1_dave/io/io_pins.h b/firmware/boards/f1_dave/io/io_pins.h index 6766786..471591b 100644 --- a/firmware/boards/f1_dave/io/io_pins.h +++ b/firmware/boards/f1_dave/io/io_pins.h @@ -14,5 +14,5 @@ #define HEATER_PWM_CHANNEL 0 // PA1 TIM2_CH2 -#define PUMP_DAC_PWM_DEVICE PWMD3 -#define PUMP_DAC_PWM_CHANNEL 0 +#define PUMP_DAC_PWM_DEVICE PWMD2 +#define PUMP_DAC_PWM_CHANNEL 1 diff --git a/firmware/boards/f1_dave/mcuconf.h b/firmware/boards/f1_dave/mcuconf.h index d2e296d..8fd9e4c 100644 --- a/firmware/boards/f1_dave/mcuconf.h +++ b/firmware/boards/f1_dave/mcuconf.h @@ -133,8 +133,8 @@ */ #define STM32_PWM_USE_ADVANCED FALSE #define STM32_PWM_USE_TIM1 TRUE -#define STM32_PWM_USE_TIM2 FALSE -#define STM32_PWM_USE_TIM3 TRUE +#define STM32_PWM_USE_TIM2 TRUE +#define STM32_PWM_USE_TIM3 FALSE #define STM32_PWM_USE_TIM4 FALSE #define STM32_PWM_USE_TIM5 FALSE #define STM32_PWM_USE_TIM8 FALSE @@ -182,7 +182,7 @@ * ST driver system settings. */ #define STM32_ST_IRQ_PRIORITY 8 -#define STM32_ST_USE_TIMER 2 +#define STM32_ST_USE_TIMER 3 /* * UART driver system settings.