diff options
| author | hierophect <hierophect@gmail.com> | 2020-04-27 12:58:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 12:58:15 -0400 |
| commit | d9e4155815f7b44259da3e92bf68d9d7fdc7536b (patch) | |
| tree | 537b83083cc91cced8de140179f9c8a2aea3bde2 | |
| parent | 31d8e46063a897ec3cccb85ed989aec4308d7c08 (diff) | |
| parent | 29e7d00050b81624d06fe6c76e1d9abb218516cd (diff) | |
Merge branch 'master' into stm32f7_os
| -rw-r--r-- | ports/stm/common-hal/pulseio/PWMOut.c | 2 | ||||
| -rw-r--r-- | ports/stm/common-hal/pulseio/PWMOut.h | 2 | ||||
| -rw-r--r-- | ports/stm/common-hal/pulseio/PulseIn.c | 2 | ||||
| -rw-r--r-- | ports/stm/common-hal/pulseio/PulseOut.c | 2 | ||||
| -rw-r--r-- | ports/stm/mpconfigport.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ports/stm/common-hal/pulseio/PWMOut.c b/ports/stm/common-hal/pulseio/PWMOut.c index d62ee2a38..304a1539c 100644 --- a/ports/stm/common-hal/pulseio/PWMOut.c +++ b/ports/stm/common-hal/pulseio/PWMOut.c @@ -32,7 +32,7 @@ #include "supervisor/shared/translate.h" #include "shared-bindings/microcontroller/__init__.h" -#include "stm32f4xx_hal.h" +#include STM32_HAL_H #include "common-hal/microcontroller/Pin.h" #define ALL_CLOCKS 0xFFFF diff --git a/ports/stm/common-hal/pulseio/PWMOut.h b/ports/stm/common-hal/pulseio/PWMOut.h index 8519735c6..57ab143b9 100644 --- a/ports/stm/common-hal/pulseio/PWMOut.h +++ b/ports/stm/common-hal/pulseio/PWMOut.h @@ -29,7 +29,7 @@ #include "common-hal/microcontroller/Pin.h" -#include "stm32f4xx_hal.h" +#include STM32_HAL_H #include "peripherals/periph.h" #include "py/obj.h" diff --git a/ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm/common-hal/pulseio/PulseIn.c index 8428a2278..721bb0232 100644 --- a/ports/stm/common-hal/pulseio/PulseIn.c +++ b/ports/stm/common-hal/pulseio/PulseIn.c @@ -34,7 +34,7 @@ #include "shared-bindings/pulseio/PulseIn.h" #include "tick.h" -#include "stm32f4xx_hal.h" +#include STM32_HAL_H #define STM32_GPIO_PORT_SIZE 16 diff --git a/ports/stm/common-hal/pulseio/PulseOut.c b/ports/stm/common-hal/pulseio/PulseOut.c index d82525ea1..232516f19 100644 --- a/ports/stm/common-hal/pulseio/PulseOut.c +++ b/ports/stm/common-hal/pulseio/PulseOut.c @@ -35,7 +35,7 @@ #include "shared-bindings/pulseio/PWMOut.h" #include "supervisor/shared/translate.h" -#include "stm32f4xx_hal.h" +#include STM32_HAL_H #include "common-hal/microcontroller/Pin.h" #include "tick.h" diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk index 8305c0d0c..5ef1e8e7b 100644 --- a/ports/stm/mpconfigport.mk +++ b/ports/stm/mpconfigport.mk @@ -40,7 +40,7 @@ ifeq ($(MCU_SERIES),F7) # Not yet implemented common-hal modules: CIRCUITPY_ANALOGIO = 0 CIRCUITPY_NEOPIXEL_WRITE = 0 - CIRCUITPY_PULSEIO = 0 + CIRCUITPY_PULSEIO = 1 CIRCUITPY_OS = 1 CIRCUITPY_NVM = 0 CIRCUITPY_AUDIOBUSIO = 0 |