Merge pull request #2699 from hierophect/stm32-port-namechange

STM32: port directory name change
2020-03-12 15:45:22 -04:00 · 2020-03-12 15:45:22 -04:00 · 0f64663c40
commit 0f64663c40
parent dd21ec048a 18442c5b00
166 changed files with 8 additions and 26 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -96,8 +96,8 @@
 [submodule "frozen/circuitpython-stage"]
 	path = frozen/circuitpython-stage
 	url = https://github.com/python-ugame/circuitpython-stage.git
-[submodule "ports/stm32f4/stm32f4"]
+[submodule "ports/stm/stm32f4"]
-	path = ports/stm32f4/stm32f4
+	path = ports/stm/stm32f4
 	url = https://github.com/adafruit/stm32f4.git
 [submodule "ports/cxd56/spresense-exported-sdk"]
 	path = ports/cxd56/spresense-exported-sdk
--- a/conf.py
+++ b/conf.py
@ -121,16 +121,8 @@ exclude_patterns = ["**/build*",
                    "ports/atmel-samd/peripherals",
                    "ports/atmel-samd/QTouch",
                    "ports/atmel-samd/tools",
                    "ports/bare-arm",
                    "ports/cc3200",
                    "ports/cc3200/FreeRTOS",
                    "ports/cc3200/hal",
                    "ports/cxd56/mkspk",
                    "ports/cxd56/spresense-exported-sdk",
                    "ports/esp32",
                    "ports/esp8266/boards",
                    "ports/esp8266/common-hal",
                    "ports/esp8266/modules",
                    "ports/minimal",
                    "ports/mimxrt10xx/peripherals",
                    "ports/mimxrt10xx/sdk",
@ -140,20 +132,10 @@ exclude_patterns = ["**/build*",
                    "ports/nrf/nrfx",
                    "ports/nrf/peripherals",
                    "ports/nrf/usb",
-                    "ports/stm32f4/stm32f4",
+                    "ports/stm/stm32f4",
-                    "ports/stm32f4/peripherals",
+                    "ports/stm/peripherals",
-                    "ports/stm32f4/ref",
+                    "ports/stm/ref",
                    "ports/pic16bit",
                    "ports/qemu-arm",
                    "ports/stm32",
                    "ports/stm32/hal",
                    "ports/stm32/cmsis",
                    "ports/stm32/usbdev",
                    "ports/stm32/usbhost",
                    "ports/teensy",
                    "ports/unix",
                    "ports/windows",
                    "ports/zephyr",
                    "py",
                    "shared-bindings/util.*",
                    "shared-module",
--- a/docs/supported_ports.rst
+++ b/docs/supported_ports.rst
@ -10,5 +10,5 @@ and ESP8266.
    ../ports/atmel-samd/README
    ../ports/mimxrt10xx/README
    ../ports/nrf/README
-    ../ports/stm32f4/README
+    ../ports/stm/README
    ../ports/cxd56/README
--- a/ports/stm32f4/.gitignore
+++ b/ports/stm32f4/.gitignore
--- a/ports/stm32f4/Makefile
+++ b/ports/stm32f4/Makefile
--- a/ports/stm32f4/README.md
+++ b/ports/stm32f4/README.md
--- a/ports/stm32f4/background.c
+++ b/ports/stm32f4/background.c
--- a/ports/stm32f4/background.h
+++ b/ports/stm32f4/background.h
--- a/ports/stm32f4/boards/STM32F401xd_fs.ld
+++ b/ports/stm32f4/boards/STM32F401xd_fs.ld
--- a/ports/stm32f4/boards/STM32F401xe_boot.ld
+++ b/ports/stm32f4/boards/STM32F401xe_boot.ld
--- a/ports/stm32f4/boards/STM32F401xe_fs.ld
+++ b/ports/stm32f4/boards/STM32F401xe_fs.ld
--- a/ports/stm32f4/boards/STM32F405_boot.ld
+++ b/ports/stm32f4/boards/STM32F405_boot.ld
--- a/ports/stm32f4/boards/STM32F405_default.ld
+++ b/ports/stm32f4/boards/STM32F405_default.ld
--- a/ports/stm32f4/boards/STM32F405_fs.ld
+++ b/ports/stm32f4/boards/STM32F405_fs.ld
--- a/ports/stm32f4/boards/STM32F407_fs.ld
+++ b/ports/stm32f4/boards/STM32F407_fs.ld
--- a/ports/stm32f4/boards/STM32F411VETx_FLASH.ld
+++ b/ports/stm32f4/boards/STM32F411VETx_FLASH.ld
--- a/ports/stm32f4/boards/STM32F412ZGTx_FLASH.ld
+++ b/ports/stm32f4/boards/STM32F412ZGTx_FLASH.ld
--- a/ports/stm32f4/boards/board.h
+++ b/ports/stm32f4/boards/board.h
--- a/ports/stm32f4/boards/espruino_pico/README.md
+++ b/ports/stm32f4/boards/espruino_pico/README.md
--- a/ports/stm32f4/boards/espruino_pico/board.c
+++ b/ports/stm32f4/boards/espruino_pico/board.c
--- a/ports/stm32f4/boards/espruino_pico/mpconfigboard.h
+++ b/ports/stm32f4/boards/espruino_pico/mpconfigboard.h
--- a/ports/stm32f4/boards/espruino_pico/mpconfigboard.mk
+++ b/ports/stm32f4/boards/espruino_pico/mpconfigboard.mk
--- a/ports/stm32f4/boards/espruino_pico/pins.c
+++ b/ports/stm32f4/boards/espruino_pico/pins.c
--- a/ports/stm32f4/boards/espruino_pico/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/espruino_pico/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/boards/espruino_wifi/README.MD
+++ b/ports/stm32f4/boards/espruino_wifi/README.MD
--- a/ports/stm32f4/boards/espruino_wifi/board.c
+++ b/ports/stm32f4/boards/espruino_wifi/board.c
--- a/ports/stm32f4/boards/espruino_wifi/mpconfigboard.h
+++ b/ports/stm32f4/boards/espruino_wifi/mpconfigboard.h
--- a/ports/stm32f4/boards/espruino_wifi/mpconfigboard.mk
+++ b/ports/stm32f4/boards/espruino_wifi/mpconfigboard.mk
--- a/ports/stm32f4/boards/espruino_wifi/pins.c
+++ b/ports/stm32f4/boards/espruino_wifi/pins.c
--- a/ports/stm32f4/boards/espruino_wifi/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/espruino_wifi/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/boards/feather_stm32f405_express/board.c
+++ b/ports/stm32f4/boards/feather_stm32f405_express/board.c
--- a/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h
+++ b/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h
--- a/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.mk
+++ b/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.mk
--- a/ports/stm32f4/boards/feather_stm32f405_express/pins.c
+++ b/ports/stm32f4/boards/feather_stm32f405_express/pins.c
--- a/ports/stm32f4/boards/feather_stm32f405_express/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/feather_stm32f405_express/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/boards/meowbit_v121/board.c
+++ b/ports/stm32f4/boards/meowbit_v121/board.c
--- a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
+++ b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
--- a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
--- a/ports/stm32f4/boards/meowbit_v121/pins.c
+++ b/ports/stm32f4/boards/meowbit_v121/pins.c
--- a/ports/stm32f4/boards/meowbit_v121/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/meowbit_v121/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/boards/openocd_stm32f4.cfg
+++ b/ports/stm32f4/boards/openocd_stm32f4.cfg
--- a/ports/stm32f4/boards/pyb_nano_v2/board.c
+++ b/ports/stm32f4/boards/pyb_nano_v2/board.c
--- a/ports/stm32f4/boards/pyb_nano_v2/mpconfigboard.h
+++ b/ports/stm32f4/boards/pyb_nano_v2/mpconfigboard.h
--- a/ports/stm32f4/boards/pyb_nano_v2/mpconfigboard.mk
+++ b/ports/stm32f4/boards/pyb_nano_v2/mpconfigboard.mk
--- a/ports/stm32f4/boards/pyb_nano_v2/pins.c
+++ b/ports/stm32f4/boards/pyb_nano_v2/pins.c
--- a/ports/stm32f4/boards/pyb_nano_v2/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/pyb_nano_v2/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/boards/pyboard_v11/board.c
+++ b/ports/stm32f4/boards/pyboard_v11/board.c
--- a/ports/stm32f4/boards/pyboard_v11/mpconfigboard.h
+++ b/ports/stm32f4/boards/pyboard_v11/mpconfigboard.h
--- a/ports/stm32f4/boards/pyboard_v11/mpconfigboard.mk
+++ b/ports/stm32f4/boards/pyboard_v11/mpconfigboard.mk
--- a/ports/stm32f4/boards/pyboard_v11/pins.c
+++ b/ports/stm32f4/boards/pyboard_v11/pins.c
--- a/ports/stm32f4/boards/pyboard_v11/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/pyboard_v11/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/boards/startup_stm32f401xe.s
+++ b/ports/stm32f4/boards/startup_stm32f401xe.s
--- a/ports/stm32f4/boards/startup_stm32f405xx.s
+++ b/ports/stm32f4/boards/startup_stm32f405xx.s
--- a/ports/stm32f4/boards/startup_stm32f407xx.s
+++ b/ports/stm32f4/boards/startup_stm32f407xx.s
--- a/ports/stm32f4/boards/startup_stm32f411xe.s
+++ b/ports/stm32f4/boards/startup_stm32f411xe.s
--- a/ports/stm32f4/boards/startup_stm32f412zx.s
+++ b/ports/stm32f4/boards/startup_stm32f412zx.s
--- a/ports/stm32f4/boards/stm32f411ce_blackpill/board.c
+++ b/ports/stm32f4/boards/stm32f411ce_blackpill/board.c
--- a/ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.h
+++ b/ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.h
--- a/ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.mk
+++ b/ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.mk
--- a/ports/stm32f4/boards/stm32f411ce_blackpill/pins.c
+++ b/ports/stm32f4/boards/stm32f411ce_blackpill/pins.c
--- a/ports/stm32f4/boards/stm32f411ce_blackpill/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/stm32f411ce_blackpill/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/boards/stm32f411ve_discovery/board.c
+++ b/ports/stm32f4/boards/stm32f411ve_discovery/board.c
--- a/ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.h
+++ b/ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.h
--- a/ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.mk
+++ b/ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.mk
--- a/ports/stm32f4/boards/stm32f411ve_discovery/pins.c
+++ b/ports/stm32f4/boards/stm32f411ve_discovery/pins.c
--- a/ports/stm32f4/boards/stm32f411ve_discovery/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/stm32f411ve_discovery/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/boards/stm32f412zg_discovery/board.c
+++ b/ports/stm32f4/boards/stm32f412zg_discovery/board.c
--- a/ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.h
+++ b/ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.h
--- a/ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.mk
+++ b/ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.mk
--- a/ports/stm32f4/boards/stm32f412zg_discovery/pins.c
+++ b/ports/stm32f4/boards/stm32f412zg_discovery/pins.c
--- a/ports/stm32f4/boards/stm32f412zg_discovery/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/stm32f412zg_discovery/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/boards/stm32f4_discovery/board.c
+++ b/ports/stm32f4/boards/stm32f4_discovery/board.c
--- a/ports/stm32f4/boards/stm32f4_discovery/mpconfigboard.h
+++ b/ports/stm32f4/boards/stm32f4_discovery/mpconfigboard.h
--- a/ports/stm32f4/boards/stm32f4_discovery/mpconfigboard.mk
+++ b/ports/stm32f4/boards/stm32f4_discovery/mpconfigboard.mk
--- a/ports/stm32f4/boards/stm32f4_discovery/pins.c
+++ b/ports/stm32f4/boards/stm32f4_discovery/pins.c
--- a/ports/stm32f4/boards/stm32f4_discovery/stm32f4xx_hal_conf.h
+++ b/ports/stm32f4/boards/stm32f4_discovery/stm32f4xx_hal_conf.h
--- a/ports/stm32f4/common-hal/analogio/AnalogIn.c
+++ b/ports/stm32f4/common-hal/analogio/AnalogIn.c
--- a/ports/stm32f4/common-hal/analogio/AnalogIn.h
+++ b/ports/stm32f4/common-hal/analogio/AnalogIn.h
--- a/ports/stm32f4/common-hal/analogio/AnalogOut.c
+++ b/ports/stm32f4/common-hal/analogio/AnalogOut.c
--- a/ports/stm32f4/common-hal/analogio/AnalogOut.h
+++ b/ports/stm32f4/common-hal/analogio/AnalogOut.h
--- a/ports/stm32f4/common-hal/analogio/init.c
+++ b/ports/stm32f4/common-hal/analogio/init.c
--- a/ports/stm32f4/common-hal/board/init.c
+++ b/ports/stm32f4/common-hal/board/init.c
--- a/ports/stm32f4/common-hal/busio/I2C.c
+++ b/ports/stm32f4/common-hal/busio/I2C.c
--- a/ports/stm32f4/common-hal/busio/I2C.h
+++ b/ports/stm32f4/common-hal/busio/I2C.h
--- a/ports/stm32f4/common-hal/busio/OneWire.h
+++ b/ports/stm32f4/common-hal/busio/OneWire.h
--- a/ports/stm32f4/common-hal/busio/SPI.c
+++ b/ports/stm32f4/common-hal/busio/SPI.c
--- a/ports/stm32f4/common-hal/busio/SPI.h
+++ b/ports/stm32f4/common-hal/busio/SPI.h
--- a/ports/stm32f4/common-hal/busio/UART.c
+++ b/ports/stm32f4/common-hal/busio/UART.c
--- a/ports/stm32f4/common-hal/busio/UART.h
+++ b/ports/stm32f4/common-hal/busio/UART.h
--- a/ports/stm32f4/common-hal/busio/init.c
+++ b/ports/stm32f4/common-hal/busio/init.c
--- a/ports/stm32f4/common-hal/digitalio/DigitalInOut.c
+++ b/ports/stm32f4/common-hal/digitalio/DigitalInOut.c
--- a/ports/stm32f4/common-hal/digitalio/DigitalInOut.h
+++ b/ports/stm32f4/common-hal/digitalio/DigitalInOut.h
--- a/ports/stm32f4/common-hal/digitalio/init.c
+++ b/ports/stm32f4/common-hal/digitalio/init.c
--- a/ports/stm32f4/common-hal/displayio/ParallelBus.c
+++ b/ports/stm32f4/common-hal/displayio/ParallelBus.c
--- a/ports/stm32f4/common-hal/displayio/ParallelBus.h
+++ b/ports/stm32f4/common-hal/displayio/ParallelBus.h
--- a/ports/stm32f4/common-hal/microcontroller/Pin.c
+++ b/ports/stm32f4/common-hal/microcontroller/Pin.c
--- a/ports/stm32f4/common-hal/microcontroller/Pin.h
+++ b/ports/stm32f4/common-hal/microcontroller/Pin.h
--- a/ports/stm32f4/common-hal/microcontroller/Processor.c
+++ b/ports/stm32f4/common-hal/microcontroller/Processor.c
--- a/ports/stm32f4/common-hal/microcontroller/Processor.h
+++ b/ports/stm32f4/common-hal/microcontroller/Processor.h
--- a/ports/stm32f4/common-hal/microcontroller/init.c
+++ b/ports/stm32f4/common-hal/microcontroller/init.c
--- a/Show More
+++ b/Show More