summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhierophect <hierophect@gmail.com>2020-04-27 12:28:27 -0400
committerGitHub <noreply@github.com>2020-04-27 12:28:27 -0400
commit29e7d00050b81624d06fe6c76e1d9abb218516cd (patch)
tree30e0da26fbc1b422679439cb116890173c50cf03
parent9e4b94f4662b6dd21d39e9fb75cf9745b0db055e (diff)
parentf9096d83ac051380ad88710d261c8797d016c28c (diff)
Merge pull request #2806 from k0d/stm32f7_pulseio
Enables PulseIO on STM32F7
-rw-r--r--ports/stm/common-hal/pulseio/PWMOut.c2
-rw-r--r--ports/stm/common-hal/pulseio/PWMOut.h2
-rw-r--r--ports/stm/common-hal/pulseio/PulseIn.c2
-rw-r--r--ports/stm/common-hal/pulseio/PulseOut.c2
-rw-r--r--ports/stm/mpconfigport.mk2
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 7ed2aa49a..470593394 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 = 0
CIRCUITPY_NVM = 0
CIRCUITPY_AUDIOBUSIO = 0