Skip to content

Commit a63df51

Browse files
hierophecthierophect
committed
Requested changes, general cleanup
1 parent 172ab19 commit a63df51

107 files changed

Lines changed: 642 additions & 7187 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
path = lib/tinyusb
7878
url = https://github.com/hathach/tinyusb.git
7979
branch = develop
80-
ignore = dirty
8180
[submodule "tools/huffman"]
8281
path = tools/huffman
8382
url = https://github.com/tannewt/huffman.git
@@ -98,4 +97,4 @@
9897
url = https://github.com/python-ugame/circuitpython-stage.git
9998
[submodule "ports/stm32f4/stm32f4"]
10099
path = ports/stm32f4/stm32f4
101-
url = https://github.com/hierophect/stm32f4.git
100+
url = https://github.com/adafruit/stm32f4.git

‎main.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ void cleanup_after_vm(supervisor_allocation* heap) {
190190
supervisor_move_memory();
191191

192192
reset_port();
193+
#if CIRCUITPY_BOARD
193194
reset_board_busses();
195+
#endif
194196
reset_board();
195197
reset_status_led();
196198
}

‎ports/stm32f4/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ include ../../py/mkenv.mk
4040
include boards/$(BOARD)/mpconfigboard.mk
4141
# Port-specific
4242
include mpconfigport.mk
43+
4344
# CircuitPython-specific
4445
include $(TOP)/py/circuitpy_mpconfig.mk
4546

@@ -99,9 +100,6 @@ ifeq ($(MCU_SUB_VARIANT), stm32f411xe)
99100
C_DEFS = \
100101
-DUSE_HAL_DRIVER \
101102
-DSTM32F411xE
102-
CIRCUITPY_BOARD = 0
103-
CIRCUITPY_DIGITALIO = 0
104-
CIRCUITPY_MICROCONTROLLER = 0
105103
endif
106104

107105
#TODO: Add ASM Flags? -Werror
@@ -185,7 +183,8 @@ SRC_C += \
185183
mphalport.c \
186184
tick.c \
187185
boards/$(BOARD)/board.c \
188-
boards/$(BOARD)/pins.c \
186+
peripherals/stm32f4/$(MCU_SUB_VARIANT)/clocks.c \
187+
peripherals/stm32f4/$(MCU_SUB_VARIANT)/gpio.c \
189188
lib/libc/string0.c \
190189
lib/mp-readline/readline.c \
191190
lib/oofatfs/ff.c \
@@ -204,7 +203,8 @@ SRC_C += lib/tinyusb/src/portable/st/stm32f4/dcd_stm32f4.c
204203
endif
205204

206205
ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
207-
SRC_C += peripherals/stm32f4/stm32f412zg/pins.c
206+
SRC_C += peripherals/stm32f4/stm32f412zx/pins.c
207+
SRC_C += boards/$(BOARD)/pins.c
208208
endif
209209

210210
SRC_S = \

‎ports/stm32f4/background.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@
3232
void background_tasks_reset(void);
3333
void run_background_tasks(void);
3434

35-
#endif // MICROPY_INCLUDED_NRF_BACKGROUND_H
35+
#endif // MICROPY_INCLUDED_STM32F4_BACKGROUND_H

‎ports/stm32f4/boards/DIS_F411RE/stm32f4xx_it.c‎

Lines changed: 0 additions & 217 deletions
This file was deleted.

‎ports/stm32f4/boards/DIS_F411RE/stm32f4xx_it.h‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎ports/stm32f4/boards/DIS_F412ZG/mpconfigboard.mk‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)