Browse Source

FAST_PWM for STM32 (#20025)

Victor 4 years ago
parent
commit
a1cce36c1e
No account linked to committer's email address

+ 17
- 0
Marlin/src/HAL/STM32/HAL.h View File

@@ -185,3 +185,20 @@ typedef void (*systickCallback_t)(void);
185 185
 void systick_attach_callback(systickCallback_t cb);
186 186
 void HAL_SYSTICK_Callback();
187 187
 extern volatile uint32_t systick_uptime_millis;
188
+
189
+#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
190
+
191
+/**
192
+ * set_pwm_frequency
193
+ *  Set the frequency of the timer corresponding to the provided pin
194
+ *  All Timer PWM pins run at the same frequency
195
+ */
196
+void set_pwm_frequency(const pin_t pin, int f_desired);
197
+
198
+/**
199
+ * set_pwm_duty
200
+ *  Set the PWM duty cycle of the provided pin to the provided value
201
+ *  Optionally allows inverting the duty cycle [default = false]
202
+ *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
203
+ */
204
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);

+ 57
- 0
Marlin/src/HAL/STM32/fast_pwm.cpp View File

@@ -0,0 +1,57 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+#include "../../inc/MarlinConfigPre.h"
24
+
25
+#if NEEDS_HARDWARE_PWM
26
+
27
+#include "HAL.h"
28
+#include "timers.h"
29
+
30
+void set_pwm_frequency(const pin_t pin, int f_desired) {
31
+  if (!PWM_PIN(pin)) return;            // Don't proceed if no hardware timer
32
+
33
+  PinName pin_name = digitalPinToPinName(pin);
34
+  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
35
+  
36
+  LOOP_S_L_N(i, 0, NUM_HARDWARE_TIMERS) // Protect used timers
37
+    if (timer_instance[i] && timer_instance[i]->getHandle()->Instance == Instance)
38
+      return;
39
+
40
+  pwm_start(pin_name, f_desired, 0, RESOLUTION_8B_COMPARE_FORMAT);
41
+}
42
+
43
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
44
+  PinName pin_name = digitalPinToPinName(pin);
45
+  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
46
+  uint16_t adj_val = Instance->ARR * v / v_size;
47
+  if (invert) adj_val = Instance->ARR - adj_val;
48
+
49
+  switch (get_pwm_channel(pin_name)) {
50
+    case TIM_CHANNEL_1: LL_TIM_OC_SetCompareCH1(Instance, adj_val); break;
51
+    case TIM_CHANNEL_2: LL_TIM_OC_SetCompareCH2(Instance, adj_val); break;
52
+    case TIM_CHANNEL_3: LL_TIM_OC_SetCompareCH3(Instance, adj_val); break;
53
+    case TIM_CHANNEL_4: LL_TIM_OC_SetCompareCH4(Instance, adj_val); break;
54
+  }
55
+}
56
+
57
+#endif // NEEDS_HARDWARE_PWM

+ 0
- 3
Marlin/src/HAL/STM32/inc/SanityCheck.h View File

@@ -28,9 +28,6 @@
28 28
 //  #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
29 29
 //#endif
30 30
 
31
-#if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY
32
-  #error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported on STM32."
33
-#endif
34 31
 
35 32
 #if ENABLED(SDCARD_EEPROM_EMULATION) && DISABLED(SDSUPPORT)
36 33
   #undef SDCARD_EEPROM_EMULATION // Avoid additional error noise

+ 0
- 1
Marlin/src/HAL/STM32/timers.cpp View File

@@ -27,7 +27,6 @@
27 27
 // Local defines
28 28
 // ------------------------
29 29
 
30
-#define NUM_HARDWARE_TIMERS 2
31 30
 
32 31
 // Default timer priorities. Override by specifying alternate priorities in the board pins file.
33 32
 // The TONE timer is not present here, as it currently cannot be set programmatically. It is set

+ 2
- 0
Marlin/src/HAL/STM32/timers.h View File

@@ -43,6 +43,8 @@
43 43
 #define hal_timer_t uint32_t
44 44
 #define HAL_TIMER_TYPE_MAX UINT16_MAX
45 45
 
46
+#define NUM_HARDWARE_TIMERS 2
47
+
46 48
 #ifndef STEP_TIMER_NUM
47 49
   #define STEP_TIMER_NUM        0  // Timer Index for Stepper
48 50
 #endif

Loading…
Cancel
Save