Skip to content

Commit 2b1d3c2

Browse files
authored
Merge pull request #2808 from k0d/stm32f7_os
Enables os on STM32F7
2 parents 29e7d00 + d9e4155 commit 2b1d3c2

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

ports/stm/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ CFLAGS += $(MCU_FLAGS_$(MCU_SERIES))
110110
# Select HAL file for distribution via mpconfigport
111111
CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES_LOWER)xx_hal.h>'
112112

113+
CFLAGS += -DSTM32_SERIES_LOWER='"stm32$(MCU_SERIES_LOWER)"'
114+
113115
# Floating point settings
114116
ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F765xx STM32F767xx STM32F769xx STM32H743xx))
115117
CFLAGS += -mfpu=fpv5-d16 -mfloat-abi=hard

ports/stm/common-hal/os/__init__.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232

3333
#include "py/mperrno.h"
3434
#include "py/runtime.h"
35-
#include "stm32f4xx_hal.h"
35+
#include STM32_HAL_H
3636
#include "peripherals/periph.h"
3737

3838
STATIC const qstr os_uname_info_fields[] = {
3939
MP_QSTR_sysname, MP_QSTR_nodename,
4040
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
4141
};
42-
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "stm32f4");
43-
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "stm32f4");
42+
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, STM32_SERIES_LOWER);
43+
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, STM32_SERIES_LOWER);
4444

4545
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
4646
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);

ports/stm/mpconfigport.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ifeq ($(MCU_SERIES),H7)
2222
CIRCUITPY_ANALOGIO = 0
2323
CIRCUITPY_NEOPIXEL_WRITE = 0
2424
CIRCUITPY_PULSEIO = 0
25-
CIRCUITPY_OS = 0
25+
CIRCUITPY_OS = 1
2626
CIRCUITPY_NVM = 0
2727
CIRCUITPY_AUDIOBUSIO = 0
2828
CIRCUITPY_AUDIOIO = 0
@@ -41,7 +41,7 @@ ifeq ($(MCU_SERIES),F7)
4141
CIRCUITPY_ANALOGIO = 0
4242
CIRCUITPY_NEOPIXEL_WRITE = 0
4343
CIRCUITPY_PULSEIO = 1
44-
CIRCUITPY_OS = 0
44+
CIRCUITPY_OS = 1
4545
CIRCUITPY_NVM = 0
4646
CIRCUITPY_AUDIOBUSIO = 0
4747
CIRCUITPY_AUDIOIO = 0

0 commit comments

Comments
 (0)