Merge pull request adafruit#2808 from k0d/stm32f7_os

hierophect · web-flow · commit 2b1d3c239974 · 2020-04-27T17:06:20.000-04:00
Enables os on STM32F7
diff --git a/ports/stm/Makefile b/ports/stm/Makefile
@@ -110,6 +110,8 @@ CFLAGS += $(MCU_FLAGS_$(MCU_SERIES))
 # Select HAL file for distribution via mpconfigport
 CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES_LOWER)xx_hal.h>'
 
+CFLAGS += -DSTM32_SERIES_LOWER='"stm32$(MCU_SERIES_LOWER)"'
+
 # Floating point settings
 ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F765xx STM32F767xx STM32F769xx STM32H743xx))
 CFLAGS += -mfpu=fpv5-d16 -mfloat-abi=hard
diff --git a/ports/stm/common-hal/os/__init__.c b/ports/stm/common-hal/os/__init__.c
@@ -32,15 +32,15 @@
 
 #include "py/mperrno.h"
 #include "py/runtime.h"
-#include "stm32f4xx_hal.h"
+#include STM32_HAL_H
 #include "peripherals/periph.h"
 
 STATIC const qstr os_uname_info_fields[] = {
     MP_QSTR_sysname, MP_QSTR_nodename,
     MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
 };
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "stm32f4");
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "stm32f4");
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, STM32_SERIES_LOWER);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, STM32_SERIES_LOWER);
 
 STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
 STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
@@ -22,7 +22,7 @@ ifeq ($(MCU_SERIES),H7)
 	CIRCUITPY_ANALOGIO = 0
 	CIRCUITPY_NEOPIXEL_WRITE = 0
 	CIRCUITPY_PULSEIO = 0
-	CIRCUITPY_OS = 0
+	CIRCUITPY_OS = 1
 	CIRCUITPY_NVM = 0
 	CIRCUITPY_AUDIOBUSIO = 0
 	CIRCUITPY_AUDIOIO = 0
@@ -41,7 +41,7 @@ ifeq ($(MCU_SERIES),F7)
 	CIRCUITPY_ANALOGIO = 0
 	CIRCUITPY_NEOPIXEL_WRITE = 0
 	CIRCUITPY_PULSEIO = 1
-	CIRCUITPY_OS = 0
+	CIRCUITPY_OS = 1
 	CIRCUITPY_NVM = 0
 	CIRCUITPY_AUDIOBUSIO = 0
 	CIRCUITPY_AUDIOIO = 0
