diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/.cproject b/demos/STM32/RT-STM32F030R8-NUCLEO64/.cproject similarity index 96% rename from demos/STM32/RT-STM32F030R8-NUCLEO/.cproject rename to demos/STM32/RT-STM32F030R8-NUCLEO64/.cproject index adac66c46..4ad874420 100644 --- a/demos/STM32/RT-STM32F030R8-NUCLEO/.cproject +++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/.project b/demos/STM32/RT-STM32F030R8-NUCLEO64/.project similarity index 87% rename from demos/STM32/RT-STM32F072RB-NUCLEO/.project rename to demos/STM32/RT-STM32F030R8-NUCLEO64/.project index f7a1a5542..456cefc75 100644 --- a/demos/STM32/RT-STM32F072RB-NUCLEO/.project +++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/.project @@ -1,6 +1,6 @@ - RT-STM32F072RB-NUCLEO + RT-STM32F030R8-NUCLEO64 @@ -27,7 +27,7 @@ board 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_F072RB + CHIBIOS/os/hal/boards/ST_NUCLEO64_F030R8 os diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/Makefile b/demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32F030R8-NUCLEO/Makefile rename to demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile index 21852f556..2f425d45e 100644 --- a/demos/STM32/RT-STM32F030R8-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F030R8/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F030R8/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/chconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32F030R8-NUCLEO/chconf.h rename to demos/STM32/RT-STM32F030R8-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/debug/RT-STM32F030R8-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F030R8-NUCLEO64/debug/RT-STM32F030R8-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32F030R8-NUCLEO/debug/RT-STM32F030R8-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32F030R8-NUCLEO64/debug/RT-STM32F030R8-NUCLEO64 (OpenOCD, Flash and Run).launch index 1ce99493e..e5a1b5e36 100644 --- a/demos/STM32/RT-STM32F030R8-NUCLEO/debug/RT-STM32F030R8-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/debug/RT-STM32F030R8-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/halconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32F030R8-NUCLEO/halconf.h rename to demos/STM32/RT-STM32F030R8-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/main.c b/demos/STM32/RT-STM32F030R8-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32F030R8-NUCLEO/main.c rename to demos/STM32/RT-STM32F030R8-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32F030R8-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/readme.txt b/demos/STM32/RT-STM32F030R8-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32F030R8-NUCLEO/readme.txt rename to demos/STM32/RT-STM32F030R8-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/.cproject b/demos/STM32/RT-STM32F072RB-NUCLEO64/.cproject similarity index 96% rename from demos/STM32/RT-STM32F072RB-NUCLEO/.cproject rename to demos/STM32/RT-STM32F072RB-NUCLEO64/.cproject index 4358ae2db..8409ff0e2 100644 --- a/demos/STM32/RT-STM32F072RB-NUCLEO/.cproject +++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/.project b/demos/STM32/RT-STM32F072RB-NUCLEO64/.project similarity index 87% rename from demos/STM32/RT-STM32F030R8-NUCLEO/.project rename to demos/STM32/RT-STM32F072RB-NUCLEO64/.project index 1b39e37c7..026ddb8b1 100644 --- a/demos/STM32/RT-STM32F030R8-NUCLEO/.project +++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/.project @@ -1,6 +1,6 @@ - RT-STM32F030R8-NUCLEO + RT-STM32F072RB-NUCLEO64 @@ -27,7 +27,7 @@ board 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_F030R8 + CHIBIOS/os/hal/boards/ST_NUCLEO64_F072RB os diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/Makefile b/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32F072RB-NUCLEO/Makefile rename to demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile index f3d571086..93f87b448 100644 --- a/demos/STM32/RT-STM32F072RB-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F072RB/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F072RB/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/chconf.h b/demos/STM32/RT-STM32F072RB-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32F072RB-NUCLEO/chconf.h rename to demos/STM32/RT-STM32F072RB-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/debug/RT-STM32F091RC-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F072RB-NUCLEO64/debug/RT-STM32F072RB-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32F072RB-NUCLEO/debug/RT-STM32F091RC-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32F072RB-NUCLEO64/debug/RT-STM32F072RB-NUCLEO64 (OpenOCD, Flash and Run).launch index ef1e5e00a..4f0344ae2 100644 --- a/demos/STM32/RT-STM32F072RB-NUCLEO/debug/RT-STM32F091RC-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/debug/RT-STM32F072RB-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/halconf.h b/demos/STM32/RT-STM32F072RB-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32F072RB-NUCLEO/halconf.h rename to demos/STM32/RT-STM32F072RB-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/main.c b/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32F072RB-NUCLEO/main.c rename to demos/STM32/RT-STM32F072RB-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F072RB-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32F072RB-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32F072RB-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/readme.txt b/demos/STM32/RT-STM32F072RB-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32F072RB-NUCLEO/readme.txt rename to demos/STM32/RT-STM32F072RB-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/.cproject b/demos/STM32/RT-STM32F091RC-NUCLEO64/.cproject similarity index 96% rename from demos/STM32/RT-STM32F091RC-NUCLEO/.cproject rename to demos/STM32/RT-STM32F091RC-NUCLEO64/.cproject index b64046319..dd9112549 100644 --- a/demos/STM32/RT-STM32F091RC-NUCLEO/.cproject +++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/.project b/demos/STM32/RT-STM32F091RC-NUCLEO64/.project similarity index 87% rename from demos/STM32/RT-STM32F091RC-NUCLEO/.project rename to demos/STM32/RT-STM32F091RC-NUCLEO64/.project index cf2af0cfb..c143c2443 100644 --- a/demos/STM32/RT-STM32F091RC-NUCLEO/.project +++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/.project @@ -1,6 +1,6 @@ - RT-STM32F091RC-NUCLEO + RT-STM32F091RC-NUCLEO64 @@ -27,7 +27,7 @@ board 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_F091RC + CHIBIOS/os/hal/boards/ST_NUCLEO64_F091RC os diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/Makefile b/demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32F091RC-NUCLEO/Makefile rename to demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile index 1722dbfa0..f4e0c0489 100644 --- a/demos/STM32/RT-STM32F091RC-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F091RC/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F091RC/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/chconf.h b/demos/STM32/RT-STM32F091RC-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32F091RC-NUCLEO/chconf.h rename to demos/STM32/RT-STM32F091RC-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/debug/RT-STM32F091RC-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F091RC-NUCLEO64/debug/RT-STM32F091RC-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32F091RC-NUCLEO/debug/RT-STM32F091RC-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32F091RC-NUCLEO64/debug/RT-STM32F091RC-NUCLEO64 (OpenOCD, Flash and Run).launch index 42557a089..42a271817 100644 --- a/demos/STM32/RT-STM32F091RC-NUCLEO/debug/RT-STM32F091RC-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/debug/RT-STM32F091RC-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/halconf.h b/demos/STM32/RT-STM32F091RC-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32F091RC-NUCLEO/halconf.h rename to demos/STM32/RT-STM32F091RC-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/main.c b/demos/STM32/RT-STM32F091RC-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32F091RC-NUCLEO/main.c rename to demos/STM32/RT-STM32F091RC-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F091RC-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32F091RC-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32F091RC-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/readme.txt b/demos/STM32/RT-STM32F091RC-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32F091RC-NUCLEO/readme.txt rename to demos/STM32/RT-STM32F091RC-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/.cproject b/demos/STM32/RT-STM32F103RB-NUCLEO64/.cproject similarity index 100% rename from demos/STM32/RT-STM32F103RB-NUCLEO/.cproject rename to demos/STM32/RT-STM32F103RB-NUCLEO64/.cproject diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/.project b/demos/STM32/RT-STM32F103RB-NUCLEO64/.project similarity index 87% rename from demos/STM32/RT-STM32F103RB-NUCLEO/.project rename to demos/STM32/RT-STM32F103RB-NUCLEO64/.project index 95aa80b9d..6c9949aba 100644 --- a/demos/STM32/RT-STM32F103RB-NUCLEO/.project +++ b/demos/STM32/RT-STM32F103RB-NUCLEO64/.project @@ -1,6 +1,6 @@ - RT-STM32F103RB-NUCLEO + RT-STM32F103RB-NUCLEO64 @@ -27,7 +27,7 @@ board 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_F103RB + CHIBIOS/os/hal/boards/ST_NUCLEO64_F103RB os diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/Makefile b/demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32F103RB-NUCLEO/Makefile rename to demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile index 15872780e..dea735bb8 100644 --- a/demos/STM32/RT-STM32F103RB-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32F103RB-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F103RB/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F103RB/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/chconf.h b/demos/STM32/RT-STM32F103RB-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32F103RB-NUCLEO/chconf.h rename to demos/STM32/RT-STM32F103RB-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/debug/RT-STM32F103RB-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F103RB-NUCLEO64/debug/RT-STM32F103RB-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32F103RB-NUCLEO/debug/RT-STM32F103RB-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32F103RB-NUCLEO64/debug/RT-STM32F103RB-NUCLEO64 (OpenOCD, Flash and Run).launch index d157aba90..0629e427c 100644 --- a/demos/STM32/RT-STM32F103RB-NUCLEO/debug/RT-STM32F103RB-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F103RB-NUCLEO64/debug/RT-STM32F103RB-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/halconf.h b/demos/STM32/RT-STM32F103RB-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32F103RB-NUCLEO/halconf.h rename to demos/STM32/RT-STM32F103RB-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/main.c b/demos/STM32/RT-STM32F103RB-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32F103RB-NUCLEO/main.c rename to demos/STM32/RT-STM32F103RB-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F103RB-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32F103RB-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32F103RB-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/readme.txt b/demos/STM32/RT-STM32F103RB-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32F103RB-NUCLEO/readme.txt rename to demos/STM32/RT-STM32F103RB-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/.project b/demos/STM32/RT-STM32F302R8-NUCLEO/.project deleted file mode 100644 index 40c5fce61..000000000 --- a/demos/STM32/RT-STM32F302R8-NUCLEO/.project +++ /dev/null @@ -1,43 +0,0 @@ - - - RT-STM32F302R8-NUCLEO - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - board - 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_F302R8 - - - os - 2 - CHIBIOS/os - - - test - 2 - CHIBIOS/test - - - diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/.cproject b/demos/STM32/RT-STM32F302R8-NUCLEO64/.cproject similarity index 100% rename from demos/STM32/RT-STM32F302R8-NUCLEO/.cproject rename to demos/STM32/RT-STM32F302R8-NUCLEO64/.cproject diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO64/.project b/demos/STM32/RT-STM32F302R8-NUCLEO64/.project new file mode 100644 index 000000000..eeecdd168 --- /dev/null +++ b/demos/STM32/RT-STM32F302R8-NUCLEO64/.project @@ -0,0 +1,43 @@ + + + RT-STM32F302R8-NUCLEO64 + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + board + 2 + CHIBIOS/os/hal/boards/ST_NUCLEO64_F302R8 + + + os + 2 + CHIBIOS/os + + + test + 2 + CHIBIOS/test + + + diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/Makefile b/demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32F302R8-NUCLEO/Makefile rename to demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile index 7f3e79d2d..a6f668291 100644 --- a/demos/STM32/RT-STM32F302R8-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32F302R8-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F3xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F302R8/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F302R8/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/chconf.h b/demos/STM32/RT-STM32F302R8-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32F302R8-NUCLEO/chconf.h rename to demos/STM32/RT-STM32F302R8-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/debug/RT-STM32F302R8-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F302R8-NUCLEO64/debug/RT-STM32F302R8-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32F302R8-NUCLEO/debug/RT-STM32F302R8-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32F302R8-NUCLEO64/debug/RT-STM32F302R8-NUCLEO64 (OpenOCD, Flash and Run).launch index 8a8ead8c5..628497697 100644 --- a/demos/STM32/RT-STM32F302R8-NUCLEO/debug/RT-STM32F302R8-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F302R8-NUCLEO64/debug/RT-STM32F302R8-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/halconf.h b/demos/STM32/RT-STM32F302R8-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32F302R8-NUCLEO/halconf.h rename to demos/STM32/RT-STM32F302R8-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/main.c b/demos/STM32/RT-STM32F302R8-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32F302R8-NUCLEO/main.c rename to demos/STM32/RT-STM32F302R8-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F302R8-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32F302R8-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32F302R8-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/readme.txt b/demos/STM32/RT-STM32F302R8-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32F302R8-NUCLEO/readme.txt rename to demos/STM32/RT-STM32F302R8-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/.cproject b/demos/STM32/RT-STM32F334R8-NUCLEO64/.cproject similarity index 100% rename from demos/STM32/RT-STM32F334R8-NUCLEO/.cproject rename to demos/STM32/RT-STM32F334R8-NUCLEO64/.cproject diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/.project b/demos/STM32/RT-STM32F334R8-NUCLEO64/.project similarity index 91% rename from demos/STM32/RT-STM32F334R8-NUCLEO/.project rename to demos/STM32/RT-STM32F334R8-NUCLEO64/.project index 72d4efe53..a2ed497b2 100644 --- a/demos/STM32/RT-STM32F334R8-NUCLEO/.project +++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/.project @@ -1,6 +1,6 @@ - RT-STM32F334R8-NUCLEO + RT-STM32F334R8-NUCLEO64 @@ -27,7 +27,7 @@ board 2 - C:/ChibiStudio/chibios_trunk/os/hal/boards/ST_NUCLEO_F334R8 + C:/ChibiStudio/chibios_trunk/os/hal/boards/ST_NUCLEO64_F334R8 os diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/Makefile b/demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32F334R8-NUCLEO/Makefile rename to demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile index 8cb0a27aa..2c8668dae 100644 --- a/demos/STM32/RT-STM32F334R8-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F3xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F334R8/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F334R8/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/chconf.h b/demos/STM32/RT-STM32F334R8-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32F334R8-NUCLEO/chconf.h rename to demos/STM32/RT-STM32F334R8-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/debug/RT-STM32F334R8-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F334R8-NUCLEO64/debug/RT-STM32F334R8-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32F334R8-NUCLEO/debug/RT-STM32F334R8-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32F334R8-NUCLEO64/debug/RT-STM32F334R8-NUCLEO64 (OpenOCD, Flash and Run).launch index 2eeb1e695..496e96bfd 100644 --- a/demos/STM32/RT-STM32F334R8-NUCLEO/debug/RT-STM32F334R8-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/debug/RT-STM32F334R8-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/halconf.h b/demos/STM32/RT-STM32F334R8-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32F334R8-NUCLEO/halconf.h rename to demos/STM32/RT-STM32F334R8-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/main.c b/demos/STM32/RT-STM32F334R8-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32F334R8-NUCLEO/main.c rename to demos/STM32/RT-STM32F334R8-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F334R8-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32F334R8-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32F334R8-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/readme.txt b/demos/STM32/RT-STM32F334R8-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32F334R8-NUCLEO/readme.txt rename to demos/STM32/RT-STM32F334R8-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/.project b/demos/STM32/RT-STM32F401RE-NUCLEO/.project deleted file mode 100644 index e765fe628..000000000 --- a/demos/STM32/RT-STM32F401RE-NUCLEO/.project +++ /dev/null @@ -1,43 +0,0 @@ - - - RT-STM32F401RE-NUCLEO - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - board - 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_F401RE - - - os - 2 - CHIBIOS/os - - - test - 2 - CHIBIOS/test - - - diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/.cproject b/demos/STM32/RT-STM32F401RE-NUCLEO64/.cproject similarity index 100% rename from demos/STM32/RT-STM32F401RE-NUCLEO/.cproject rename to demos/STM32/RT-STM32F401RE-NUCLEO64/.cproject diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO64/.project b/demos/STM32/RT-STM32F401RE-NUCLEO64/.project new file mode 100644 index 000000000..da37b820a --- /dev/null +++ b/demos/STM32/RT-STM32F401RE-NUCLEO64/.project @@ -0,0 +1,43 @@ + + + RT-STM32F401RE-NUCLEO64 + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + board + 2 + CHIBIOS/os/hal/boards/ST_NUCLEO64_F401RE + + + os + 2 + CHIBIOS/os + + + test + 2 + CHIBIOS/test + + + diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/Makefile b/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32F401RE-NUCLEO/Makefile rename to demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile index ab3ddfa97..d9a55e197 100644 --- a/demos/STM32/RT-STM32F401RE-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F401RE/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F401RE/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/chconf.h b/demos/STM32/RT-STM32F401RE-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32F401RE-NUCLEO/chconf.h rename to demos/STM32/RT-STM32F401RE-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/debug/RT-STM32F401RE-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F401RE-NUCLEO64/debug/RT-STM32F401RE-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32F401RE-NUCLEO/debug/RT-STM32F401RE-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32F401RE-NUCLEO64/debug/RT-STM32F401RE-NUCLEO64 (OpenOCD, Flash and Run).launch index 99fb4a577..627f849f2 100644 --- a/demos/STM32/RT-STM32F401RE-NUCLEO/debug/RT-STM32F401RE-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F401RE-NUCLEO64/debug/RT-STM32F401RE-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/halconf.h b/demos/STM32/RT-STM32F401RE-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32F401RE-NUCLEO/halconf.h rename to demos/STM32/RT-STM32F401RE-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/main.c b/demos/STM32/RT-STM32F401RE-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32F401RE-NUCLEO/main.c rename to demos/STM32/RT-STM32F401RE-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F401RE-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32F401RE-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32F401RE-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/readme.txt b/demos/STM32/RT-STM32F401RE-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32F401RE-NUCLEO/readme.txt rename to demos/STM32/RT-STM32F401RE-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/.project b/demos/STM32/RT-STM32F411RE-NUCLEO/.project deleted file mode 100644 index 6e5895d07..000000000 --- a/demos/STM32/RT-STM32F411RE-NUCLEO/.project +++ /dev/null @@ -1,43 +0,0 @@ - - - RT-STM32F411RE-NUCLEO - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - board - 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_F411RE - - - os - 2 - CHIBIOS/os - - - test - 2 - CHIBIOS/test - - - diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/.cproject b/demos/STM32/RT-STM32F411RE-NUCLEO64/.cproject similarity index 100% rename from demos/STM32/RT-STM32F411RE-NUCLEO/.cproject rename to demos/STM32/RT-STM32F411RE-NUCLEO64/.cproject diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO64/.project b/demos/STM32/RT-STM32F411RE-NUCLEO64/.project new file mode 100644 index 000000000..65af6febb --- /dev/null +++ b/demos/STM32/RT-STM32F411RE-NUCLEO64/.project @@ -0,0 +1,43 @@ + + + RT-STM32F411RE-NUCLEO64 + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + board + 2 + CHIBIOS/os/hal/boards/ST_NUCLEO64_F411RE + + + os + 2 + CHIBIOS/os + + + test + 2 + CHIBIOS/test + + + diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/Makefile b/demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32F411RE-NUCLEO/Makefile rename to demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile index efbf8f036..3509cfca2 100644 --- a/demos/STM32/RT-STM32F411RE-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32F411RE-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F411RE/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F411RE/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/chconf.h b/demos/STM32/RT-STM32F411RE-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32F411RE-NUCLEO/chconf.h rename to demos/STM32/RT-STM32F411RE-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/debug/RT-STM32F411RE-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F411RE-NUCLEO64/debug/RT-STM32F411RE-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32F411RE-NUCLEO/debug/RT-STM32F411RE-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32F411RE-NUCLEO64/debug/RT-STM32F411RE-NUCLEO64 (OpenOCD, Flash and Run).launch index 240ddb52f..86f984792 100644 --- a/demos/STM32/RT-STM32F411RE-NUCLEO/debug/RT-STM32F411RE-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F411RE-NUCLEO64/debug/RT-STM32F411RE-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/halconf.h b/demos/STM32/RT-STM32F411RE-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32F411RE-NUCLEO/halconf.h rename to demos/STM32/RT-STM32F411RE-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/main.c b/demos/STM32/RT-STM32F411RE-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32F411RE-NUCLEO/main.c rename to demos/STM32/RT-STM32F411RE-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F411RE-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32F411RE-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32F411RE-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/readme.txt b/demos/STM32/RT-STM32F411RE-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32F411RE-NUCLEO/readme.txt rename to demos/STM32/RT-STM32F411RE-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/.project b/demos/STM32/RT-STM32L053R8-NUCLEO/.project deleted file mode 100644 index 2ded2eaf5..000000000 --- a/demos/STM32/RT-STM32L053R8-NUCLEO/.project +++ /dev/null @@ -1,43 +0,0 @@ - - - RT-STM32L053R8-NUCLEO - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - board - 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_L053R8 - - - os - 2 - CHIBIOS/os - - - test - 2 - CHIBIOS/test - - - diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/.cproject b/demos/STM32/RT-STM32L053R8-NUCLEO64/.cproject similarity index 100% rename from demos/STM32/RT-STM32L053R8-NUCLEO/.cproject rename to demos/STM32/RT-STM32L053R8-NUCLEO64/.cproject diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO64/.project b/demos/STM32/RT-STM32L053R8-NUCLEO64/.project new file mode 100644 index 000000000..2089e4e32 --- /dev/null +++ b/demos/STM32/RT-STM32L053R8-NUCLEO64/.project @@ -0,0 +1,43 @@ + + + RT-STM32L053R8-NUCLEO64 + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + board + 2 + CHIBIOS/os/hal/boards/ST_NUCLEO64_L053R8 + + + os + 2 + CHIBIOS/os + + + test + 2 + CHIBIOS/test + + + diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/Makefile b/demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32L053R8-NUCLEO/Makefile rename to demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile index f164815e6..3a0d128d2 100644 --- a/demos/STM32/RT-STM32L053R8-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32L053R8-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L0xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L053R8/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L053R8/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/chconf.h b/demos/STM32/RT-STM32L053R8-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32L053R8-NUCLEO/chconf.h rename to demos/STM32/RT-STM32L053R8-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/debug/RT-STM32L053R8-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32L053R8-NUCLEO64/debug/RT-STM32L053R8-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32L053R8-NUCLEO/debug/RT-STM32L053R8-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32L053R8-NUCLEO64/debug/RT-STM32L053R8-NUCLEO64 (OpenOCD, Flash and Run).launch index 9a792695a..e529511a2 100644 --- a/demos/STM32/RT-STM32L053R8-NUCLEO/debug/RT-STM32L053R8-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32L053R8-NUCLEO64/debug/RT-STM32L053R8-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/halconf.h b/demos/STM32/RT-STM32L053R8-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32L053R8-NUCLEO/halconf.h rename to demos/STM32/RT-STM32L053R8-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/main.c b/demos/STM32/RT-STM32L053R8-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32L053R8-NUCLEO/main.c rename to demos/STM32/RT-STM32L053R8-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32L053R8-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32L053R8-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/readme.txt b/demos/STM32/RT-STM32L053R8-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32L053R8-NUCLEO/readme.txt rename to demos/STM32/RT-STM32L053R8-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/.project b/demos/STM32/RT-STM32L152RE-NUCLEO/.project deleted file mode 100644 index 5747a0d90..000000000 --- a/demos/STM32/RT-STM32L152RE-NUCLEO/.project +++ /dev/null @@ -1,43 +0,0 @@ - - - RT-STM32L152RE-NUCLEO - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - board - 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_L152RE - - - os - 2 - CHIBIOS/os - - - test - 2 - CHIBIOS/test - - - diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/.cproject b/demos/STM32/RT-STM32L152RE-NUCLEO64/.cproject similarity index 100% rename from demos/STM32/RT-STM32L152RE-NUCLEO/.cproject rename to demos/STM32/RT-STM32L152RE-NUCLEO64/.cproject diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO64/.project b/demos/STM32/RT-STM32L152RE-NUCLEO64/.project new file mode 100644 index 000000000..f867e1666 --- /dev/null +++ b/demos/STM32/RT-STM32L152RE-NUCLEO64/.project @@ -0,0 +1,43 @@ + + + RT-STM32L152RE-NUCLEO64 + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + board + 2 + CHIBIOS/os/hal/boards/ST_NUCLEO64_L152RE + + + os + 2 + CHIBIOS/os + + + test + 2 + CHIBIOS/test + + + diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/Makefile b/demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32L152RE-NUCLEO/Makefile rename to demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile index 946794966..50d34d843 100644 --- a/demos/STM32/RT-STM32L152RE-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32L152RE-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l1xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L152RE/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L152RE/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/chconf.h b/demos/STM32/RT-STM32L152RE-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32L152RE-NUCLEO/chconf.h rename to demos/STM32/RT-STM32L152RE-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/debug/RT-STM32L152RE-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32L152RE-NUCLEO64/debug/RT-STM32L152RE-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32L152RE-NUCLEO/debug/RT-STM32L152RE-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32L152RE-NUCLEO64/debug/RT-STM32L152RE-NUCLEO64 (OpenOCD, Flash and Run).launch index d9563e411..6f88f7ed4 100644 --- a/demos/STM32/RT-STM32L152RE-NUCLEO/debug/RT-STM32L152RE-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32L152RE-NUCLEO64/debug/RT-STM32L152RE-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/halconf.h b/demos/STM32/RT-STM32L152RE-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32L152RE-NUCLEO/halconf.h rename to demos/STM32/RT-STM32L152RE-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/main.c b/demos/STM32/RT-STM32L152RE-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32L152RE-NUCLEO/main.c rename to demos/STM32/RT-STM32L152RE-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32L152RE-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32L152RE-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32L152RE-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/readme.txt b/demos/STM32/RT-STM32L152RE-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32L152RE-NUCLEO/readme.txt rename to demos/STM32/RT-STM32L152RE-NUCLEO64/readme.txt diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/.project b/demos/STM32/RT-STM32L476RG-NUCLEO/.project deleted file mode 100644 index 6d555e203..000000000 --- a/demos/STM32/RT-STM32L476RG-NUCLEO/.project +++ /dev/null @@ -1,43 +0,0 @@ - - - RT-STM32L476RG-NUCLEO - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - board - 2 - CHIBIOS/os/hal/boards/ST_NUCLEO_L476RG - - - os - 2 - CHIBIOS/os - - - test - 2 - CHIBIOS/test - - - diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/.cproject b/demos/STM32/RT-STM32L476RG-NUCLEO64/.cproject similarity index 100% rename from demos/STM32/RT-STM32L476RG-NUCLEO/.cproject rename to demos/STM32/RT-STM32L476RG-NUCLEO64/.cproject diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/.project b/demos/STM32/RT-STM32L476RG-NUCLEO64/.project new file mode 100644 index 000000000..c95e99942 --- /dev/null +++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/.project @@ -0,0 +1,43 @@ + + + RT-STM32L476RG-NUCLEO64 + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + board + 2 + CHIBIOS/os/hal/boards/ST_NUCLEO64_L476RG + + + os + 2 + CHIBIOS/os + + + test + 2 + CHIBIOS/test + + + diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/Makefile b/demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile similarity index 95% rename from demos/STM32/RT-STM32L476RG-NUCLEO/Makefile rename to demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile index c50d4094f..6c39fcd42 100644 --- a/demos/STM32/RT-STM32L476RG-NUCLEO/Makefile +++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L476RG/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L476RG/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/chconf.h b/demos/STM32/RT-STM32L476RG-NUCLEO64/chconf.h similarity index 100% rename from demos/STM32/RT-STM32L476RG-NUCLEO/chconf.h rename to demos/STM32/RT-STM32L476RG-NUCLEO64/chconf.h diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/debug/RT-STM32L476RG-NUCLEO (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32L476RG-NUCLEO64/debug/RT-STM32L476RG-NUCLEO64 (OpenOCD, Flash and Run).launch similarity index 96% rename from demos/STM32/RT-STM32L476RG-NUCLEO/debug/RT-STM32L476RG-NUCLEO (OpenOCD, Flash and Run).launch rename to demos/STM32/RT-STM32L476RG-NUCLEO64/debug/RT-STM32L476RG-NUCLEO64 (OpenOCD, Flash and Run).launch index 21e83595b..2031665ef 100644 --- a/demos/STM32/RT-STM32L476RG-NUCLEO/debug/RT-STM32L476RG-NUCLEO (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/debug/RT-STM32L476RG-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,6 +1,6 @@ - + @@ -37,11 +37,11 @@ - + - + diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/halconf.h b/demos/STM32/RT-STM32L476RG-NUCLEO64/halconf.h similarity index 100% rename from demos/STM32/RT-STM32L476RG-NUCLEO/halconf.h rename to demos/STM32/RT-STM32L476RG-NUCLEO64/halconf.h diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/main.c b/demos/STM32/RT-STM32L476RG-NUCLEO64/main.c similarity index 100% rename from demos/STM32/RT-STM32L476RG-NUCLEO/main.c rename to demos/STM32/RT-STM32L476RG-NUCLEO64/main.c diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h similarity index 100% rename from demos/STM32/RT-STM32L476RG-NUCLEO/mcuconf.h rename to demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/readme.txt b/demos/STM32/RT-STM32L476RG-NUCLEO64/readme.txt similarity index 100% rename from demos/STM32/RT-STM32L476RG-NUCLEO/readme.txt rename to demos/STM32/RT-STM32L476RG-NUCLEO64/readme.txt diff --git a/os/hal/boards/ST_NUCLEO_F030R8/board.c b/os/hal/boards/ST_NUCLEO64_F030R8/board.c similarity index 94% rename from os/hal/boards/ST_NUCLEO_F030R8/board.c rename to os/hal/boards/ST_NUCLEO64_F030R8/board.c index 1f4a55008..29d04aba5 100644 --- a/os/hal/boards/ST_NUCLEO_F030R8/board.c +++ b/os/hal/boards/ST_NUCLEO64_F030R8/board.c @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/os/hal/boards/ST_NUCLEO_F030R8/board.h b/os/hal/boards/ST_NUCLEO64_F030R8/board.h similarity index 73% rename from os/hal/boards/ST_NUCLEO_F030R8/board.h rename to os/hal/boards/ST_NUCLEO64_F030R8/board.h index 5e5cdf8d2..80eb237ef 100644 --- a/os/hal/boards/ST_NUCLEO_F030R8/board.h +++ b/os/hal/boards/ST_NUCLEO64_F030R8/board.h @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,14 +18,14 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO-F030R8 board. + * Setup for STMicroelectronics NUCLEO64-F030R8 board. */ /* * Board identifier. */ -#define BOARD_ST_NUCLEO_F030R8 -#define BOARD_NAME "STMicroelectronics NUCLEO-F030R8" +#define BOARD_ST_NUCLEO64_F030R8 +#define BOARD_NAME "STMicroelectronics NUCLEO64-F030R8" /* * Board oscillators-related settings. @@ -52,48 +52,54 @@ /* * IO pins assignments. */ -#define GPIOA_PIN0 0U -#define GPIOA_PIN1 1U +#define GPIOA_ARD_A0 0U +#define GPIOA_ARD_A1 1U +#define GPIOA_ARD_D1 2U #define GPIOA_USART_TX 2U +#define GPIOA_ARD_D0 3U #define GPIOA_USART_RX 3U -#define GPIOA_PIN4 4U +#define GPIOA_ARD_A2 4U #define GPIOA_LED_GREEN 5U -#define GPIOA_PIN6 6U -#define GPIOA_PIN7 7U -#define GPIOA_PIN8 8U -#define GPIOA_PIN9 9U -#define GPIOA_PIN10 10U +#define GPIOA_ARD_D13 5U +#define GPIOA_ARD_D12 6U +#define GPIOA_ARD_D11 7U +#define GPIOA_ARD_D7 8U +#define GPIOA_ARD_D8 9U +#define GPIOA_ARD_D2 10U #define GPIOA_PIN11 11U #define GPIOA_PIN12 12U #define GPIOA_SWDIO 13U #define GPIOA_SWCLK 14U #define GPIOA_PIN15 15U -#define GPIOB_PIN0 0U +#define GPIOB_ARD_A3 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U -#define GPIOB_PIN4 4U -#define GPIOB_PIN5 5U -#define GPIOB_PIN6 6U +#define GPIOB_ARD_D3 3U +#define GPIOB_ARD_D5 4U +#define GPIOB_ARD_D4 5U +#define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U -#define GPIOB_PIN8 8U -#define GPIOB_PIN9 9U -#define GPIOB_PIN10 10U +#define GPIOB_ARD_D15 8U +#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_ARD_D14 9U +#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U #define GPIOB_PIN13 13U #define GPIOB_PIN14 14U #define GPIOB_PIN15 15U -#define GPIOC_PIN0 0U -#define GPIOC_PIN1 1U +#define GPIOC_ARD_A5 0U +#define GPIOC_ARD_A4 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U #define GPIOC_PIN5 5U #define GPIOC_PIN6 6U -#define GPIOC_PIN7 7U +#define GPIOC_ARD_D9 7U #define GPIOC_PIN8 8U #define GPIOC_PIN9 9U #define GPIOC_PIN10 10U @@ -140,14 +146,38 @@ /* * IO lines assignments. */ +#define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) #define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) #define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) +#define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) +#define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) +#define LINE_ARD_D11 PAL_LINE(GPIOA, 7U) +#define LINE_ARD_D7 PAL_LINE(GPIOA, 8U) +#define LINE_ARD_D8 PAL_LINE(GPIOA, 9U) +#define LINE_ARD_D2 PAL_LINE(GPIOA, 10U) #define LINE_SWDIO PAL_LINE(GPIOA, 13U) #define LINE_SWCLK PAL_LINE(GPIOA, 14U) +#define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) +#define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) +#define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) +#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) +#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) +#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) +#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) +#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) +#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #define LINE_BUTTON PAL_LINE(GPIOC, 13U) @@ -179,114 +209,114 @@ /* * GPIOA setup: * - * PA0 - PIN0 (input pullup). - * PA1 - PIN1 (input pullup). - * PA2 - USART_TX (alternate 1). - * PA3 - USART_RX (alternate 1). - * PA4 - PIN4 (input pullup). - * PA5 - LED_GREEN (output pushpull high). - * PA6 - PIN6 (input pullup). - * PA7 - PIN7 (input pullup). - * PA8 - PIN8 (input pullup). - * PA9 - PIN9 (input pullup). - * PA10 - PIN10 (input pullup). + * PA0 - ARD_A0 (analog). + * PA1 - ARD_A1 (analog). + * PA2 - ARD_D1 USART_TX (alternate 1). + * PA3 - ARD_D0 USART_RX (alternate 1). + * PA4 - ARD_A2 (analog). + * PA5 - LED_GREEN ARD_D13 (output pushpull high). + * PA6 - ARD_D12 (input pullup). + * PA7 - ARD_D11 (input pullup). + * PA8 - ARD_D7 (input pullup). + * PA9 - ARD_D8 (input pullup). + * PA10 - ARD_D2 (input pullup). * PA11 - PIN11 (input pullup). * PA12 - PIN12 (input pullup). * PA13 - SWDIO (alternate 0). * PA14 - SWCLK (alternate 0). * PA15 - PIN15 (input pullup). */ -#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_PIN0) | \ - PIN_MODE_INPUT(GPIOA_PIN1) | \ - PIN_MODE_ALTERNATE(GPIOA_USART_TX) | \ - PIN_MODE_ALTERNATE(GPIOA_USART_RX) | \ - PIN_MODE_INPUT(GPIOA_PIN4) | \ +#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \ + PIN_MODE_ANALOG(GPIOA_ARD_A1) | \ + PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \ + PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \ + PIN_MODE_ANALOG(GPIOA_ARD_A2) | \ PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \ - PIN_MODE_INPUT(GPIOA_PIN6) | \ - PIN_MODE_INPUT(GPIOA_PIN7) | \ - PIN_MODE_INPUT(GPIOA_PIN8) | \ - PIN_MODE_INPUT(GPIOA_PIN9) | \ - PIN_MODE_INPUT(GPIOA_PIN10) | \ + PIN_MODE_INPUT(GPIOA_ARD_D12) | \ + PIN_MODE_INPUT(GPIOA_ARD_D11) | \ + PIN_MODE_INPUT(GPIOA_ARD_D7) | \ + PIN_MODE_INPUT(GPIOA_ARD_D8) | \ + PIN_MODE_INPUT(GPIOA_ARD_D2) | \ PIN_MODE_INPUT(GPIOA_PIN11) | \ PIN_MODE_INPUT(GPIOA_PIN12) | \ PIN_MODE_ALTERNATE(GPIOA_SWDIO) | \ PIN_MODE_ALTERNATE(GPIOA_SWCLK) | \ PIN_MODE_INPUT(GPIOA_PIN15)) -#define VAL_GPIOA_OTYPER (PIN_OTYPE_PUSHPULL(GPIOA_PIN0) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN1) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USART_TX) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USART_RX) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN4) | \ +#define VAL_GPIOA_OTYPER (PIN_OTYPE_PUSHPULL(GPIOA_ARD_A0) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_A1) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D1) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D0) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_A2) | \ PIN_OTYPE_PUSHPULL(GPIOA_LED_GREEN) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN6) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN7) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN8) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN9) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN10) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D12) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D11) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D7) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D8) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D2) | \ PIN_OTYPE_PUSHPULL(GPIOA_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOA_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWDIO) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWCLK) | \ PIN_OTYPE_PUSHPULL(GPIOA_PIN15)) -#define VAL_GPIOA_OSPEEDR (PIN_OSPEED_HIGH(GPIOA_PIN0) | \ - PIN_OSPEED_HIGH(GPIOA_PIN1) | \ - PIN_OSPEED_LOW(GPIOA_USART_TX) | \ - PIN_OSPEED_LOW(GPIOA_USART_RX) | \ - PIN_OSPEED_HIGH(GPIOA_PIN4) | \ +#define VAL_GPIOA_OSPEEDR (PIN_OSPEED_HIGH(GPIOA_ARD_A0) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_A1) | \ + PIN_OSPEED_LOW(GPIOA_ARD_D1) | \ + PIN_OSPEED_LOW(GPIOA_ARD_D0) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_A2) | \ PIN_OSPEED_LOW(GPIOA_LED_GREEN) | \ - PIN_OSPEED_HIGH(GPIOA_PIN6) | \ - PIN_OSPEED_HIGH(GPIOA_PIN7) | \ - PIN_OSPEED_HIGH(GPIOA_PIN8) | \ - PIN_OSPEED_HIGH(GPIOA_PIN9) | \ - PIN_OSPEED_HIGH(GPIOA_PIN10) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D12) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D11) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D7) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D8) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D2) | \ PIN_OSPEED_HIGH(GPIOA_PIN11) | \ PIN_OSPEED_HIGH(GPIOA_PIN12) | \ PIN_OSPEED_HIGH(GPIOA_SWDIO) | \ PIN_OSPEED_HIGH(GPIOA_SWCLK) | \ PIN_OSPEED_HIGH(GPIOA_PIN15)) -#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_PIN0) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN1) | \ - PIN_PUPDR_FLOATING(GPIOA_USART_TX) | \ - PIN_PUPDR_FLOATING(GPIOA_USART_RX) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN4) | \ +#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \ PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN6) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN8) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN9) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN10) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D7) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D8) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D2) | \ PIN_PUPDR_PULLUP(GPIOA_PIN11) | \ PIN_PUPDR_PULLUP(GPIOA_PIN12) | \ PIN_PUPDR_PULLUP(GPIOA_SWDIO) | \ PIN_PUPDR_PULLDOWN(GPIOA_SWCLK) | \ PIN_PUPDR_PULLUP(GPIOA_PIN15)) -#define VAL_GPIOA_ODR (PIN_ODR_HIGH(GPIOA_PIN0) | \ - PIN_ODR_HIGH(GPIOA_PIN1) | \ - PIN_ODR_HIGH(GPIOA_USART_TX) | \ - PIN_ODR_HIGH(GPIOA_USART_RX) | \ - PIN_ODR_HIGH(GPIOA_PIN4) | \ +#define VAL_GPIOA_ODR (PIN_ODR_HIGH(GPIOA_ARD_A0) | \ + PIN_ODR_HIGH(GPIOA_ARD_A1) | \ + PIN_ODR_HIGH(GPIOA_ARD_D1) | \ + PIN_ODR_HIGH(GPIOA_ARD_D0) | \ + PIN_ODR_HIGH(GPIOA_ARD_A2) | \ PIN_ODR_LOW(GPIOA_LED_GREEN) | \ - PIN_ODR_HIGH(GPIOA_PIN6) | \ - PIN_ODR_HIGH(GPIOA_PIN7) | \ - PIN_ODR_HIGH(GPIOA_PIN8) | \ - PIN_ODR_HIGH(GPIOA_PIN9) | \ - PIN_ODR_HIGH(GPIOA_PIN10) | \ + PIN_ODR_HIGH(GPIOA_ARD_D12) | \ + PIN_ODR_HIGH(GPIOA_ARD_D11) | \ + PIN_ODR_HIGH(GPIOA_ARD_D7) | \ + PIN_ODR_HIGH(GPIOA_ARD_D8) | \ + PIN_ODR_HIGH(GPIOA_ARD_D2) | \ PIN_ODR_HIGH(GPIOA_PIN11) | \ PIN_ODR_HIGH(GPIOA_PIN12) | \ PIN_ODR_HIGH(GPIOA_SWDIO) | \ PIN_ODR_HIGH(GPIOA_SWCLK) | \ PIN_ODR_HIGH(GPIOA_PIN15)) -#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_PIN0, 0) | \ - PIN_AFIO_AF(GPIOA_PIN1, 0) | \ - PIN_AFIO_AF(GPIOA_USART_TX, 1) | \ - PIN_AFIO_AF(GPIOA_USART_RX, 1) | \ - PIN_AFIO_AF(GPIOA_PIN4, 0) | \ +#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_ARD_A0, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_A1, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D1, 1) | \ + PIN_AFIO_AF(GPIOA_ARD_D0, 1) | \ + PIN_AFIO_AF(GPIOA_ARD_A2, 0) | \ PIN_AFIO_AF(GPIOA_LED_GREEN, 0) | \ - PIN_AFIO_AF(GPIOA_PIN6, 0) | \ - PIN_AFIO_AF(GPIOA_PIN7, 0)) -#define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_PIN8, 0) | \ - PIN_AFIO_AF(GPIOA_PIN9, 0) | \ - PIN_AFIO_AF(GPIOA_PIN10, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D12, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D11, 0)) +#define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_ARD_D7, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D8, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D2, 0) | \ PIN_AFIO_AF(GPIOA_PIN11, 0) | \ PIN_AFIO_AF(GPIOA_PIN12, 0) | \ PIN_AFIO_AF(GPIOA_SWDIO, 0) | \ @@ -296,114 +326,114 @@ /* * GPIOB setup: * - * PB0 - PIN0 (input pullup). + * PB0 - ARD_A3 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). - * PB3 - SWO (alternate 0). - * PB4 - PIN4 (input pullup). - * PB5 - PIN5 (input pullup). - * PB6 - PIN6 (input pullup). + * PB3 - SWO ARD_D3 (alternate 0). + * PB4 - ARD_D5 (input pullup). + * PB5 - ARD_D4 (input pullup). + * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - PIN8 (input pullup). - * PB9 - PIN9 (input pullup). - * PB10 - PIN10 (input pullup). + * PB8 - ARD_D15 ARD_A5_ALT (input pullup). + * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). * PB13 - PIN13 (input pullup). * PB14 - PIN14 (input pullup). * PB15 - PIN15 (input pullup). */ -#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_PIN0) | \ +#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \ PIN_MODE_INPUT(GPIOB_PIN1) | \ PIN_MODE_INPUT(GPIOB_PIN2) | \ PIN_MODE_ALTERNATE(GPIOB_SWO) | \ - PIN_MODE_INPUT(GPIOB_PIN4) | \ - PIN_MODE_INPUT(GPIOB_PIN5) | \ - PIN_MODE_INPUT(GPIOB_PIN6) | \ + PIN_MODE_INPUT(GPIOB_ARD_D5) | \ + PIN_MODE_INPUT(GPIOB_ARD_D4) | \ + PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_PIN8) | \ - PIN_MODE_INPUT(GPIOB_PIN9) | \ - PIN_MODE_INPUT(GPIOB_PIN10) | \ + PIN_MODE_INPUT(GPIOB_ARD_D15) | \ + PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ PIN_MODE_INPUT(GPIOB_PIN13) | \ PIN_MODE_INPUT(GPIOB_PIN14) | \ PIN_MODE_INPUT(GPIOB_PIN15)) -#define VAL_GPIOB_OTYPER (PIN_OTYPE_PUSHPULL(GPIOB_PIN0) | \ +#define VAL_GPIOB_OTYPER (PIN_OTYPE_PUSHPULL(GPIOB_ARD_A3) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN1) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN2) | \ PIN_OTYPE_PUSHPULL(GPIOB_SWO) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN4) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN5) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN6) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D5) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D4) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D10) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN7) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN8) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN9) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN10) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D15) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D14) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D6) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN13) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN14) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN15)) -#define VAL_GPIOB_OSPEEDR (PIN_OSPEED_HIGH(GPIOB_PIN0) | \ +#define VAL_GPIOB_OSPEEDR (PIN_OSPEED_HIGH(GPIOB_ARD_A3) | \ PIN_OSPEED_HIGH(GPIOB_PIN1) | \ PIN_OSPEED_HIGH(GPIOB_PIN2) | \ PIN_OSPEED_HIGH(GPIOB_SWO) | \ - PIN_OSPEED_HIGH(GPIOB_PIN4) | \ - PIN_OSPEED_HIGH(GPIOB_PIN5) | \ - PIN_OSPEED_HIGH(GPIOB_PIN6) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D5) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D4) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D10) | \ PIN_OSPEED_HIGH(GPIOB_PIN7) | \ - PIN_OSPEED_HIGH(GPIOB_PIN8) | \ - PIN_OSPEED_HIGH(GPIOB_PIN9) | \ - PIN_OSPEED_HIGH(GPIOB_PIN10) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D15) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D14) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D6) | \ PIN_OSPEED_HIGH(GPIOB_PIN11) | \ PIN_OSPEED_HIGH(GPIOB_PIN12) | \ PIN_OSPEED_HIGH(GPIOB_PIN13) | \ PIN_OSPEED_HIGH(GPIOB_PIN14) | \ PIN_OSPEED_HIGH(GPIOB_PIN15)) -#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_PIN0) | \ +#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \ PIN_PUPDR_PULLUP(GPIOB_PIN1) | \ PIN_PUPDR_PULLUP(GPIOB_PIN2) | \ PIN_PUPDR_PULLUP(GPIOB_SWO) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN4) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN5) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN6) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D5) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN8) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN9) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN10) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ PIN_PUPDR_PULLUP(GPIOB_PIN13) | \ PIN_PUPDR_PULLUP(GPIOB_PIN14) | \ PIN_PUPDR_PULLUP(GPIOB_PIN15)) -#define VAL_GPIOB_ODR (PIN_ODR_HIGH(GPIOB_PIN0) | \ +#define VAL_GPIOB_ODR (PIN_ODR_HIGH(GPIOB_ARD_A3) | \ PIN_ODR_HIGH(GPIOB_PIN1) | \ PIN_ODR_HIGH(GPIOB_PIN2) | \ PIN_ODR_HIGH(GPIOB_SWO) | \ - PIN_ODR_HIGH(GPIOB_PIN4) | \ - PIN_ODR_HIGH(GPIOB_PIN5) | \ - PIN_ODR_HIGH(GPIOB_PIN6) | \ + PIN_ODR_HIGH(GPIOB_ARD_D5) | \ + PIN_ODR_HIGH(GPIOB_ARD_D4) | \ + PIN_ODR_HIGH(GPIOB_ARD_D10) | \ PIN_ODR_HIGH(GPIOB_PIN7) | \ - PIN_ODR_HIGH(GPIOB_PIN8) | \ - PIN_ODR_HIGH(GPIOB_PIN9) | \ - PIN_ODR_HIGH(GPIOB_PIN10) | \ + PIN_ODR_HIGH(GPIOB_ARD_D15) | \ + PIN_ODR_HIGH(GPIOB_ARD_D14) | \ + PIN_ODR_HIGH(GPIOB_ARD_D6) | \ PIN_ODR_HIGH(GPIOB_PIN11) | \ PIN_ODR_HIGH(GPIOB_PIN12) | \ PIN_ODR_HIGH(GPIOB_PIN13) | \ PIN_ODR_HIGH(GPIOB_PIN14) | \ PIN_ODR_HIGH(GPIOB_PIN15)) -#define VAL_GPIOB_AFRL (PIN_AFIO_AF(GPIOB_PIN0, 0) | \ +#define VAL_GPIOB_AFRL (PIN_AFIO_AF(GPIOB_ARD_A3, 0) | \ PIN_AFIO_AF(GPIOB_PIN1, 0) | \ PIN_AFIO_AF(GPIOB_PIN2, 0) | \ PIN_AFIO_AF(GPIOB_SWO, 0) | \ - PIN_AFIO_AF(GPIOB_PIN4, 0) | \ - PIN_AFIO_AF(GPIOB_PIN5, 0) | \ - PIN_AFIO_AF(GPIOB_PIN6, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D5, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_PIN8, 0) | \ - PIN_AFIO_AF(GPIOB_PIN9, 0) | \ - PIN_AFIO_AF(GPIOB_PIN10, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ PIN_AFIO_AF(GPIOB_PIN13, 0) | \ @@ -413,14 +443,14 @@ /* * GPIOC setup: * - * PC0 - PIN0 (input pullup). - * PC1 - PIN1 (input pullup). + * PC0 - ARD_A5 (analog). + * PC1 - ARD_A4 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). * PC5 - PIN5 (input pullup). * PC6 - PIN6 (input pullup). - * PC7 - PIN7 (input pullup). + * PC7 - ARD_D9 (input pullup). * PC8 - PIN8 (input pullup). * PC9 - PIN9 (input pullup). * PC10 - PIN10 (input pullup). @@ -430,14 +460,14 @@ * PC14 - PIN14 (input pullup). * PC15 - PIN15 (input pullup). */ -#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_PIN0) | \ - PIN_MODE_INPUT(GPIOC_PIN1) | \ +#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ + PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ PIN_MODE_INPUT(GPIOC_PIN2) | \ PIN_MODE_INPUT(GPIOC_PIN3) | \ PIN_MODE_INPUT(GPIOC_PIN4) | \ PIN_MODE_INPUT(GPIOC_PIN5) | \ PIN_MODE_INPUT(GPIOC_PIN6) | \ - PIN_MODE_INPUT(GPIOC_PIN7) | \ + PIN_MODE_INPUT(GPIOC_ARD_D9) | \ PIN_MODE_INPUT(GPIOC_PIN8) | \ PIN_MODE_INPUT(GPIOC_PIN9) | \ PIN_MODE_INPUT(GPIOC_PIN10) | \ @@ -446,14 +476,14 @@ PIN_MODE_INPUT(GPIOC_BUTTON) | \ PIN_MODE_INPUT(GPIOC_PIN14) | \ PIN_MODE_INPUT(GPIOC_PIN15)) -#define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_PIN0) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN1) | \ +#define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ + PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN3) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN5) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN6) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN7) | \ + PIN_OTYPE_PUSHPULL(GPIOC_ARD_D9) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN8) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN9) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN10) | \ @@ -462,14 +492,14 @@ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) -#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_PIN0) | \ - PIN_OSPEED_HIGH(GPIOC_PIN1) | \ +#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ + PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ PIN_OSPEED_HIGH(GPIOC_PIN3) | \ PIN_OSPEED_HIGH(GPIOC_PIN4) | \ PIN_OSPEED_HIGH(GPIOC_PIN5) | \ PIN_OSPEED_HIGH(GPIOC_PIN6) | \ - PIN_OSPEED_HIGH(GPIOC_PIN7) | \ + PIN_OSPEED_HIGH(GPIOC_ARD_D9) | \ PIN_OSPEED_HIGH(GPIOC_PIN8) | \ PIN_OSPEED_HIGH(GPIOC_PIN9) | \ PIN_OSPEED_HIGH(GPIOC_PIN10) | \ @@ -478,14 +508,14 @@ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ PIN_OSPEED_HIGH(GPIOC_PIN14) | \ PIN_OSPEED_HIGH(GPIOC_PIN15)) -#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_PIN0) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN1) | \ +#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ + PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ PIN_PUPDR_PULLUP(GPIOC_PIN3) | \ PIN_PUPDR_PULLUP(GPIOC_PIN4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN5) | \ PIN_PUPDR_PULLUP(GPIOC_PIN6) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN7) | \ + PIN_PUPDR_PULLUP(GPIOC_ARD_D9) | \ PIN_PUPDR_PULLUP(GPIOC_PIN8) | \ PIN_PUPDR_PULLUP(GPIOC_PIN9) | \ PIN_PUPDR_PULLUP(GPIOC_PIN10) | \ @@ -494,14 +524,14 @@ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ PIN_PUPDR_PULLUP(GPIOC_PIN15)) -#define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_PIN0) | \ - PIN_ODR_HIGH(GPIOC_PIN1) | \ +#define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ + PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ PIN_ODR_HIGH(GPIOC_PIN3) | \ PIN_ODR_HIGH(GPIOC_PIN4) | \ PIN_ODR_HIGH(GPIOC_PIN5) | \ PIN_ODR_HIGH(GPIOC_PIN6) | \ - PIN_ODR_HIGH(GPIOC_PIN7) | \ + PIN_ODR_HIGH(GPIOC_ARD_D9) | \ PIN_ODR_HIGH(GPIOC_PIN8) | \ PIN_ODR_HIGH(GPIOC_PIN9) | \ PIN_ODR_HIGH(GPIOC_PIN10) | \ @@ -510,14 +540,14 @@ PIN_ODR_HIGH(GPIOC_BUTTON) | \ PIN_ODR_HIGH(GPIOC_PIN14) | \ PIN_ODR_HIGH(GPIOC_PIN15)) -#define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_PIN0, 0) | \ - PIN_AFIO_AF(GPIOC_PIN1, 0) | \ +#define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ + PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ PIN_AFIO_AF(GPIOC_PIN3, 0) | \ PIN_AFIO_AF(GPIOC_PIN4, 0) | \ PIN_AFIO_AF(GPIOC_PIN5, 0) | \ PIN_AFIO_AF(GPIOC_PIN6, 0) | \ - PIN_AFIO_AF(GPIOC_PIN7, 0)) + PIN_AFIO_AF(GPIOC_ARD_D9, 0)) #define VAL_GPIOC_AFRH (PIN_AFIO_AF(GPIOC_PIN8, 0) | \ PIN_AFIO_AF(GPIOC_PIN9, 0) | \ PIN_AFIO_AF(GPIOC_PIN10, 0) | \ diff --git a/os/hal/boards/ST_NUCLEO64_F030R8/board.mk b/os/hal/boards/ST_NUCLEO64_F030R8/board.mk new file mode 100644 index 000000000..e117c2bef --- /dev/null +++ b/os/hal/boards/ST_NUCLEO64_F030R8/board.mk @@ -0,0 +1,5 @@ +# List of all the board related files. +BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO64_F030R8/board.c + +# Required include directories +BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO64_F030R8 diff --git a/os/hal/boards/ST_NUCLEO_F030R8/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F030R8/cfg/board.chcfg similarity index 93% rename from os/hal/boards/ST_NUCLEO_F030R8/cfg/board.chcfg rename to os/hal/boards/ST_NUCLEO64_F030R8/cfg/board.chcfg index 231fdf10c..c6e31b68c 100644 --- a/os/hal/boards/ST_NUCLEO_F030R8/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_F030R8/cfg/board.chcfg @@ -8,8 +8,8 @@ .. 3.0.x - STMicroelectronics NUCLEO-F030R8 - ST_NUCLEO_F030R8 + STMicroelectronics NUCLEO64-F030R8 + ST_NUCLEO64_F030R8 STM32F030x8 .. 3.0.x - STMicroelectronics NUCLEO-F072RB - ST_NUCLEO_F072RB + STMicroelectronics NUCLEO64-F072RB + ST_NUCLEO64_F072RB STM32F072xB .. 3.0.x - STMicroelectronics NUCLEO-F091RC - ST_NUCLEO_F091RC + STMicroelectronics NUCLEO64-F091RC + ST_NUCLEO64_F091RC STM32F091xC .. 3.0.x - STMicroelectronics NUCLEO-F302R8 - ST_NUCLEO_F302R8 + STMicroelectronics NUCLEO64-F302R8 + ST_NUCLEO64_F302R8 STM32F302x8 .. 3.0.x - STMicroelectronics NUCLEO-F334R8 - ST_NUCLEO_F334R8 + STMicroelectronics NUCLEO64-F334R8 + ST_NUCLEO64_F334R8 STM32F334x8 - - - - resources/gencfg/processors/boards/stm32f4xx/templates - .. - 3.0.x - - STMicroelectronics NUCLEO-F401RE - ST_NUCLEO_F401RE - - STM32F401xE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + resources/gencfg/processors/boards/stm32f4xx/templates + .. + 3.0.x + + STMicroelectronics NUCLEO64-F401RE + ST_NUCLEO64_F401RE + + STM32F401xE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/os/hal/boards/ST_NUCLEO_F302R8/board.c b/os/hal/boards/ST_NUCLEO64_F411RE/board.c similarity index 94% rename from os/hal/boards/ST_NUCLEO_F302R8/board.c rename to os/hal/boards/ST_NUCLEO64_F411RE/board.c index f56bd1a03..4d546e3d6 100644 --- a/os/hal/boards/ST_NUCLEO_F302R8/board.c +++ b/os/hal/boards/ST_NUCLEO64_F411RE/board.c @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/os/hal/boards/ST_NUCLEO_F411RE/board.h b/os/hal/boards/ST_NUCLEO64_F411RE/board.h similarity index 84% rename from os/hal/boards/ST_NUCLEO_F411RE/board.h rename to os/hal/boards/ST_NUCLEO64_F411RE/board.h index dc1b825a4..9e2867ebf 100644 --- a/os/hal/boards/ST_NUCLEO_F411RE/board.h +++ b/os/hal/boards/ST_NUCLEO64_F411RE/board.h @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,14 +18,14 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO-F411RE board. + * Setup for STMicroelectronics NUCLEO64-F411RE board. */ /* * Board identifier. */ -#define BOARD_ST_NUCLEO_F411RE -#define BOARD_NAME "STMicroelectronics NUCLEO-F411RE" +#define BOARD_ST_NUCLEO64_F411RE +#define BOARD_NAME "STMicroelectronics NUCLEO64-F411RE" /* * Board oscillators-related settings. @@ -54,48 +54,54 @@ /* * IO pins assignments. */ -#define GPIOA_PIN0 0U -#define GPIOA_PIN1 1U +#define GPIOA_ARD_A0 0U +#define GPIOA_ARD_A1 1U +#define GPIOA_ARD_D1 2U #define GPIOA_USART_TX 2U +#define GPIOA_ARD_D0 3U #define GPIOA_USART_RX 3U -#define GPIOA_PIN4 4U +#define GPIOA_ARD_A2 4U #define GPIOA_LED_GREEN 5U -#define GPIOA_PIN6 6U -#define GPIOA_PIN7 7U -#define GPIOA_PIN8 8U -#define GPIOA_PIN9 9U -#define GPIOA_PIN10 10U +#define GPIOA_ARD_D13 5U +#define GPIOA_ARD_D12 6U +#define GPIOA_ARD_D11 7U +#define GPIOA_ARD_D7 8U +#define GPIOA_ARD_D8 9U +#define GPIOA_ARD_D2 10U #define GPIOA_OTG_FS_DM 11U #define GPIOA_OTG_FS_DP 12U #define GPIOA_SWDIO 13U #define GPIOA_SWCLK 14U #define GPIOA_PIN15 15U -#define GPIOB_PIN0 0U +#define GPIOB_ARD_A3 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U -#define GPIOB_PIN4 4U -#define GPIOB_PIN5 5U -#define GPIOB_PIN6 6U +#define GPIOB_ARD_D3 3U +#define GPIOB_ARD_D5 4U +#define GPIOB_ARD_D4 5U +#define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U -#define GPIOB_PIN8 8U -#define GPIOB_PIN9 9U -#define GPIOB_PIN10 10U +#define GPIOB_ARD_D15 8U +#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_ARD_D14 9U +#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U #define GPIOB_PIN13 13U #define GPIOB_PIN14 14U #define GPIOB_PIN15 15U -#define GPIOC_PIN0 0U -#define GPIOC_PIN1 1U +#define GPIOC_ARD_A5 0U +#define GPIOC_ARD_A4 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U #define GPIOC_PIN5 5U #define GPIOC_PIN6 6U -#define GPIOC_PIN7 7U +#define GPIOC_ARD_D9 7U #define GPIOC_PIN8 8U #define GPIOC_PIN9 9U #define GPIOC_PIN10 10U @@ -210,16 +216,40 @@ /* * IO lines assignments. */ +#define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) #define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) #define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) +#define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) +#define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) +#define LINE_ARD_D11 PAL_LINE(GPIOA, 7U) +#define LINE_ARD_D7 PAL_LINE(GPIOA, 8U) +#define LINE_ARD_D8 PAL_LINE(GPIOA, 9U) +#define LINE_ARD_D2 PAL_LINE(GPIOA, 10U) #define LINE_OTG_FS_DM PAL_LINE(GPIOA, 11U) #define LINE_OTG_FS_DP PAL_LINE(GPIOA, 12U) #define LINE_SWDIO PAL_LINE(GPIOA, 13U) #define LINE_SWCLK PAL_LINE(GPIOA, 14U) +#define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) +#define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) +#define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) +#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) +#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) +#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) +#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) +#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) +#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #define LINE_BUTTON PAL_LINE(GPIOC, 13U) @@ -255,114 +285,114 @@ /* * GPIOA setup: * - * PA0 - PIN0 (input pullup). - * PA1 - PIN1 (input pullup). - * PA2 - USART_TX (alternate 7). - * PA3 - USART_RX (alternate 7). - * PA4 - PIN4 (input pullup). - * PA5 - LED_GREEN (output pushpull high). - * PA6 - PIN6 (input pullup). - * PA7 - PIN7 (input pullup). - * PA8 - PIN8 (input pullup). - * PA9 - PIN9 (input pullup). - * PA10 - PIN10 (input pullup). + * PA0 - ARD_A0 (analog). + * PA1 - ARD_A1 (analog). + * PA2 - ARD_D1 USART_TX (alternate 7). + * PA3 - ARD_D0 USART_RX (alternate 7). + * PA4 - ARD_A2 (analog). + * PA5 - LED_GREEN ARD_D13 (output pushpull high). + * PA6 - ARD_D12 (input pullup). + * PA7 - ARD_D11 (input pullup). + * PA8 - ARD_D7 (input pullup). + * PA9 - ARD_D8 (input pullup). + * PA10 - ARD_D2 (input pullup). * PA11 - OTG_FS_DM (alternate 10). * PA12 - OTG_FS_DP (alternate 10). * PA13 - SWDIO (alternate 0). * PA14 - SWCLK (alternate 0). * PA15 - PIN15 (input pullup). */ -#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_PIN0) | \ - PIN_MODE_INPUT(GPIOA_PIN1) | \ - PIN_MODE_ALTERNATE(GPIOA_USART_TX) | \ - PIN_MODE_ALTERNATE(GPIOA_USART_RX) | \ - PIN_MODE_INPUT(GPIOA_PIN4) | \ +#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \ + PIN_MODE_ANALOG(GPIOA_ARD_A1) | \ + PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \ + PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \ + PIN_MODE_ANALOG(GPIOA_ARD_A2) | \ PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \ - PIN_MODE_INPUT(GPIOA_PIN6) | \ - PIN_MODE_INPUT(GPIOA_PIN7) | \ - PIN_MODE_INPUT(GPIOA_PIN8) | \ - PIN_MODE_INPUT(GPIOA_PIN9) | \ - PIN_MODE_INPUT(GPIOA_PIN10) | \ + PIN_MODE_INPUT(GPIOA_ARD_D12) | \ + PIN_MODE_INPUT(GPIOA_ARD_D11) | \ + PIN_MODE_INPUT(GPIOA_ARD_D7) | \ + PIN_MODE_INPUT(GPIOA_ARD_D8) | \ + PIN_MODE_INPUT(GPIOA_ARD_D2) | \ PIN_MODE_ALTERNATE(GPIOA_OTG_FS_DM) | \ PIN_MODE_ALTERNATE(GPIOA_OTG_FS_DP) | \ PIN_MODE_ALTERNATE(GPIOA_SWDIO) | \ PIN_MODE_ALTERNATE(GPIOA_SWCLK) | \ PIN_MODE_INPUT(GPIOA_PIN15)) -#define VAL_GPIOA_OTYPER (PIN_OTYPE_PUSHPULL(GPIOA_PIN0) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN1) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USART_TX) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USART_RX) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN4) | \ +#define VAL_GPIOA_OTYPER (PIN_OTYPE_PUSHPULL(GPIOA_ARD_A0) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_A1) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D1) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D0) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_A2) | \ PIN_OTYPE_PUSHPULL(GPIOA_LED_GREEN) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN6) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN7) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN8) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN9) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN10) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D12) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D11) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D7) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D8) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D2) | \ PIN_OTYPE_PUSHPULL(GPIOA_OTG_FS_DM) | \ PIN_OTYPE_PUSHPULL(GPIOA_OTG_FS_DP) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWDIO) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWCLK) | \ PIN_OTYPE_PUSHPULL(GPIOA_PIN15)) -#define VAL_GPIOA_OSPEEDR (PIN_OSPEED_HIGH(GPIOA_PIN0) | \ - PIN_OSPEED_HIGH(GPIOA_PIN1) | \ - PIN_OSPEED_MEDIUM(GPIOA_USART_TX) | \ - PIN_OSPEED_MEDIUM(GPIOA_USART_RX) | \ - PIN_OSPEED_HIGH(GPIOA_PIN4) | \ +#define VAL_GPIOA_OSPEEDR (PIN_OSPEED_HIGH(GPIOA_ARD_A0) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_A1) | \ + PIN_OSPEED_MEDIUM(GPIOA_ARD_D1) | \ + PIN_OSPEED_MEDIUM(GPIOA_ARD_D0) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_A2) | \ PIN_OSPEED_MEDIUM(GPIOA_LED_GREEN) | \ - PIN_OSPEED_HIGH(GPIOA_PIN6) | \ - PIN_OSPEED_HIGH(GPIOA_PIN7) | \ - PIN_OSPEED_HIGH(GPIOA_PIN8) | \ - PIN_OSPEED_HIGH(GPIOA_PIN9) | \ - PIN_OSPEED_HIGH(GPIOA_PIN10) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D12) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D11) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D7) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D8) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D2) | \ PIN_OSPEED_HIGH(GPIOA_OTG_FS_DM) | \ PIN_OSPEED_HIGH(GPIOA_OTG_FS_DP) | \ PIN_OSPEED_HIGH(GPIOA_SWDIO) | \ PIN_OSPEED_HIGH(GPIOA_SWCLK) | \ PIN_OSPEED_HIGH(GPIOA_PIN15)) -#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_PIN0) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN1) | \ - PIN_PUPDR_FLOATING(GPIOA_USART_TX) | \ - PIN_PUPDR_FLOATING(GPIOA_USART_RX) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN4) | \ +#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \ PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN6) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN8) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN9) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN10) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D7) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D8) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D2) | \ PIN_PUPDR_FLOATING(GPIOA_OTG_FS_DM) | \ PIN_PUPDR_FLOATING(GPIOA_OTG_FS_DP) | \ PIN_PUPDR_PULLUP(GPIOA_SWDIO) | \ PIN_PUPDR_PULLDOWN(GPIOA_SWCLK) | \ PIN_PUPDR_PULLUP(GPIOA_PIN15)) -#define VAL_GPIOA_ODR (PIN_ODR_HIGH(GPIOA_PIN0) | \ - PIN_ODR_HIGH(GPIOA_PIN1) | \ - PIN_ODR_HIGH(GPIOA_USART_TX) | \ - PIN_ODR_HIGH(GPIOA_USART_RX) | \ - PIN_ODR_HIGH(GPIOA_PIN4) | \ +#define VAL_GPIOA_ODR (PIN_ODR_HIGH(GPIOA_ARD_A0) | \ + PIN_ODR_HIGH(GPIOA_ARD_A1) | \ + PIN_ODR_HIGH(GPIOA_ARD_D1) | \ + PIN_ODR_HIGH(GPIOA_ARD_D0) | \ + PIN_ODR_HIGH(GPIOA_ARD_A2) | \ PIN_ODR_LOW(GPIOA_LED_GREEN) | \ - PIN_ODR_HIGH(GPIOA_PIN6) | \ - PIN_ODR_HIGH(GPIOA_PIN7) | \ - PIN_ODR_HIGH(GPIOA_PIN8) | \ - PIN_ODR_HIGH(GPIOA_PIN9) | \ - PIN_ODR_HIGH(GPIOA_PIN10) | \ + PIN_ODR_HIGH(GPIOA_ARD_D12) | \ + PIN_ODR_HIGH(GPIOA_ARD_D11) | \ + PIN_ODR_HIGH(GPIOA_ARD_D7) | \ + PIN_ODR_HIGH(GPIOA_ARD_D8) | \ + PIN_ODR_HIGH(GPIOA_ARD_D2) | \ PIN_ODR_HIGH(GPIOA_OTG_FS_DM) | \ PIN_ODR_HIGH(GPIOA_OTG_FS_DP) | \ PIN_ODR_HIGH(GPIOA_SWDIO) | \ PIN_ODR_HIGH(GPIOA_SWCLK) | \ PIN_ODR_HIGH(GPIOA_PIN15)) -#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_PIN0, 0) | \ - PIN_AFIO_AF(GPIOA_PIN1, 0) | \ - PIN_AFIO_AF(GPIOA_USART_TX, 7) | \ - PIN_AFIO_AF(GPIOA_USART_RX, 7) | \ - PIN_AFIO_AF(GPIOA_PIN4, 0) | \ +#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_ARD_A0, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_A1, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D1, 7) | \ + PIN_AFIO_AF(GPIOA_ARD_D0, 7) | \ + PIN_AFIO_AF(GPIOA_ARD_A2, 0) | \ PIN_AFIO_AF(GPIOA_LED_GREEN, 0) | \ - PIN_AFIO_AF(GPIOA_PIN6, 0) | \ - PIN_AFIO_AF(GPIOA_PIN7, 0)) -#define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_PIN8, 0) | \ - PIN_AFIO_AF(GPIOA_PIN9, 0) | \ - PIN_AFIO_AF(GPIOA_PIN10, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D12, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D11, 0)) +#define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_ARD_D7, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D8, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D2, 0) | \ PIN_AFIO_AF(GPIOA_OTG_FS_DM, 10) | \ PIN_AFIO_AF(GPIOA_OTG_FS_DP, 10) | \ PIN_AFIO_AF(GPIOA_SWDIO, 0) | \ @@ -372,114 +402,114 @@ /* * GPIOB setup: * - * PB0 - PIN0 (input pullup). + * PB0 - ARD_A3 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). - * PB3 - SWO (alternate 0). - * PB4 - PIN4 (input pullup). - * PB5 - PIN5 (input pullup). - * PB6 - PIN6 (input pullup). + * PB3 - SWO ARD_D3 (alternate 0). + * PB4 - ARD_D5 (input pullup). + * PB5 - ARD_D4 (input pullup). + * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - PIN8 (input pullup). - * PB9 - PIN9 (input pullup). - * PB10 - PIN10 (input pullup). + * PB8 - ARD_D15 ARD_A5_ALT (input pullup). + * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). * PB13 - PIN13 (input pullup). * PB14 - PIN14 (input pullup). * PB15 - PIN15 (input pullup). */ -#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_PIN0) | \ +#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \ PIN_MODE_INPUT(GPIOB_PIN1) | \ PIN_MODE_INPUT(GPIOB_PIN2) | \ PIN_MODE_ALTERNATE(GPIOB_SWO) | \ - PIN_MODE_INPUT(GPIOB_PIN4) | \ - PIN_MODE_INPUT(GPIOB_PIN5) | \ - PIN_MODE_INPUT(GPIOB_PIN6) | \ + PIN_MODE_INPUT(GPIOB_ARD_D5) | \ + PIN_MODE_INPUT(GPIOB_ARD_D4) | \ + PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_PIN8) | \ - PIN_MODE_INPUT(GPIOB_PIN9) | \ - PIN_MODE_INPUT(GPIOB_PIN10) | \ + PIN_MODE_INPUT(GPIOB_ARD_D15) | \ + PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ PIN_MODE_INPUT(GPIOB_PIN13) | \ PIN_MODE_INPUT(GPIOB_PIN14) | \ PIN_MODE_INPUT(GPIOB_PIN15)) -#define VAL_GPIOB_OTYPER (PIN_OTYPE_PUSHPULL(GPIOB_PIN0) | \ +#define VAL_GPIOB_OTYPER (PIN_OTYPE_PUSHPULL(GPIOB_ARD_A3) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN1) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN2) | \ PIN_OTYPE_PUSHPULL(GPIOB_SWO) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN4) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN5) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN6) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D5) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D4) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D10) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN7) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN8) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN9) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN10) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D15) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D14) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D6) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN13) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN14) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN15)) -#define VAL_GPIOB_OSPEEDR (PIN_OSPEED_HIGH(GPIOB_PIN0) | \ +#define VAL_GPIOB_OSPEEDR (PIN_OSPEED_HIGH(GPIOB_ARD_A3) | \ PIN_OSPEED_HIGH(GPIOB_PIN1) | \ PIN_OSPEED_HIGH(GPIOB_PIN2) | \ PIN_OSPEED_HIGH(GPIOB_SWO) | \ - PIN_OSPEED_HIGH(GPIOB_PIN4) | \ - PIN_OSPEED_HIGH(GPIOB_PIN5) | \ - PIN_OSPEED_HIGH(GPIOB_PIN6) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D5) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D4) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D10) | \ PIN_OSPEED_HIGH(GPIOB_PIN7) | \ - PIN_OSPEED_HIGH(GPIOB_PIN8) | \ - PIN_OSPEED_HIGH(GPIOB_PIN9) | \ - PIN_OSPEED_HIGH(GPIOB_PIN10) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D15) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D14) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D6) | \ PIN_OSPEED_HIGH(GPIOB_PIN11) | \ PIN_OSPEED_HIGH(GPIOB_PIN12) | \ PIN_OSPEED_HIGH(GPIOB_PIN13) | \ PIN_OSPEED_HIGH(GPIOB_PIN14) | \ PIN_OSPEED_HIGH(GPIOB_PIN15)) -#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_PIN0) | \ +#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \ PIN_PUPDR_PULLUP(GPIOB_PIN1) | \ PIN_PUPDR_PULLUP(GPIOB_PIN2) | \ PIN_PUPDR_PULLUP(GPIOB_SWO) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN4) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN5) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN6) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D5) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN8) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN9) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN10) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ PIN_PUPDR_PULLUP(GPIOB_PIN13) | \ PIN_PUPDR_PULLUP(GPIOB_PIN14) | \ PIN_PUPDR_PULLUP(GPIOB_PIN15)) -#define VAL_GPIOB_ODR (PIN_ODR_HIGH(GPIOB_PIN0) | \ +#define VAL_GPIOB_ODR (PIN_ODR_HIGH(GPIOB_ARD_A3) | \ PIN_ODR_HIGH(GPIOB_PIN1) | \ PIN_ODR_HIGH(GPIOB_PIN2) | \ PIN_ODR_HIGH(GPIOB_SWO) | \ - PIN_ODR_HIGH(GPIOB_PIN4) | \ - PIN_ODR_HIGH(GPIOB_PIN5) | \ - PIN_ODR_HIGH(GPIOB_PIN6) | \ + PIN_ODR_HIGH(GPIOB_ARD_D5) | \ + PIN_ODR_HIGH(GPIOB_ARD_D4) | \ + PIN_ODR_HIGH(GPIOB_ARD_D10) | \ PIN_ODR_HIGH(GPIOB_PIN7) | \ - PIN_ODR_HIGH(GPIOB_PIN8) | \ - PIN_ODR_HIGH(GPIOB_PIN9) | \ - PIN_ODR_HIGH(GPIOB_PIN10) | \ + PIN_ODR_HIGH(GPIOB_ARD_D15) | \ + PIN_ODR_HIGH(GPIOB_ARD_D14) | \ + PIN_ODR_HIGH(GPIOB_ARD_D6) | \ PIN_ODR_HIGH(GPIOB_PIN11) | \ PIN_ODR_HIGH(GPIOB_PIN12) | \ PIN_ODR_HIGH(GPIOB_PIN13) | \ PIN_ODR_HIGH(GPIOB_PIN14) | \ PIN_ODR_HIGH(GPIOB_PIN15)) -#define VAL_GPIOB_AFRL (PIN_AFIO_AF(GPIOB_PIN0, 0) | \ +#define VAL_GPIOB_AFRL (PIN_AFIO_AF(GPIOB_ARD_A3, 0) | \ PIN_AFIO_AF(GPIOB_PIN1, 0) | \ PIN_AFIO_AF(GPIOB_PIN2, 0) | \ PIN_AFIO_AF(GPIOB_SWO, 0) | \ - PIN_AFIO_AF(GPIOB_PIN4, 0) | \ - PIN_AFIO_AF(GPIOB_PIN5, 0) | \ - PIN_AFIO_AF(GPIOB_PIN6, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D5, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_PIN8, 0) | \ - PIN_AFIO_AF(GPIOB_PIN9, 0) | \ - PIN_AFIO_AF(GPIOB_PIN10, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ PIN_AFIO_AF(GPIOB_PIN13, 0) | \ @@ -489,14 +519,14 @@ /* * GPIOC setup: * - * PC0 - PIN0 (input pullup). - * PC1 - PIN1 (input pullup). + * PC0 - ARD_A5 (analog). + * PC1 - ARD_A4 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). * PC5 - PIN5 (input pullup). * PC6 - PIN6 (input pullup). - * PC7 - PIN7 (input pullup). + * PC7 - ARD_D9 (input pullup). * PC8 - PIN8 (input pullup). * PC9 - PIN9 (input pullup). * PC10 - PIN10 (input pullup). @@ -506,14 +536,14 @@ * PC14 - PIN14 (input pullup). * PC15 - PIN15 (input pullup). */ -#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_PIN0) | \ - PIN_MODE_INPUT(GPIOC_PIN1) | \ +#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ + PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ PIN_MODE_INPUT(GPIOC_PIN2) | \ PIN_MODE_INPUT(GPIOC_PIN3) | \ PIN_MODE_INPUT(GPIOC_PIN4) | \ PIN_MODE_INPUT(GPIOC_PIN5) | \ PIN_MODE_INPUT(GPIOC_PIN6) | \ - PIN_MODE_INPUT(GPIOC_PIN7) | \ + PIN_MODE_INPUT(GPIOC_ARD_D9) | \ PIN_MODE_INPUT(GPIOC_PIN8) | \ PIN_MODE_INPUT(GPIOC_PIN9) | \ PIN_MODE_INPUT(GPIOC_PIN10) | \ @@ -522,14 +552,14 @@ PIN_MODE_INPUT(GPIOC_BUTTON) | \ PIN_MODE_INPUT(GPIOC_PIN14) | \ PIN_MODE_INPUT(GPIOC_PIN15)) -#define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_PIN0) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN1) | \ +#define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ + PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN3) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN5) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN6) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN7) | \ + PIN_OTYPE_PUSHPULL(GPIOC_ARD_D9) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN8) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN9) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN10) | \ @@ -538,14 +568,14 @@ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) -#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_PIN0) | \ - PIN_OSPEED_HIGH(GPIOC_PIN1) | \ +#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ + PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ PIN_OSPEED_HIGH(GPIOC_PIN3) | \ PIN_OSPEED_HIGH(GPIOC_PIN4) | \ PIN_OSPEED_HIGH(GPIOC_PIN5) | \ PIN_OSPEED_HIGH(GPIOC_PIN6) | \ - PIN_OSPEED_HIGH(GPIOC_PIN7) | \ + PIN_OSPEED_HIGH(GPIOC_ARD_D9) | \ PIN_OSPEED_HIGH(GPIOC_PIN8) | \ PIN_OSPEED_HIGH(GPIOC_PIN9) | \ PIN_OSPEED_HIGH(GPIOC_PIN10) | \ @@ -554,14 +584,14 @@ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ PIN_OSPEED_HIGH(GPIOC_PIN14) | \ PIN_OSPEED_HIGH(GPIOC_PIN15)) -#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_PIN0) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN1) | \ +#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ + PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ PIN_PUPDR_PULLUP(GPIOC_PIN3) | \ PIN_PUPDR_PULLUP(GPIOC_PIN4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN5) | \ PIN_PUPDR_PULLUP(GPIOC_PIN6) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN7) | \ + PIN_PUPDR_PULLUP(GPIOC_ARD_D9) | \ PIN_PUPDR_PULLUP(GPIOC_PIN8) | \ PIN_PUPDR_PULLUP(GPIOC_PIN9) | \ PIN_PUPDR_PULLUP(GPIOC_PIN10) | \ @@ -570,14 +600,14 @@ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ PIN_PUPDR_PULLUP(GPIOC_PIN15)) -#define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_PIN0) | \ - PIN_ODR_HIGH(GPIOC_PIN1) | \ +#define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ + PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ PIN_ODR_HIGH(GPIOC_PIN3) | \ PIN_ODR_HIGH(GPIOC_PIN4) | \ PIN_ODR_HIGH(GPIOC_PIN5) | \ PIN_ODR_HIGH(GPIOC_PIN6) | \ - PIN_ODR_HIGH(GPIOC_PIN7) | \ + PIN_ODR_HIGH(GPIOC_ARD_D9) | \ PIN_ODR_HIGH(GPIOC_PIN8) | \ PIN_ODR_HIGH(GPIOC_PIN9) | \ PIN_ODR_HIGH(GPIOC_PIN10) | \ @@ -586,14 +616,14 @@ PIN_ODR_HIGH(GPIOC_BUTTON) | \ PIN_ODR_HIGH(GPIOC_PIN14) | \ PIN_ODR_HIGH(GPIOC_PIN15)) -#define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_PIN0, 0) | \ - PIN_AFIO_AF(GPIOC_PIN1, 0) | \ +#define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ + PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ PIN_AFIO_AF(GPIOC_PIN3, 0) | \ PIN_AFIO_AF(GPIOC_PIN4, 0) | \ PIN_AFIO_AF(GPIOC_PIN5, 0) | \ PIN_AFIO_AF(GPIOC_PIN6, 0) | \ - PIN_AFIO_AF(GPIOC_PIN7, 0)) + PIN_AFIO_AF(GPIOC_ARD_D9, 0)) #define VAL_GPIOC_AFRH (PIN_AFIO_AF(GPIOC_PIN8, 0) | \ PIN_AFIO_AF(GPIOC_PIN9, 0) | \ PIN_AFIO_AF(GPIOC_PIN10, 0) | \ diff --git a/os/hal/boards/ST_NUCLEO64_F411RE/board.mk b/os/hal/boards/ST_NUCLEO64_F411RE/board.mk new file mode 100644 index 000000000..93d74ef43 --- /dev/null +++ b/os/hal/boards/ST_NUCLEO64_F411RE/board.mk @@ -0,0 +1,5 @@ +# List of all the board related files. +BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO64_F411RE/board.c + +# Required include directories +BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO64_F411RE diff --git a/os/hal/boards/ST_NUCLEO_F411RE/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F411RE/cfg/board.chcfg similarity index 92% rename from os/hal/boards/ST_NUCLEO_F411RE/cfg/board.chcfg rename to os/hal/boards/ST_NUCLEO64_F411RE/cfg/board.chcfg index 324cd27e3..f0f4085ca 100644 --- a/os/hal/boards/ST_NUCLEO_F411RE/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_F411RE/cfg/board.chcfg @@ -1,1193 +1,1193 @@ - - - - - resources/gencfg/processors/boards/stm32f4xx/templates - .. - 3.0.x - - STMicroelectronics NUCLEO-F411RE - ST_NUCLEO_F411RE - - STM32F411xE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + resources/gencfg/processors/boards/stm32f4xx/templates + .. + 3.0.x + + STMicroelectronics NUCLEO64-F411RE + ST_NUCLEO64_F411RE + + STM32F411xE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/os/hal/boards/ST_NUCLEO64_L053R8/board.c b/os/hal/boards/ST_NUCLEO64_L053R8/board.c new file mode 100644 index 000000000..4d546e3d6 --- /dev/null +++ b/os/hal/boards/ST_NUCLEO64_L053R8/board.c @@ -0,0 +1,124 @@ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#include "hal.h" + +#if HAL_USE_PAL || defined(__DOXYGEN__) +/** + * @brief PAL setup. + * @details Digital I/O ports static configuration as defined in @p board.h. + * This variable is used by the HAL when initializing the PAL driver. + */ +const PALConfig pal_default_config = { +#if STM32_HAS_GPIOA + {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR, + VAL_GPIOA_ODR, VAL_GPIOA_AFRL, VAL_GPIOA_AFRH}, +#endif +#if STM32_HAS_GPIOB + {VAL_GPIOB_MODER, VAL_GPIOB_OTYPER, VAL_GPIOB_OSPEEDR, VAL_GPIOB_PUPDR, + VAL_GPIOB_ODR, VAL_GPIOB_AFRL, VAL_GPIOB_AFRH}, +#endif +#if STM32_HAS_GPIOC + {VAL_GPIOC_MODER, VAL_GPIOC_OTYPER, VAL_GPIOC_OSPEEDR, VAL_GPIOC_PUPDR, + VAL_GPIOC_ODR, VAL_GPIOC_AFRL, VAL_GPIOC_AFRH}, +#endif +#if STM32_HAS_GPIOD + {VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR, + VAL_GPIOD_ODR, VAL_GPIOD_AFRL, VAL_GPIOD_AFRH}, +#endif +#if STM32_HAS_GPIOE + {VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR, + VAL_GPIOE_ODR, VAL_GPIOE_AFRL, VAL_GPIOE_AFRH}, +#endif +#if STM32_HAS_GPIOF + {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR, + VAL_GPIOF_ODR, VAL_GPIOF_AFRL, VAL_GPIOF_AFRH}, +#endif +#if STM32_HAS_GPIOG + {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR, + VAL_GPIOG_ODR, VAL_GPIOG_AFRL, VAL_GPIOG_AFRH}, +#endif +#if STM32_HAS_GPIOH + {VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR, + VAL_GPIOH_ODR, VAL_GPIOH_AFRL, VAL_GPIOH_AFRH}, +#endif +#if STM32_HAS_GPIOI + {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR, + VAL_GPIOI_ODR, VAL_GPIOI_AFRL, VAL_GPIOI_AFRH} +#endif +}; +#endif + +/** + * @brief Early initialization code. + * @details This initialization must be performed just after stack setup + * and before any other initialization. + */ +void __early_init(void) { + + stm32_clock_init(); +} + +#if HAL_USE_SDC || defined(__DOXYGEN__) +/** + * @brief SDC card detection. + */ +bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { + + (void)sdcp; + /* TODO: Fill the implementation.*/ + return true; +} + +/** + * @brief SDC card write protection detection. + */ +bool sdc_lld_is_write_protected(SDCDriver *sdcp) { + + (void)sdcp; + /* TODO: Fill the implementation.*/ + return false; +} +#endif /* HAL_USE_SDC */ + +#if HAL_USE_MMC_SPI || defined(__DOXYGEN__) +/** + * @brief MMC_SPI card detection. + */ +bool mmc_lld_is_card_inserted(MMCDriver *mmcp) { + + (void)mmcp; + /* TODO: Fill the implementation.*/ + return true; +} + +/** + * @brief MMC_SPI card write protection detection. + */ +bool mmc_lld_is_write_protected(MMCDriver *mmcp) { + + (void)mmcp; + /* TODO: Fill the implementation.*/ + return false; +} +#endif + +/** + * @brief Board-specific initialization code. + * @todo Add your board-specific code, if any. + */ +void boardInit(void) { +} diff --git a/os/hal/boards/ST_NUCLEO_L053R8/board.h b/os/hal/boards/ST_NUCLEO64_L053R8/board.h similarity index 72% rename from os/hal/boards/ST_NUCLEO_L053R8/board.h rename to os/hal/boards/ST_NUCLEO64_L053R8/board.h index d4277eb3a..a061aa739 100644 --- a/os/hal/boards/ST_NUCLEO_L053R8/board.h +++ b/os/hal/boards/ST_NUCLEO64_L053R8/board.h @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,14 +18,14 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO-L053R8 board. + * Setup for STMicroelectronics NUCLEO64-L053R8 board. */ /* * Board identifier. */ -#define BOARD_ST_NUCLEO_L053R8 -#define BOARD_NAME "STMicroelectronics NUCLEO-L053R8" +#define BOARD_ST_NUCLEO64_L053R8 +#define BOARD_NAME "STMicroelectronics NUCLEO64-L053R8" /* * Board oscillators-related settings. @@ -51,48 +51,54 @@ /* * IO pins assignments. */ -#define GPIOA_PIN0 0U -#define GPIOA_PIN1 1U +#define GPIOA_ARD_A0 0U +#define GPIOA_ARD_A1 1U +#define GPIOA_ARD_D1 2U #define GPIOA_USART_TX 2U +#define GPIOA_ARD_D0 3U #define GPIOA_USART_RX 3U -#define GPIOA_PIN4 4U +#define GPIOA_ARD_A2 4U #define GPIOA_LED_GREEN 5U -#define GPIOA_PIN6 6U -#define GPIOA_PIN7 7U -#define GPIOA_PIN8 8U -#define GPIOA_PIN9 9U -#define GPIOA_PIN10 10U +#define GPIOA_ARD_D13 5U +#define GPIOA_ARD_D12 6U +#define GPIOA_ARD_D11 7U +#define GPIOA_ARD_D7 8U +#define GPIOA_ARD_D8 9U +#define GPIOA_ARD_D2 10U #define GPIOA_PIN11 11U #define GPIOA_PIN12 12U #define GPIOA_SWDIO 13U #define GPIOA_SWCLK 14U #define GPIOA_PIN15 15U -#define GPIOB_PIN0 0U +#define GPIOB_ARD_A3 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U -#define GPIOB_PIN4 4U -#define GPIOB_PIN5 5U -#define GPIOB_PIN6 6U +#define GPIOB_ARD_D3 3U +#define GPIOB_ARD_D5 4U +#define GPIOB_ARD_D4 5U +#define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U -#define GPIOB_PIN8 8U -#define GPIOB_PIN9 9U -#define GPIOB_PIN10 10U +#define GPIOB_ARD_D15 8U +#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_ARD_D14 9U +#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U #define GPIOB_PIN13 13U #define GPIOB_PIN14 14U #define GPIOB_PIN15 15U -#define GPIOC_PIN0 0U -#define GPIOC_PIN1 1U +#define GPIOC_ARD_A5 0U +#define GPIOC_ARD_A4 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U #define GPIOC_PIN5 5U #define GPIOC_PIN6 6U -#define GPIOC_PIN7 7U +#define GPIOC_ARD_D9 7U #define GPIOC_PIN8 8U #define GPIOC_PIN9 9U #define GPIOC_PIN10 10U @@ -136,6 +142,47 @@ #define GPIOH_PIN14 14U #define GPIOH_PIN15 15U +/* + * IO lines assignments. + */ +#define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) +#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) +#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) +#define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) +#define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) +#define LINE_ARD_D11 PAL_LINE(GPIOA, 7U) +#define LINE_ARD_D7 PAL_LINE(GPIOA, 8U) +#define LINE_ARD_D8 PAL_LINE(GPIOA, 9U) +#define LINE_ARD_D2 PAL_LINE(GPIOA, 10U) +#define LINE_SWDIO PAL_LINE(GPIOA, 13U) +#define LINE_SWCLK PAL_LINE(GPIOA, 14U) + +#define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_SWO PAL_LINE(GPIOB, 3U) +#define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) +#define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) +#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) +#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) +#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) +#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) +#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) + +#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) +#define LINE_BUTTON PAL_LINE(GPIOC, 13U) + + +#define LINE_OSC_IN PAL_LINE(GPIOH, 0U) +#define LINE_OSC_OUT PAL_LINE(GPIOH, 1U) + /* * I/O ports initial setup, this configuration is established soon after reset * in the initialization code. @@ -149,10 +196,10 @@ #define PIN_ODR_HIGH(n) (1U << (n)) #define PIN_OTYPE_PUSHPULL(n) (0U << (n)) #define PIN_OTYPE_OPENDRAIN(n) (1U << (n)) -#define PIN_OSPEED_VERYLOW(n) (0U << ((n) * 2U)) +#define PIN_OSPEED_VERYLOW(n) (0U << ((n) * 2U)) #define PIN_OSPEED_LOW(n) (1U << ((n) * 2U)) -#define PIN_OSPEED_MEDIUM(n) (2U << ((n) * 2U)) -#define PIN_OSPEED_HIGH(n) (3U << ((n) * 2U)) +#define PIN_OSPEED_MEDIUM(n) (2U << ((n) * 2U)) +#define PIN_OSPEED_HIGH(n) (3U << ((n) * 2U)) #define PIN_PUPDR_FLOATING(n) (0U << ((n) * 2U)) #define PIN_PUPDR_PULLUP(n) (1U << ((n) * 2U)) #define PIN_PUPDR_PULLDOWN(n) (2U << ((n) * 2U)) @@ -161,114 +208,114 @@ /* * GPIOA setup: * - * PA0 - PIN0 (input pullup). - * PA1 - PIN1 (input pullup). - * PA2 - USART_TX (alternate 4). - * PA3 - USART_RX (alternate 4). - * PA4 - PIN4 (input pullup). - * PA5 - LED_GREEN (output pushpull maximum). - * PA6 - PIN6 (input pullup). - * PA7 - PIN7 (input pullup). - * PA8 - PIN8 (input pullup). - * PA9 - PIN9 (input pullup). - * PA10 - PIN10 (input pullup). + * PA0 - ARD_A0 (analog). + * PA1 - ARD_A1 (analog). + * PA2 - ARD_D1 USART_TX (alternate 4). + * PA3 - ARD_D0 USART_RX (alternate 4). + * PA4 - ARD_A2 (analog). + * PA5 - LED_GREEN ARD_D13 (output pushpull maximum). + * PA6 - ARD_D12 (input pullup). + * PA7 - ARD_D11 (input pullup). + * PA8 - ARD_D7 (input pullup). + * PA9 - ARD_D8 (input pullup). + * PA10 - ARD_D2 (input pullup). * PA11 - PIN11 (input pullup). * PA12 - PIN12 (input pullup). * PA13 - SWDIO (alternate 0). * PA14 - SWCLK (alternate 0). * PA15 - PIN15 (input pullup). */ -#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_PIN0) | \ - PIN_MODE_INPUT(GPIOA_PIN1) | \ - PIN_MODE_ALTERNATE(GPIOA_USART_TX) | \ - PIN_MODE_ALTERNATE(GPIOA_USART_RX) | \ - PIN_MODE_INPUT(GPIOA_PIN4) | \ +#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \ + PIN_MODE_ANALOG(GPIOA_ARD_A1) | \ + PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \ + PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \ + PIN_MODE_ANALOG(GPIOA_ARD_A2) | \ PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \ - PIN_MODE_INPUT(GPIOA_PIN6) | \ - PIN_MODE_INPUT(GPIOA_PIN7) | \ - PIN_MODE_INPUT(GPIOA_PIN8) | \ - PIN_MODE_INPUT(GPIOA_PIN9) | \ - PIN_MODE_INPUT(GPIOA_PIN10) | \ + PIN_MODE_INPUT(GPIOA_ARD_D12) | \ + PIN_MODE_INPUT(GPIOA_ARD_D11) | \ + PIN_MODE_INPUT(GPIOA_ARD_D7) | \ + PIN_MODE_INPUT(GPIOA_ARD_D8) | \ + PIN_MODE_INPUT(GPIOA_ARD_D2) | \ PIN_MODE_INPUT(GPIOA_PIN11) | \ PIN_MODE_INPUT(GPIOA_PIN12) | \ PIN_MODE_ALTERNATE(GPIOA_SWDIO) | \ PIN_MODE_ALTERNATE(GPIOA_SWCLK) | \ PIN_MODE_INPUT(GPIOA_PIN15)) -#define VAL_GPIOA_OTYPER (PIN_OTYPE_PUSHPULL(GPIOA_PIN0) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN1) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USART_TX) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USART_RX) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN4) | \ +#define VAL_GPIOA_OTYPER (PIN_OTYPE_PUSHPULL(GPIOA_ARD_A0) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_A1) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D1) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D0) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_A2) | \ PIN_OTYPE_PUSHPULL(GPIOA_LED_GREEN) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN6) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN7) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN8) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN9) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN10) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D12) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D11) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D7) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D8) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_D2) | \ PIN_OTYPE_PUSHPULL(GPIOA_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOA_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWDIO) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWCLK) | \ PIN_OTYPE_PUSHPULL(GPIOA_PIN15)) -#define VAL_GPIOA_OSPEEDR (PIN_OSPEED_HIGH(GPIOA_PIN0) | \ - PIN_OSPEED_HIGH(GPIOA_PIN1) | \ - PIN_OSPEED_MEDIUM(GPIOA_USART_TX) | \ - PIN_OSPEED_MEDIUM(GPIOA_USART_RX) | \ - PIN_OSPEED_HIGH(GPIOA_PIN4) | \ +#define VAL_GPIOA_OSPEEDR (PIN_OSPEED_HIGH(GPIOA_ARD_A0) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_A1) | \ + PIN_OSPEED_MEDIUM(GPIOA_ARD_D1) | \ + PIN_OSPEED_MEDIUM(GPIOA_ARD_D0) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_A2) | \ PIN_OSPEED_HIGH(GPIOA_LED_GREEN) | \ - PIN_OSPEED_HIGH(GPIOA_PIN6) | \ - PIN_OSPEED_HIGH(GPIOA_PIN7) | \ - PIN_OSPEED_HIGH(GPIOA_PIN8) | \ - PIN_OSPEED_HIGH(GPIOA_PIN9) | \ - PIN_OSPEED_HIGH(GPIOA_PIN10) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D12) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D11) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D7) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D8) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_D2) | \ PIN_OSPEED_HIGH(GPIOA_PIN11) | \ PIN_OSPEED_HIGH(GPIOA_PIN12) | \ PIN_OSPEED_HIGH(GPIOA_SWDIO) | \ PIN_OSPEED_HIGH(GPIOA_SWCLK) | \ PIN_OSPEED_HIGH(GPIOA_PIN15)) -#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_PIN0) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN1) | \ - PIN_PUPDR_FLOATING(GPIOA_USART_TX) | \ - PIN_PUPDR_FLOATING(GPIOA_USART_RX) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN4) | \ +#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \ PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN6) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN8) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN9) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN10) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D7) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D8) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_D2) | \ PIN_PUPDR_PULLUP(GPIOA_PIN11) | \ PIN_PUPDR_PULLUP(GPIOA_PIN12) | \ PIN_PUPDR_PULLUP(GPIOA_SWDIO) | \ PIN_PUPDR_PULLDOWN(GPIOA_SWCLK) | \ PIN_PUPDR_PULLUP(GPIOA_PIN15)) -#define VAL_GPIOA_ODR (PIN_ODR_HIGH(GPIOA_PIN0) | \ - PIN_ODR_HIGH(GPIOA_PIN1) | \ - PIN_ODR_HIGH(GPIOA_USART_TX) | \ - PIN_ODR_HIGH(GPIOA_USART_RX) | \ - PIN_ODR_HIGH(GPIOA_PIN4) | \ +#define VAL_GPIOA_ODR (PIN_ODR_HIGH(GPIOA_ARD_A0) | \ + PIN_ODR_HIGH(GPIOA_ARD_A1) | \ + PIN_ODR_HIGH(GPIOA_ARD_D1) | \ + PIN_ODR_HIGH(GPIOA_ARD_D0) | \ + PIN_ODR_HIGH(GPIOA_ARD_A2) | \ PIN_ODR_LOW(GPIOA_LED_GREEN) | \ - PIN_ODR_HIGH(GPIOA_PIN6) | \ - PIN_ODR_HIGH(GPIOA_PIN7) | \ - PIN_ODR_HIGH(GPIOA_PIN8) | \ - PIN_ODR_HIGH(GPIOA_PIN9) | \ - PIN_ODR_HIGH(GPIOA_PIN10) | \ + PIN_ODR_HIGH(GPIOA_ARD_D12) | \ + PIN_ODR_HIGH(GPIOA_ARD_D11) | \ + PIN_ODR_HIGH(GPIOA_ARD_D7) | \ + PIN_ODR_HIGH(GPIOA_ARD_D8) | \ + PIN_ODR_HIGH(GPIOA_ARD_D2) | \ PIN_ODR_HIGH(GPIOA_PIN11) | \ PIN_ODR_HIGH(GPIOA_PIN12) | \ PIN_ODR_HIGH(GPIOA_SWDIO) | \ PIN_ODR_HIGH(GPIOA_SWCLK) | \ PIN_ODR_HIGH(GPIOA_PIN15)) -#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_PIN0, 0) | \ - PIN_AFIO_AF(GPIOA_PIN1, 0) | \ - PIN_AFIO_AF(GPIOA_USART_TX, 4) | \ - PIN_AFIO_AF(GPIOA_USART_RX, 4) | \ - PIN_AFIO_AF(GPIOA_PIN4, 0) | \ +#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_ARD_A0, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_A1, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D1, 4) | \ + PIN_AFIO_AF(GPIOA_ARD_D0, 4) | \ + PIN_AFIO_AF(GPIOA_ARD_A2, 0) | \ PIN_AFIO_AF(GPIOA_LED_GREEN, 0) | \ - PIN_AFIO_AF(GPIOA_PIN6, 0) | \ - PIN_AFIO_AF(GPIOA_PIN7, 0)) -#define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_PIN8, 0) | \ - PIN_AFIO_AF(GPIOA_PIN9, 0) | \ - PIN_AFIO_AF(GPIOA_PIN10, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D12, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D11, 0)) +#define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_ARD_D7, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D8, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_D2, 0) | \ PIN_AFIO_AF(GPIOA_PIN11, 0) | \ PIN_AFIO_AF(GPIOA_PIN12, 0) | \ PIN_AFIO_AF(GPIOA_SWDIO, 0) | \ @@ -278,114 +325,114 @@ /* * GPIOB setup: * - * PB0 - PIN0 (input pullup). + * PB0 - ARD_A3 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). - * PB3 - SWO (alternate 0). - * PB4 - PIN4 (input pullup). - * PB5 - PIN5 (input pullup). - * PB6 - PIN6 (input pullup). + * PB3 - SWO ARD_D3 (alternate 0). + * PB4 - ARD_D5 (input pullup). + * PB5 - ARD_D4 (input pullup). + * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - PIN8 (input pullup). - * PB9 - PIN9 (input pullup). - * PB10 - PIN10 (input pullup). + * PB8 - ARD_D15 ARD_A5_ALT (input pullup). + * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). * PB13 - PIN13 (input pullup). * PB14 - PIN14 (input pullup). * PB15 - PIN15 (input pullup). */ -#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_PIN0) | \ +#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \ PIN_MODE_INPUT(GPIOB_PIN1) | \ PIN_MODE_INPUT(GPIOB_PIN2) | \ PIN_MODE_ALTERNATE(GPIOB_SWO) | \ - PIN_MODE_INPUT(GPIOB_PIN4) | \ - PIN_MODE_INPUT(GPIOB_PIN5) | \ - PIN_MODE_INPUT(GPIOB_PIN6) | \ + PIN_MODE_INPUT(GPIOB_ARD_D5) | \ + PIN_MODE_INPUT(GPIOB_ARD_D4) | \ + PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_PIN8) | \ - PIN_MODE_INPUT(GPIOB_PIN9) | \ - PIN_MODE_INPUT(GPIOB_PIN10) | \ + PIN_MODE_INPUT(GPIOB_ARD_D15) | \ + PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ PIN_MODE_INPUT(GPIOB_PIN13) | \ PIN_MODE_INPUT(GPIOB_PIN14) | \ PIN_MODE_INPUT(GPIOB_PIN15)) -#define VAL_GPIOB_OTYPER (PIN_OTYPE_PUSHPULL(GPIOB_PIN0) | \ +#define VAL_GPIOB_OTYPER (PIN_OTYPE_PUSHPULL(GPIOB_ARD_A3) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN1) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN2) | \ PIN_OTYPE_PUSHPULL(GPIOB_SWO) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN4) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN5) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN6) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D5) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D4) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D10) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN7) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN8) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN9) | \ - PIN_OTYPE_PUSHPULL(GPIOB_PIN10) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D15) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D14) | \ + PIN_OTYPE_PUSHPULL(GPIOB_ARD_D6) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN13) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN14) | \ PIN_OTYPE_PUSHPULL(GPIOB_PIN15)) -#define VAL_GPIOB_OSPEEDR (PIN_OSPEED_HIGH(GPIOB_PIN0) | \ +#define VAL_GPIOB_OSPEEDR (PIN_OSPEED_HIGH(GPIOB_ARD_A3) | \ PIN_OSPEED_HIGH(GPIOB_PIN1) | \ PIN_OSPEED_HIGH(GPIOB_PIN2) | \ PIN_OSPEED_HIGH(GPIOB_SWO) | \ - PIN_OSPEED_HIGH(GPIOB_PIN4) | \ - PIN_OSPEED_HIGH(GPIOB_PIN5) | \ - PIN_OSPEED_HIGH(GPIOB_PIN6) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D5) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D4) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D10) | \ PIN_OSPEED_HIGH(GPIOB_PIN7) | \ - PIN_OSPEED_HIGH(GPIOB_PIN8) | \ - PIN_OSPEED_HIGH(GPIOB_PIN9) | \ - PIN_OSPEED_HIGH(GPIOB_PIN10) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D15) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D14) | \ + PIN_OSPEED_HIGH(GPIOB_ARD_D6) | \ PIN_OSPEED_HIGH(GPIOB_PIN11) | \ PIN_OSPEED_HIGH(GPIOB_PIN12) | \ PIN_OSPEED_HIGH(GPIOB_PIN13) | \ PIN_OSPEED_HIGH(GPIOB_PIN14) | \ PIN_OSPEED_HIGH(GPIOB_PIN15)) -#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_PIN0) | \ +#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \ PIN_PUPDR_PULLUP(GPIOB_PIN1) | \ PIN_PUPDR_PULLUP(GPIOB_PIN2) | \ PIN_PUPDR_PULLUP(GPIOB_SWO) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN4) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN5) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN6) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D5) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN8) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN9) | \ - PIN_PUPDR_PULLUP(GPIOB_PIN10) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ PIN_PUPDR_PULLUP(GPIOB_PIN13) | \ PIN_PUPDR_PULLUP(GPIOB_PIN14) | \ PIN_PUPDR_PULLUP(GPIOB_PIN15)) -#define VAL_GPIOB_ODR (PIN_ODR_HIGH(GPIOB_PIN0) | \ +#define VAL_GPIOB_ODR (PIN_ODR_HIGH(GPIOB_ARD_A3) | \ PIN_ODR_HIGH(GPIOB_PIN1) | \ PIN_ODR_HIGH(GPIOB_PIN2) | \ PIN_ODR_HIGH(GPIOB_SWO) | \ - PIN_ODR_HIGH(GPIOB_PIN4) | \ - PIN_ODR_HIGH(GPIOB_PIN5) | \ - PIN_ODR_HIGH(GPIOB_PIN6) | \ + PIN_ODR_HIGH(GPIOB_ARD_D5) | \ + PIN_ODR_HIGH(GPIOB_ARD_D4) | \ + PIN_ODR_HIGH(GPIOB_ARD_D10) | \ PIN_ODR_HIGH(GPIOB_PIN7) | \ - PIN_ODR_HIGH(GPIOB_PIN8) | \ - PIN_ODR_HIGH(GPIOB_PIN9) | \ - PIN_ODR_HIGH(GPIOB_PIN10) | \ + PIN_ODR_HIGH(GPIOB_ARD_D15) | \ + PIN_ODR_HIGH(GPIOB_ARD_D14) | \ + PIN_ODR_HIGH(GPIOB_ARD_D6) | \ PIN_ODR_HIGH(GPIOB_PIN11) | \ PIN_ODR_HIGH(GPIOB_PIN12) | \ PIN_ODR_HIGH(GPIOB_PIN13) | \ PIN_ODR_HIGH(GPIOB_PIN14) | \ PIN_ODR_HIGH(GPIOB_PIN15)) -#define VAL_GPIOB_AFRL (PIN_AFIO_AF(GPIOB_PIN0, 0) | \ +#define VAL_GPIOB_AFRL (PIN_AFIO_AF(GPIOB_ARD_A3, 0) | \ PIN_AFIO_AF(GPIOB_PIN1, 0) | \ PIN_AFIO_AF(GPIOB_PIN2, 0) | \ PIN_AFIO_AF(GPIOB_SWO, 0) | \ - PIN_AFIO_AF(GPIOB_PIN4, 0) | \ - PIN_AFIO_AF(GPIOB_PIN5, 0) | \ - PIN_AFIO_AF(GPIOB_PIN6, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D5, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_PIN8, 0) | \ - PIN_AFIO_AF(GPIOB_PIN9, 0) | \ - PIN_AFIO_AF(GPIOB_PIN10, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ PIN_AFIO_AF(GPIOB_PIN13, 0) | \ @@ -395,14 +442,14 @@ /* * GPIOC setup: * - * PC0 - PIN0 (input pullup). - * PC1 - PIN1 (input pullup). + * PC0 - ARD_A5 (analog). + * PC1 - ARD_A4 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). * PC5 - PIN5 (input pullup). * PC6 - PIN6 (input pullup). - * PC7 - PIN7 (input pullup). + * PC7 - ARD_D9 (input pullup). * PC8 - PIN8 (input pullup). * PC9 - PIN9 (input pullup). * PC10 - PIN10 (input pullup). @@ -412,14 +459,14 @@ * PC14 - PIN14 (input pullup). * PC15 - PIN15 (input pullup). */ -#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_PIN0) | \ - PIN_MODE_INPUT(GPIOC_PIN1) | \ +#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ + PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ PIN_MODE_INPUT(GPIOC_PIN2) | \ PIN_MODE_INPUT(GPIOC_PIN3) | \ PIN_MODE_INPUT(GPIOC_PIN4) | \ PIN_MODE_INPUT(GPIOC_PIN5) | \ PIN_MODE_INPUT(GPIOC_PIN6) | \ - PIN_MODE_INPUT(GPIOC_PIN7) | \ + PIN_MODE_INPUT(GPIOC_ARD_D9) | \ PIN_MODE_INPUT(GPIOC_PIN8) | \ PIN_MODE_INPUT(GPIOC_PIN9) | \ PIN_MODE_INPUT(GPIOC_PIN10) | \ @@ -428,14 +475,14 @@ PIN_MODE_INPUT(GPIOC_BUTTON) | \ PIN_MODE_INPUT(GPIOC_PIN14) | \ PIN_MODE_INPUT(GPIOC_PIN15)) -#define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_PIN0) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN1) | \ +#define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ + PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN3) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN5) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN6) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN7) | \ + PIN_OTYPE_PUSHPULL(GPIOC_ARD_D9) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN8) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN9) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN10) | \ @@ -444,14 +491,14 @@ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) -#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_PIN0) | \ - PIN_OSPEED_HIGH(GPIOC_PIN1) | \ +#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ + PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ PIN_OSPEED_HIGH(GPIOC_PIN3) | \ PIN_OSPEED_HIGH(GPIOC_PIN4) | \ PIN_OSPEED_HIGH(GPIOC_PIN5) | \ PIN_OSPEED_HIGH(GPIOC_PIN6) | \ - PIN_OSPEED_HIGH(GPIOC_PIN7) | \ + PIN_OSPEED_HIGH(GPIOC_ARD_D9) | \ PIN_OSPEED_HIGH(GPIOC_PIN8) | \ PIN_OSPEED_HIGH(GPIOC_PIN9) | \ PIN_OSPEED_HIGH(GPIOC_PIN10) | \ @@ -460,14 +507,14 @@ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ PIN_OSPEED_HIGH(GPIOC_PIN14) | \ PIN_OSPEED_HIGH(GPIOC_PIN15)) -#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_PIN0) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN1) | \ +#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ + PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ PIN_PUPDR_PULLUP(GPIOC_PIN3) | \ PIN_PUPDR_PULLUP(GPIOC_PIN4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN5) | \ PIN_PUPDR_PULLUP(GPIOC_PIN6) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN7) | \ + PIN_PUPDR_PULLUP(GPIOC_ARD_D9) | \ PIN_PUPDR_PULLUP(GPIOC_PIN8) | \ PIN_PUPDR_PULLUP(GPIOC_PIN9) | \ PIN_PUPDR_PULLUP(GPIOC_PIN10) | \ @@ -476,14 +523,14 @@ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ PIN_PUPDR_PULLUP(GPIOC_PIN15)) -#define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_PIN0) | \ - PIN_ODR_HIGH(GPIOC_PIN1) | \ +#define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ + PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ PIN_ODR_HIGH(GPIOC_PIN3) | \ PIN_ODR_HIGH(GPIOC_PIN4) | \ PIN_ODR_HIGH(GPIOC_PIN5) | \ PIN_ODR_HIGH(GPIOC_PIN6) | \ - PIN_ODR_HIGH(GPIOC_PIN7) | \ + PIN_ODR_HIGH(GPIOC_ARD_D9) | \ PIN_ODR_HIGH(GPIOC_PIN8) | \ PIN_ODR_HIGH(GPIOC_PIN9) | \ PIN_ODR_HIGH(GPIOC_PIN10) | \ @@ -492,14 +539,14 @@ PIN_ODR_HIGH(GPIOC_BUTTON) | \ PIN_ODR_HIGH(GPIOC_PIN14) | \ PIN_ODR_HIGH(GPIOC_PIN15)) -#define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_PIN0, 0) | \ - PIN_AFIO_AF(GPIOC_PIN1, 0) | \ +#define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ + PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ PIN_AFIO_AF(GPIOC_PIN3, 0) | \ PIN_AFIO_AF(GPIOC_PIN4, 0) | \ PIN_AFIO_AF(GPIOC_PIN5, 0) | \ PIN_AFIO_AF(GPIOC_PIN6, 0) | \ - PIN_AFIO_AF(GPIOC_PIN7, 0)) + PIN_AFIO_AF(GPIOC_ARD_D9, 0)) #define VAL_GPIOC_AFRH (PIN_AFIO_AF(GPIOC_PIN8, 0) | \ PIN_AFIO_AF(GPIOC_PIN9, 0) | \ PIN_AFIO_AF(GPIOC_PIN10, 0) | \ diff --git a/os/hal/boards/ST_NUCLEO64_L053R8/board.mk b/os/hal/boards/ST_NUCLEO64_L053R8/board.mk new file mode 100644 index 000000000..96197fbcc --- /dev/null +++ b/os/hal/boards/ST_NUCLEO64_L053R8/board.mk @@ -0,0 +1,5 @@ +# List of all the board related files. +BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO64_L053R8/board.c + +# Required include directories +BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO64_L053R8 diff --git a/os/hal/boards/ST_NUCLEO_L053R8/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_L053R8/cfg/board.chcfg similarity index 93% rename from os/hal/boards/ST_NUCLEO_L053R8/cfg/board.chcfg rename to os/hal/boards/ST_NUCLEO64_L053R8/cfg/board.chcfg index e5ad052a5..6dcf1e469 100644 --- a/os/hal/boards/ST_NUCLEO_L053R8/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_L053R8/cfg/board.chcfg @@ -8,8 +8,8 @@ .. 3.0.x - STMicroelectronics NUCLEO-L053R8 - ST_NUCLEO_L053R8 + STMicroelectronics NUCLEO64-L053R8 + ST_NUCLEO64_L053R8 STM32L053xx .. 3.0.x - STMicroelectronics NUCLEO-L152RE - ST_NUCLEO_L152RE + STMicroelectronics NUCLEO64-L152RE + ST_NUCLEO64_L152RE STM32L152xE - - - - resources/gencfg/processors/boards/stm32l4xx/templates - .. - 3.0.x - - STMicroelectronics NUCLEO-L476RG - ST_NUCLEO_L476RG - - STM32L476xx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + resources/gencfg/processors/boards/stm32l4xx/templates + .. + 3.0.x + + STMicroelectronics NUCLEO64-L476RG + ST_NUCLEO64_L476RG + + STM32L476xx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/os/hal/boards/ST_NUCLEO_F030R8/board.mk b/os/hal/boards/ST_NUCLEO_F030R8/board.mk deleted file mode 100644 index 496a8ffb9..000000000 --- a/os/hal/boards/ST_NUCLEO_F030R8/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F030R8/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F030R8 diff --git a/os/hal/boards/ST_NUCLEO_F072RB/board.mk b/os/hal/boards/ST_NUCLEO_F072RB/board.mk deleted file mode 100644 index 453ad7608..000000000 --- a/os/hal/boards/ST_NUCLEO_F072RB/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F072RB/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F072RB diff --git a/os/hal/boards/ST_NUCLEO_F091RC/board.mk b/os/hal/boards/ST_NUCLEO_F091RC/board.mk deleted file mode 100644 index d272871dd..000000000 --- a/os/hal/boards/ST_NUCLEO_F091RC/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F091RC/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F091RC diff --git a/os/hal/boards/ST_NUCLEO_F103RB/board.h b/os/hal/boards/ST_NUCLEO_F103RB/board.h deleted file mode 100644 index 61c580222..000000000 --- a/os/hal/boards/ST_NUCLEO_F103RB/board.h +++ /dev/null @@ -1,202 +0,0 @@ -/* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#ifndef _BOARD_H_ -#define _BOARD_H_ - -/* - * Setup for the ST INEMO-M1 Discovery board. - */ - -/* - * Board identifier. - */ -#define BOARD_ST_NUCLEO_F103RB -#define BOARD_NAME "STMicroelectronics NUCLEO-F103RB" - -/* - * Board frequencies. - */ -#define STM32_LSECLK 0 - -#if defined(NUCLEO_EXTERNAL_OSCILLATOR) -#define STM32_HSECLK 8000000 -#define STM32_HSE_BYPASS - -#elif defined(NUCLEO_HSE_CRYSTAL) -#define STM32_HSECLK 8000000 - -#else -#define STM32_HSECLK 0 -#endif - -/* - * MCU type, supported types are defined in ./os/hal/platforms/hal_lld.h. - */ -#define STM32F103xB - -/* - * IO pins assignments. - */ -#define GPIOA_PA0 0 -#define GPIOA_PA1 1 -#define GPIOA_USART_TX 2 -#define GPIOA_USART_RX 3 -#define GPIOA_PA4 4 -#define GPIOA_LED_GREEN 5 -#define GPIOA_PA6 6 -#define GPIOA_PA7 7 -#define GPIOA_PA8 8 -#define GPIOA_PA9 9 -#define GPIOA_PA10 10 -#define GPIOA_PA11 11 -#define GPIOA_PA12 12 -#define GPIOA_SWDIO 13 -#define GPIOA_SWCLK 14 -#define GPIOA_PA15 15 - -#define GPIOB_PB0 0 -#define GPIOB_PB1 1 -#define GPIOB_PB2 2 -#define GPIOB_SWO 3 -#define GPIOB_PB4 4 -#define GPIOB_PB5 5 -#define GPIOB_PB6 6 -#define GPIOB_PB7 7 -#define GPIOB_PB8 8 -#define GPIOB_PB9 9 -#define GPIOB_PB10 10 -#define GPIOB_PB11 11 -#define GPIOB_PB12 12 -#define GPIOB_PB13 13 -#define GPIOB_PB14 14 -#define GPIOB_PB15 15 - -#define GPIOC_PC0 0 -#define GPIOC_PC1 1 -#define GPIOC_PC2 2 -#define GPIOC_PC3 3 -#define GPIOC_PC4 4 -#define GPIOC_PC5 5 -#define GPIOC_PC6 6 -#define GPIOC_PC7 7 -#define GPIOC_PC8 8 -#define GPIOC_PC9 9 -#define GPIOC_PC10 10 -#define GPIOC_PC11 11 -#define GPIOC_PC12 12 -#define GPIOC_BUTTON 13 -#define GPIOC_PC14 14 -#define GPIOC_PC15 15 - -#define GPIOD_OSC_IN 0 -#define GPIOD_OSC_OUT 1 -#define GPIOD_PD2 2 - -/* - * I/O ports initial setup, this configuration is established soon after reset - * in the initialization code. - * - * The digits have the following meaning: - * 0 - Analog input. - * 1 - Push Pull output 10MHz. - * 2 - Push Pull output 2MHz. - * 3 - Push Pull output 50MHz. - * 4 - Digital input. - * 5 - Open Drain output 10MHz. - * 6 - Open Drain output 2MHz. - * 7 - Open Drain output 50MHz. - * 8 - Digital input with PullUp or PullDown resistor depending on ODR. - * 9 - Alternate Push Pull output 10MHz. - * A - Alternate Push Pull output 2MHz. - * B - Alternate Push Pull output 50MHz. - * C - Reserved. - * D - Alternate Open Drain output 10MHz. - * E - Alternate Open Drain output 2MHz. - * F - Alternate Open Drain output 50MHz. - * Please refer to the STM32 Reference Manual for details. - */ - -/* - * Port A setup. - * Everything input with pull-up except: - * PA2 - Alternate output (GPIOA_USART_TX). - * PA3 - Normal input (GPIOA_USART_RX). - * PA5 - Push Pull output (GPIOA_LED_GREEN). - * PA13 - Pull-up input (GPIOA_SWDIO). - * PA14 - Pull-down input (GPIOA_SWCLK). - */ -#define VAL_GPIOACRL 0x88384B88 /* PA7...PA0 */ -#define VAL_GPIOACRH 0x88888888 /* PA15...PA8 */ -#define VAL_GPIOAODR 0xFFFFBFDF - -/* - * Port B setup. - * Everything input with pull-up except: - * PB3 - Pull-up input (GPIOA_SWO). - */ -#define VAL_GPIOBCRL 0x88888888 /* PB7...PB0 */ -#define VAL_GPIOBCRH 0x88888888 /* PB15...PB8 */ -#define VAL_GPIOBODR 0xFFFFFFFF - -/* - * Port C setup. - * Everything input with pull-up except: - * PC13 - Normal input (GPIOC_BUTTON). - */ -#define VAL_GPIOCCRL 0x88888888 /* PC7...PC0 */ -#define VAL_GPIOCCRH 0x88488888 /* PC15...PC8 */ -#define VAL_GPIOCODR 0xFFFFFFFF - -/* - * Port D setup. - * Everything input with pull-up except: - * PD0 - Normal input (GPIOD_OSC_IN). - * PD1 - Normal input (GPIOD_OSC_OUT). - */ -#define VAL_GPIODCRL 0x88888844 /* PD7...PD0 */ -#define VAL_GPIODCRH 0x88888888 /* PD15...PD8 */ -#define VAL_GPIODODR 0xFFFFFFFF - -/* - * Port E setup. - * Everything input with pull-up except: - */ -#define VAL_GPIOECRL 0x88888888 /* PE7...PE0 */ -#define VAL_GPIOECRH 0x88888888 /* PE15...PE8 */ -#define VAL_GPIOEODR 0xFFFFFFFF - -/* - * USB bus activation macro, required by the USB driver. - */ -#define usb_lld_connect_bus(usbp) - -/* - * USB bus de-activation macro, required by the USB driver. - */ -#define usb_lld_disconnect_bus(usbp) - -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ - -#endif /* _BOARD_H_ */ diff --git a/os/hal/boards/ST_NUCLEO_F103RB/board.mk b/os/hal/boards/ST_NUCLEO_F103RB/board.mk deleted file mode 100644 index d14f895c6..000000000 --- a/os/hal/boards/ST_NUCLEO_F103RB/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F103RB/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F103RB diff --git a/os/hal/boards/ST_NUCLEO_F302R8/board.mk b/os/hal/boards/ST_NUCLEO_F302R8/board.mk deleted file mode 100644 index 542ea3794..000000000 --- a/os/hal/boards/ST_NUCLEO_F302R8/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F302R8/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F302R8 diff --git a/os/hal/boards/ST_NUCLEO_F334R8/board.mk b/os/hal/boards/ST_NUCLEO_F334R8/board.mk deleted file mode 100644 index 299072cae..000000000 --- a/os/hal/boards/ST_NUCLEO_F334R8/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F334R8/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F334R8 diff --git a/os/hal/boards/ST_NUCLEO_F401RE/board.mk b/os/hal/boards/ST_NUCLEO_F401RE/board.mk deleted file mode 100644 index 4d27799af..000000000 --- a/os/hal/boards/ST_NUCLEO_F401RE/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F401RE/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F401RE diff --git a/os/hal/boards/ST_NUCLEO_F411RE/board.mk b/os/hal/boards/ST_NUCLEO_F411RE/board.mk deleted file mode 100644 index 92221f690..000000000 --- a/os/hal/boards/ST_NUCLEO_F411RE/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F411RE/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_F411RE diff --git a/os/hal/boards/ST_NUCLEO_L053R8/board.c b/os/hal/boards/ST_NUCLEO_L053R8/board.c deleted file mode 100644 index f56bd1a03..000000000 --- a/os/hal/boards/ST_NUCLEO_L053R8/board.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#include "hal.h" - -#if HAL_USE_PAL || defined(__DOXYGEN__) -/** - * @brief PAL setup. - * @details Digital I/O ports static configuration as defined in @p board.h. - * This variable is used by the HAL when initializing the PAL driver. - */ -const PALConfig pal_default_config = { -#if STM32_HAS_GPIOA - {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR, - VAL_GPIOA_ODR, VAL_GPIOA_AFRL, VAL_GPIOA_AFRH}, -#endif -#if STM32_HAS_GPIOB - {VAL_GPIOB_MODER, VAL_GPIOB_OTYPER, VAL_GPIOB_OSPEEDR, VAL_GPIOB_PUPDR, - VAL_GPIOB_ODR, VAL_GPIOB_AFRL, VAL_GPIOB_AFRH}, -#endif -#if STM32_HAS_GPIOC - {VAL_GPIOC_MODER, VAL_GPIOC_OTYPER, VAL_GPIOC_OSPEEDR, VAL_GPIOC_PUPDR, - VAL_GPIOC_ODR, VAL_GPIOC_AFRL, VAL_GPIOC_AFRH}, -#endif -#if STM32_HAS_GPIOD - {VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR, - VAL_GPIOD_ODR, VAL_GPIOD_AFRL, VAL_GPIOD_AFRH}, -#endif -#if STM32_HAS_GPIOE - {VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR, - VAL_GPIOE_ODR, VAL_GPIOE_AFRL, VAL_GPIOE_AFRH}, -#endif -#if STM32_HAS_GPIOF - {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR, - VAL_GPIOF_ODR, VAL_GPIOF_AFRL, VAL_GPIOF_AFRH}, -#endif -#if STM32_HAS_GPIOG - {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR, - VAL_GPIOG_ODR, VAL_GPIOG_AFRL, VAL_GPIOG_AFRH}, -#endif -#if STM32_HAS_GPIOH - {VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR, - VAL_GPIOH_ODR, VAL_GPIOH_AFRL, VAL_GPIOH_AFRH}, -#endif -#if STM32_HAS_GPIOI - {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR, - VAL_GPIOI_ODR, VAL_GPIOI_AFRL, VAL_GPIOI_AFRH} -#endif -}; -#endif - -/** - * @brief Early initialization code. - * @details This initialization must be performed just after stack setup - * and before any other initialization. - */ -void __early_init(void) { - - stm32_clock_init(); -} - -#if HAL_USE_SDC || defined(__DOXYGEN__) -/** - * @brief SDC card detection. - */ -bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { - - (void)sdcp; - /* TODO: Fill the implementation.*/ - return true; -} - -/** - * @brief SDC card write protection detection. - */ -bool sdc_lld_is_write_protected(SDCDriver *sdcp) { - - (void)sdcp; - /* TODO: Fill the implementation.*/ - return false; -} -#endif /* HAL_USE_SDC */ - -#if HAL_USE_MMC_SPI || defined(__DOXYGEN__) -/** - * @brief MMC_SPI card detection. - */ -bool mmc_lld_is_card_inserted(MMCDriver *mmcp) { - - (void)mmcp; - /* TODO: Fill the implementation.*/ - return true; -} - -/** - * @brief MMC_SPI card write protection detection. - */ -bool mmc_lld_is_write_protected(MMCDriver *mmcp) { - - (void)mmcp; - /* TODO: Fill the implementation.*/ - return false; -} -#endif - -/** - * @brief Board-specific initialization code. - * @todo Add your board-specific code, if any. - */ -void boardInit(void) { -} diff --git a/os/hal/boards/ST_NUCLEO_L053R8/board.mk b/os/hal/boards/ST_NUCLEO_L053R8/board.mk deleted file mode 100644 index 6cb56c1de..000000000 --- a/os/hal/boards/ST_NUCLEO_L053R8/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_L053R8/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_L053R8 diff --git a/os/hal/boards/ST_NUCLEO_L152RE/board.c b/os/hal/boards/ST_NUCLEO_L152RE/board.c deleted file mode 100644 index f56bd1a03..000000000 --- a/os/hal/boards/ST_NUCLEO_L152RE/board.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#include "hal.h" - -#if HAL_USE_PAL || defined(__DOXYGEN__) -/** - * @brief PAL setup. - * @details Digital I/O ports static configuration as defined in @p board.h. - * This variable is used by the HAL when initializing the PAL driver. - */ -const PALConfig pal_default_config = { -#if STM32_HAS_GPIOA - {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR, - VAL_GPIOA_ODR, VAL_GPIOA_AFRL, VAL_GPIOA_AFRH}, -#endif -#if STM32_HAS_GPIOB - {VAL_GPIOB_MODER, VAL_GPIOB_OTYPER, VAL_GPIOB_OSPEEDR, VAL_GPIOB_PUPDR, - VAL_GPIOB_ODR, VAL_GPIOB_AFRL, VAL_GPIOB_AFRH}, -#endif -#if STM32_HAS_GPIOC - {VAL_GPIOC_MODER, VAL_GPIOC_OTYPER, VAL_GPIOC_OSPEEDR, VAL_GPIOC_PUPDR, - VAL_GPIOC_ODR, VAL_GPIOC_AFRL, VAL_GPIOC_AFRH}, -#endif -#if STM32_HAS_GPIOD - {VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR, - VAL_GPIOD_ODR, VAL_GPIOD_AFRL, VAL_GPIOD_AFRH}, -#endif -#if STM32_HAS_GPIOE - {VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR, - VAL_GPIOE_ODR, VAL_GPIOE_AFRL, VAL_GPIOE_AFRH}, -#endif -#if STM32_HAS_GPIOF - {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR, - VAL_GPIOF_ODR, VAL_GPIOF_AFRL, VAL_GPIOF_AFRH}, -#endif -#if STM32_HAS_GPIOG - {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR, - VAL_GPIOG_ODR, VAL_GPIOG_AFRL, VAL_GPIOG_AFRH}, -#endif -#if STM32_HAS_GPIOH - {VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR, - VAL_GPIOH_ODR, VAL_GPIOH_AFRL, VAL_GPIOH_AFRH}, -#endif -#if STM32_HAS_GPIOI - {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR, - VAL_GPIOI_ODR, VAL_GPIOI_AFRL, VAL_GPIOI_AFRH} -#endif -}; -#endif - -/** - * @brief Early initialization code. - * @details This initialization must be performed just after stack setup - * and before any other initialization. - */ -void __early_init(void) { - - stm32_clock_init(); -} - -#if HAL_USE_SDC || defined(__DOXYGEN__) -/** - * @brief SDC card detection. - */ -bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { - - (void)sdcp; - /* TODO: Fill the implementation.*/ - return true; -} - -/** - * @brief SDC card write protection detection. - */ -bool sdc_lld_is_write_protected(SDCDriver *sdcp) { - - (void)sdcp; - /* TODO: Fill the implementation.*/ - return false; -} -#endif /* HAL_USE_SDC */ - -#if HAL_USE_MMC_SPI || defined(__DOXYGEN__) -/** - * @brief MMC_SPI card detection. - */ -bool mmc_lld_is_card_inserted(MMCDriver *mmcp) { - - (void)mmcp; - /* TODO: Fill the implementation.*/ - return true; -} - -/** - * @brief MMC_SPI card write protection detection. - */ -bool mmc_lld_is_write_protected(MMCDriver *mmcp) { - - (void)mmcp; - /* TODO: Fill the implementation.*/ - return false; -} -#endif - -/** - * @brief Board-specific initialization code. - * @todo Add your board-specific code, if any. - */ -void boardInit(void) { -} diff --git a/os/hal/boards/ST_NUCLEO_L152RE/board.mk b/os/hal/boards/ST_NUCLEO_L152RE/board.mk deleted file mode 100644 index 124a7d13f..000000000 --- a/os/hal/boards/ST_NUCLEO_L152RE/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_L152RE/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_L152RE diff --git a/os/hal/boards/ST_NUCLEO_L476RG/board.mk b/os/hal/boards/ST_NUCLEO_L476RG/board.mk deleted file mode 100644 index da74f41d4..000000000 --- a/os/hal/boards/ST_NUCLEO_L476RG/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_L476RG/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/os/hal/boards/ST_NUCLEO_L476RG diff --git a/testhal/STM32/STM32L0xx/ADC/Makefile b/testhal/STM32/STM32L0xx/ADC/Makefile index 883a18607..ebf800e37 100644 --- a/testhal/STM32/STM32L0xx/ADC/Makefile +++ b/testhal/STM32/STM32L0xx/ADC/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L0xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L053R8/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L053R8/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/testhal/STM32/STM32L0xx/EXT/Makefile b/testhal/STM32/STM32L0xx/EXT/Makefile index 883a18607..ebf800e37 100644 --- a/testhal/STM32/STM32L0xx/EXT/Makefile +++ b/testhal/STM32/STM32L0xx/EXT/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L0xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L053R8/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L053R8/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/testhal/STM32/STM32L0xx/SPI/Makefile b/testhal/STM32/STM32L0xx/SPI/Makefile index 883a18607..ebf800e37 100644 --- a/testhal/STM32/STM32L0xx/SPI/Makefile +++ b/testhal/STM32/STM32L0xx/SPI/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L0xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L053R8/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L053R8/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/testhal/STM32/STM32L4xx/ADC/Makefile b/testhal/STM32/STM32L4xx/ADC/Makefile index 3e80a85fe..d5404b67c 100644 --- a/testhal/STM32/STM32L4xx/ADC/Makefile +++ b/testhal/STM32/STM32L4xx/ADC/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L476RG/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L476RG/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/testhal/STM32/STM32L4xx/CAN/Makefile b/testhal/STM32/STM32L4xx/CAN/Makefile index 3e80a85fe..d5404b67c 100644 --- a/testhal/STM32/STM32L4xx/CAN/Makefile +++ b/testhal/STM32/STM32L4xx/CAN/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L476RG/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L476RG/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/testhal/STM32/STM32L4xx/EXT/Makefile b/testhal/STM32/STM32L4xx/EXT/Makefile index 3e80a85fe..d5404b67c 100644 --- a/testhal/STM32/STM32L4xx/EXT/Makefile +++ b/testhal/STM32/STM32L4xx/EXT/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L476RG/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L476RG/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/Makefile b/testhal/STM32/STM32L4xx/GPT-ADC/Makefile index 3e80a85fe..d5404b67c 100644 --- a/testhal/STM32/STM32L4xx/GPT-ADC/Makefile +++ b/testhal/STM32/STM32L4xx/GPT-ADC/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L476RG/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L476RG/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk diff --git a/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile b/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile index 6adf81ec7..89d38cfa3 100644 --- a/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32L4xx/IRQ_STORM/Makefile @@ -92,7 +92,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l4xx.m # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/platform.mk -include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_L476RG/board.mk +include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_L476RG/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk