Browse Source

Correct PWM_PIN behavior for STM32 HALs (#12027)

pull/1/head
Nils Hasenbanck 6 years ago
committed by Scott Lahteine
parent
commit
191df5e17d
  1. 2
      Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp
  2. 4
      Marlin/src/HAL/HAL_STM32/fastio_STM32.h
  3. 2
      Marlin/src/HAL/HAL_STM32F1/fastio_Stm32f1.h
  4. 2
      Marlin/src/HAL/HAL_STM32F4/fastio_STM32F4.h
  5. 2
      Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h

2
Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp

@ -48,7 +48,7 @@ static SPISettings spiConfig;
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Software SPI // Software SPI
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#error "Software SPI not supported for STM32F7. Use Hardware SPI." #error "Software SPI not supported for STM32. Use Hardware SPI."
#else #else

4
Marlin/src/HAL/HAL_STM32/fastio_STM32.h

@ -23,7 +23,7 @@
#pragma once #pragma once
/** /**
* Fast I/O interfaces for STM32F7 * Fast I/O interfaces for STM32
* These use GPIO functions instead of Direct Port Manipulation, as on AVR. * These use GPIO functions instead of Direct Port Manipulation, as on AVR.
*/ */
@ -50,5 +50,5 @@
#define GET_OUTPUT(IO) #define GET_OUTPUT(IO)
#define GET_TIMER(IO) #define GET_TIMER(IO)
#define PWM_PIN(p) true #define PWM_PIN(p) digitalPinHasPWM(p)
#define USEABLE_HARDWARE_PWM(p) PWM_PIN(p) #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)

2
Marlin/src/HAL/HAL_STM32F1/fastio_Stm32f1.h

@ -50,7 +50,7 @@
#define GET_OUTPUT(IO) (_GET_MODE(IO) == GPIO_OUTPUT_PP) #define GET_OUTPUT(IO) (_GET_MODE(IO) == GPIO_OUTPUT_PP)
#define GET_TIMER(IO) (PIN_MAP[IO].timer_device != NULL) #define GET_TIMER(IO) (PIN_MAP[IO].timer_device != NULL)
#define PWM_PIN(p) digitalPinHasPWM(p) #define PWM_PIN(p) true
#define USEABLE_HARDWARE_PWM(p) PWM_PIN(p) #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
#endif // _FASTIO_STM32F1_H #endif // _FASTIO_STM32F1_H

2
Marlin/src/HAL/HAL_STM32F4/fastio_STM32F4.h

@ -53,7 +53,7 @@
#define GET_OUTPUT(IO) #define GET_OUTPUT(IO)
#define GET_TIMER(IO) #define GET_TIMER(IO)
#define PWM_PIN(p) digitalPinHasPWM(p) #define PWM_PIN(p) true
#define USEABLE_HARDWARE_PWM(p) PWM_PIN(p) #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
// //

2
Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h

@ -52,7 +52,7 @@
#define GET_OUTPUT(IO) #define GET_OUTPUT(IO)
#define GET_TIMER(IO) #define GET_TIMER(IO)
#define PWM_PIN(p) digitalPinHasPWM(p) #define PWM_PIN(p) true
#define USEABLE_HARDWARE_PWM(p) PWM_PIN(p) #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
// //

Loading…
Cancel
Save