chore(system): define USE_HAL_DRIVER on command line

fpistm · fpistm · commit 73f7d292c21a · 2024-05-28T11:31:07.000+02:00
this ensure to have the same behavior each time stm32yyxx.h
is included.

Signed-off-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/CI/update/templates/system_stm32yyxx.c b/CI/update/templates/system_stm32yyxx.c
@@ -1,5 +1,3 @@
-#define USE_HAL_DRIVER
-
 {% for system in system_list %}
   {% if loop.first %}
 #ifdef {{system.serie}}
diff --git a/cmake/set_base_arduino_config.cmake b/cmake/set_base_arduino_config.cmake
@@ -22,6 +22,7 @@ target_link_libraries(base_config INTERFACE
 	gcc
 )
 target_compile_definitions(base_config INTERFACE
+	USE_HAL_DRIVER
 	USE_FULL_LL_DRIVER
 	ARDUINO_ARCH_STM32
 )
diff --git a/cores/arduino/stm32/stm32_def.h b/cores/arduino/stm32/stm32_def.h
@@ -20,8 +20,6 @@
                                         |(STM32_CORE_VERSION_PATCH << 8U )\
                                         |(STM32_CORE_VERSION_EXTRA))
 
-#define USE_HAL_DRIVER
-
 #if defined(STM32C0xx)
   #include "stm32c0xx.h"
 #elif defined(STM32F0xx)
diff --git a/libraries/SrcWrapper/src/stm32/system_stm32yyxx.c b/libraries/SrcWrapper/src/stm32/system_stm32yyxx.c
@@ -1,5 +1,3 @@
-#define USE_HAL_DRIVER
-
 #ifdef STM32C0xx
   #include "system_stm32c0xx.c"
 #elif STM32F0xx
diff --git a/platform.txt b/platform.txt
@@ -58,7 +58,7 @@ compiler.objcopy.cmd=arm-none-eabi-objcopy
 compiler.elf2hex.cmd=arm-none-eabi-objcopy
 compiler.libraries.ldflags=
 
-compiler.extra_flags=-mcpu={build.mcu} {build.fpu} {build.float-abi} -DVECT_TAB_OFFSET={build.flash_offset} -DUSE_FULL_LL_DRIVER -mthumb "@{build.opt.path}"
+compiler.extra_flags=-mcpu={build.mcu} {build.fpu} {build.float-abi} -DVECT_TAB_OFFSET={build.flash_offset} -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -mthumb "@{build.opt.path}"
 
 compiler.S.flags={compiler.extra_flags} -c -x assembler-with-cpp {compiler.stm.extra_include}
 
diff --git a/tools/platformio/platformio-build.py b/tools/platformio/platformio-build.py
@@ -243,6 +243,7 @@ def get_arduino_board_id(board_config, mcu):
         "ARDUINO_%s" % board_id,
         ("BOARD_NAME", '\\"%s\\"' % board_id),
         "HAL_UART_MODULE_ENABLED",
+        "USE_HAL_DRIVER",
         "USE_FULL_LL_DRIVER",
         (
             "VARIANT_H",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#define USE_HAL_DRIVER`
`2`		`-`
`3`	`1`	`{% for system in system_list %}`
`4`	`2`	`{% if loop.first %}`
`5`	`3`	`#ifdef {{system.serie}}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ target_link_libraries(base_config INTERFACE`
`22`	`22`	`gcc`
`23`	`23`	`)`
`24`	`24`	`target_compile_definitions(base_config INTERFACE`
	`25`	`+ USE_HAL_DRIVER`
`25`	`26`	`USE_FULL_LL_DRIVER`
`26`	`27`	`ARDUINO_ARCH_STM32`
`27`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#define USE_HAL_DRIVER`
`2`		`-`
`3`	`1`	`#ifdef STM32C0xx`
`4`	`2`	`#include "system_stm32c0xx.c"`
`5`	`3`	`#elif STM32F0xx`
Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ def get_arduino_board_id(board_config, mcu):`
`243`	`243`	`"ARDUINO_%s" % board_id,`
`244`	`244`	`("BOARD_NAME", '\\"%s\\"' % board_id),`
`245`	`245`	`"HAL_UART_MODULE_ENABLED",`
	`246`	`+ "USE_HAL_DRIVER",`
`246`	`247`	`"USE_FULL_LL_DRIVER",`
`247`	`248`	`(`
`248`	`249`	`"VARIANT_H",`