瀏覽代碼

Correct PWM_PIN behavior for STM32 HALs (#12027)

Nils Hasenbanck 6 年之前
父節點
當前提交
191df5e17d

+ 1
- 1
Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp 查看文件

48
   // --------------------------------------------------------------------------
48
   // --------------------------------------------------------------------------
49
   // Software SPI
49
   // Software SPI
50
   // --------------------------------------------------------------------------
50
   // --------------------------------------------------------------------------
51
-  #error "Software SPI not supported for STM32F7. Use Hardware SPI."
51
+  #error "Software SPI not supported for STM32. Use Hardware SPI."
52
 
52
 
53
 #else
53
 #else
54
 
54
 

+ 2
- 2
Marlin/src/HAL/HAL_STM32/fastio_STM32.h 查看文件

23
 #pragma once
23
 #pragma once
24
 
24
 
25
 /**
25
 /**
26
- * Fast I/O interfaces for STM32F7
26
+ * Fast I/O interfaces for STM32
27
  * These use GPIO functions instead of Direct Port Manipulation, as on AVR.
27
  * These use GPIO functions instead of Direct Port Manipulation, as on AVR.
28
  */
28
  */
29
 
29
 
50
 #define GET_OUTPUT(IO)
50
 #define GET_OUTPUT(IO)
51
 #define GET_TIMER(IO)
51
 #define GET_TIMER(IO)
52
 
52
 
53
-#define PWM_PIN(p) true
53
+#define PWM_PIN(p) digitalPinHasPWM(p)
54
 #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
54
 #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)

+ 1
- 1
Marlin/src/HAL/HAL_STM32F1/fastio_Stm32f1.h 查看文件

50
 #define GET_OUTPUT(IO)        (_GET_MODE(IO) == GPIO_OUTPUT_PP)
50
 #define GET_OUTPUT(IO)        (_GET_MODE(IO) == GPIO_OUTPUT_PP)
51
 #define GET_TIMER(IO)         (PIN_MAP[IO].timer_device != NULL)
51
 #define GET_TIMER(IO)         (PIN_MAP[IO].timer_device != NULL)
52
 
52
 
53
-#define PWM_PIN(p) digitalPinHasPWM(p)
53
+#define PWM_PIN(p) true
54
 #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
54
 #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
55
 
55
 
56
 #endif // _FASTIO_STM32F1_H
56
 #endif // _FASTIO_STM32F1_H

+ 1
- 1
Marlin/src/HAL/HAL_STM32F4/fastio_STM32F4.h 查看文件

53
 #define GET_OUTPUT(IO)
53
 #define GET_OUTPUT(IO)
54
 #define GET_TIMER(IO)
54
 #define GET_TIMER(IO)
55
 
55
 
56
-#define PWM_PIN(p) digitalPinHasPWM(p)
56
+#define PWM_PIN(p) true
57
 #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
57
 #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
58
 
58
 
59
 //
59
 //

+ 1
- 1
Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h 查看文件

52
 #define GET_OUTPUT(IO)
52
 #define GET_OUTPUT(IO)
53
 #define GET_TIMER(IO)
53
 #define GET_TIMER(IO)
54
 
54
 
55
-#define PWM_PIN(p) digitalPinHasPWM(p)
55
+#define PWM_PIN(p) true
56
 #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
56
 #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
57
 
57
 
58
 //
58
 //

Loading…
取消
儲存