From 71d54dab3c9fb7765d55d5cf2806a652879e8b67 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Fri, 4 Feb 2022 13:33:52 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=BB=20STM32=20set=5Fpwm=5Fduty=20"on/o?=
=?UTF-8?q?ff"=20for=20digital=20pins=20(#23665)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/HAL/STM32/fast_pwm.cpp | 45 ++++++++++---------
Marlin/src/HAL/STM32F1/fast_pwm.cpp | 21 +++++----
.../variant_MARLIN_STM32G0B1RE.h | 4 +-
3 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index f661e11350e..590c9dbe3da 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -30,30 +30,35 @@
static uint16_t timer_freq[TIMER_NUM];
void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
- if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
- const PinName pin_name = digitalPinToPinName(pin);
- TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
+ const uint16_t duty = invert ? v_size - v : v;
+ if (PWM_PIN(pin)) {
+ const PinName pin_name = digitalPinToPinName(pin);
+ TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
- const timer_index_t index = get_timer_index(Instance);
- const bool needs_freq = (HardwareTimer_Handle[index] == nullptr);
- if (needs_freq) // A new instance must be set to the default frequency of PWM_FREQUENCY
- HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
+ const timer_index_t index = get_timer_index(Instance);
+ const bool needs_freq = (HardwareTimer_Handle[index] == nullptr);
+ if (needs_freq) // A new instance must be set to the default frequency of PWM_FREQUENCY
+ HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
- HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
- const uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin_name, PinMap_PWM));
- const TimerModes_t previousMode = HT->getMode(channel);
- if (previousMode != TIMER_OUTPUT_COMPARE_PWM1)
- HT->setMode(channel, TIMER_OUTPUT_COMPARE_PWM1, pin);
+ HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
+ const uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin_name, PinMap_PWM));
+ const TimerModes_t previousMode = HT->getMode(channel);
+ if (previousMode != TIMER_OUTPUT_COMPARE_PWM1)
+ HT->setMode(channel, TIMER_OUTPUT_COMPARE_PWM1, pin);
- if (needs_freq && timer_freq[index] == 0) // If the timer is unconfigured and no freq is set then default PWM_FREQUENCY
- set_pwm_frequency(pin_name, PWM_FREQUENCY); // Set the frequency and save the value to the assigned index no.
+ if (needs_freq && timer_freq[index] == 0) // If the timer is unconfigured and no freq is set then default PWM_FREQUENCY
+ set_pwm_frequency(pin_name, PWM_FREQUENCY); // Set the frequency and save the value to the assigned index no.
- // Note the resolution is sticky here, the input can be upto 16 bits and that would require RESOLUTION_16B_COMPARE_FORMAT (16)
- // If such a need were to manifest then we would need to calc the resolution based on the v_size parameter and add code for it.
- const uint16_t value = invert ? v_size - v : v;
- HT->setCaptureCompare(channel, value, RESOLUTION_8B_COMPARE_FORMAT); // Sets the duty, the calc is done in the library :)
- pinmap_pinout(pin_name, PinMap_PWM); // Make sure the pin output state is set.
- if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
+ // Note the resolution is sticky here, the input can be upto 16 bits and that would require RESOLUTION_16B_COMPARE_FORMAT (16)
+ // If such a need were to manifest then we would need to calc the resolution based on the v_size parameter and add code for it.
+ HT->setCaptureCompare(channel, duty, RESOLUTION_8B_COMPARE_FORMAT); // Set the duty, the calc is done in the library :)
+ pinmap_pinout(pin_name, PinMap_PWM); // Make sure the pin output state is set.
+ if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
+ }
+ else {
+ pinMode(pin, OUTPUT);
+ digitalWrite(pin, duty < v_size / 2 ? LOW : HIGH);
+ }
}
void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index c783dda6068..13411d9af08 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -39,16 +39,19 @@ inline uint8_t timer_and_index_for_pin(const pin_t pin, timer_dev **timer_ptr) {
}
void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
- if (!PWM_PIN(pin)) return;
-
- timer_dev *timer; UNUSED(timer);
- if (timer_freq[timer_and_index_for_pin(pin, &timer)] == 0)
- set_pwm_frequency(pin, PWM_FREQUENCY);
-
- const uint8_t channel = PIN_MAP[pin].timer_channel;
const uint16_t duty = invert ? v_size - v : v;
- timer_set_compare(timer, channel, duty);
- timer_set_mode(timer, channel, TIMER_PWM); // PWM Output Mode
+ if (PWM_PIN(pin)) {
+ timer_dev *timer; UNUSED(timer);
+ if (timer_freq[timer_and_index_for_pin(pin, &timer)] == 0)
+ set_pwm_frequency(pin, PWM_FREQUENCY);
+ const uint8_t channel = PIN_MAP[pin].timer_channel;
+ timer_set_compare(timer, channel, duty);
+ timer_set_mode(timer, channel, TIMER_PWM); // PWM Output Mode
+ }
+ else {
+ pinMode(pin, OUTPUT);
+ digitalWrite(pin, duty < v_size / 2 ? LOW : HIGH);
+ }
}
void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
index 65aff2ce27b..9cb3d45a0d9 100644
--- a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
+++ b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
@@ -150,10 +150,10 @@
// Timer Definitions
// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
#ifndef TIMER_TONE
- #define TIMER_TONE TIM6
+ #define TIMER_TONE TIM6 // TIMER_TONE must be defined in this file
#endif
#ifndef TIMER_SERVO
- #define TIMER_SERVO TIM7
+ #define TIMER_SERVO TIM7 // TIMER_SERVO must be defined in this file
#endif
// UART Definitions