Add feature conditionals and clean up

22 files changed, 2 insertions, 13 deletions

diff --git a/ports/nrf/common-hal/microcontroller/Pin.c b/ports/nrf/common-hal/microcontroller/Pin.c
index 49b3c15ca..3cee784b6 100644
--- a/ports/nrf/common-hal/microcontroller/Pin.c
+++ b/ports/nrf/common-hal/microcontroller/Pin.c
@@ -105,7 +105,7 @@ void reset_pin_number(uint8_t pin_number) {
     #ifdef SPEAKER_ENABLE_PIN
     if (pin_number == SPEAKER_ENABLE_PIN->number) {
         speaker_enable_in_use = false;
-        common_hal_digitalio_digitalinout_switch_to_output();
+        common_hal_digitalio_digitalinout_switch_to_output(SPEAKER_ENABLE_PIN, true, DRIVE_MODE_PUSH_PULL);
         nrf_gpio_pin_dir_set(pin_number, NRF_GPIO_PIN_DIR_OUTPUT);
         nrf_gpio_pin_write(pin_number, false);
     }
diff --git a/ports/stm32f4/boards/stm32f411_disco/board.c b/ports/stm32f4/boards/DIS_F411RE/board.c
index 4421970ee..4421970ee 100644
--- a/ports/stm32f4/boards/stm32f411_disco/board.c
+++ b/ports/stm32f4/boards/DIS_F411RE/board.c
diff --git a/ports/stm32f4/boards/stm32f411_disco/mpconfigboard.h b/ports/stm32f4/boards/DIS_F411RE/mpconfigboard.h
index 675443282..675443282 100644
--- a/ports/stm32f4/boards/stm32f411_disco/mpconfigboard.h
+++ b/ports/stm32f4/boards/DIS_F411RE/mpconfigboard.h
diff --git a/ports/stm32f4/boards/stm32f411_disco/mpconfigboard.mk b/ports/stm32f4/boards/DIS_F411RE/mpconfigboard.mk
index 523628504..523628504 100644
--- a/ports/stm32f4/boards/stm32f411_disco/mpconfigboard.mk
+++ b/ports/stm32f4/boards/DIS_F411RE/mpconfigboard.mk
diff --git a/ports/stm32f4/boards/stm32f411_disco/pins.c b/ports/stm32f4/boards/DIS_F411RE/pins.c
index e3a4b5ed6..e3a4b5ed6 100644
--- a/ports/stm32f4/boards/stm32f411_disco/pins.c
+++ b/ports/stm32f4/boards/DIS_F411RE/pins.c
diff --git a/ports/stm32f4/boards/stm32f411_disco/stm32f4xx_hal_conf.h b/ports/stm32f4/boards/DIS_F411RE/stm32f4xx_hal_conf.h
index 4b6ba3d03..4b6ba3d03 100644
--- a/ports/stm32f4/boards/stm32f411_disco/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/DIS_F411RE/stm32f4xx_hal_conf.h
diff --git a/ports/stm32f4/boards/stm32f411_disco/stm32f4xx_hal_msp.c b/ports/stm32f4/boards/DIS_F411RE/stm32f4xx_hal_msp.c
index 4989f9889..4989f9889 100644
--- a/ports/stm32f4/boards/stm32f411_disco/stm32f4xx_hal_msp.c
+++ b/ports/stm32f4/boards/DIS_F411RE/stm32f4xx_hal_msp.c
diff --git a/ports/stm32f4/boards/stm32f411_disco/stm32f4xx_it.c b/ports/stm32f4/boards/DIS_F411RE/stm32f4xx_it.c
index cb86910e2..cb86910e2 100644
--- a/ports/stm32f4/boards/stm32f411_disco/stm32f4xx_it.c
+++ b/ports/stm32f4/boards/DIS_F411RE/stm32f4xx_it.c
diff --git a/ports/stm32f4/boards/stm32f411_disco/stm32f4xx_it.h b/ports/stm32f4/boards/DIS_F411RE/stm32f4xx_it.h
index feee38a39..feee38a39 100644
--- a/ports/stm32f4/boards/stm32f411_disco/stm32f4xx_it.h
+++ b/ports/stm32f4/boards/DIS_F411RE/stm32f4xx_it.h
diff --git a/ports/stm32f4/boards/stm32f412g_disco/board.c b/ports/stm32f4/boards/DIS_F412ZG/board.c
index 4421970ee..4421970ee 100644
--- a/ports/stm32f4/boards/stm32f412g_disco/board.c
+++ b/ports/stm32f4/boards/DIS_F412ZG/board.c
diff --git a/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.h b/ports/stm32f4/boards/DIS_F412ZG/mpconfigboard.h
index 416944257..416944257 100644
--- a/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.h
+++ b/ports/stm32f4/boards/DIS_F412ZG/mpconfigboard.h
diff --git a/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.mk b/ports/stm32f4/boards/DIS_F412ZG/mpconfigboard.mk
index 9e8711c36..9e8711c36 100644
--- a/ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.mk
+++ b/ports/stm32f4/boards/DIS_F412ZG/mpconfigboard.mk
diff --git a/ports/stm32f4/boards/stm32f412g_disco/pins.c b/ports/stm32f4/boards/DIS_F412ZG/pins.c
index e3a4b5ed6..e3a4b5ed6 100644
--- a/ports/stm32f4/boards/stm32f412g_disco/pins.c
+++ b/ports/stm32f4/boards/DIS_F412ZG/pins.c
diff --git a/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_hal_conf.h b/ports/stm32f4/boards/DIS_F412ZG/stm32f4xx_hal_conf.h
index 5d329c14f..5d329c14f 100644
--- a/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/DIS_F412ZG/stm32f4xx_hal_conf.h
diff --git a/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_hal_msp.c b/ports/stm32f4/boards/DIS_F412ZG/stm32f4xx_hal_msp.c
index 9d29f3607..9d29f3607 100644
--- a/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_hal_msp.c
+++ b/ports/stm32f4/boards/DIS_F412ZG/stm32f4xx_hal_msp.c
diff --git a/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_it.c b/ports/stm32f4/boards/DIS_F412ZG/stm32f4xx_it.c
index 032a55472..032a55472 100644
--- a/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_it.c
+++ b/ports/stm32f4/boards/DIS_F412ZG/stm32f4xx_it.c
diff --git a/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_it.h b/ports/stm32f4/boards/DIS_F412ZG/stm32f4xx_it.h
index 4571df2e3..4571df2e3 100644
--- a/ports/stm32f4/boards/stm32f412g_disco/stm32f4xx_it.h
+++ b/ports/stm32f4/boards/DIS_F412ZG/stm32f4xx_it.h
diff --git a/ports/stm32f4/common-hal/busio/I2C.h b/ports/stm32f4/common-hal/busio/I2C.h
index b75d15f00..6f6711167 100644
--- a/ports/stm32f4/common-hal/busio/I2C.h
+++ b/ports/stm32f4/common-hal/busio/I2C.h
@@ -27,8 +27,6 @@
 #ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_BUSIO_I2C_H
 #define MICROPY_INCLUDED_NRF_COMMON_HAL_BUSIO_I2C_H
 
-#include "nrfx_twim.h"
-
 #include "py/obj.h"
 
 typedef struct {
diff --git a/ports/stm32f4/common-hal/busio/SPI.h b/ports/stm32f4/common-hal/busio/SPI.h
index 1b0de8acf..36fc0350c 100644
--- a/ports/stm32f4/common-hal/busio/SPI.h
+++ b/ports/stm32f4/common-hal/busio/SPI.h
@@ -27,7 +27,6 @@
 #ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_BUSIO_SPI_H
 #define MICROPY_INCLUDED_NRF_COMMON_HAL_BUSIO_SPI_H
 
-#include "nrfx_spim.h"
 #include "py/obj.h"
 
 typedef struct {
diff --git a/ports/stm32f4/common-hal/busio/UART.h b/ports/stm32f4/common-hal/busio/UART.h
index 58432001c..80a707f71 100644
--- a/ports/stm32f4/common-hal/busio/UART.h
+++ b/ports/stm32f4/common-hal/busio/UART.h
@@ -28,7 +28,6 @@
 #define MICROPY_INCLUDED_NRF_COMMON_HAL_BUSIO_UART_H
 
 #include "common-hal/microcontroller/Pin.h"
-#include "nrfx_uarte.h"
 
 #include "py/obj.h"
 #include "py/ringbuf.h"
diff --git a/ports/stm32f4/common-hal/digitalio/DigitalInOut.h b/ports/stm32f4/common-hal/digitalio/DigitalInOut.h
index c6b3d21d2..9122ba4a1 100644
--- a/ports/stm32f4/common-hal/digitalio/DigitalInOut.h
+++ b/ports/stm32f4/common-hal/digitalio/DigitalInOut.h
@@ -27,7 +27,7 @@
 #ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
 #define MICROPY_INCLUDED_NRF_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
 
-//#include "common-hal/microcontroller/Pin.h"
+#include "common-hal/microcontroller/Pin.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/stm32f4/supervisor/internal_flash.c b/ports/stm32f4/supervisor/internal_flash.c
index da9825bec..fa776ae1d 100644
--- a/ports/stm32f4/supervisor/internal_flash.c
+++ b/ports/stm32f4/supervisor/internal_flash.c
@@ -35,13 +35,6 @@
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
 
-// #include "peripherals/nrf/nvm.h"
-
-// #ifdef BLUETOOTH_SD
-// #include "ble_drv.h"
-// #include "nrf_sdm.h"
-// #endif
-
 
 /*------------------------------------------------------------------*/
 /* Internal Flash API