feat!: update DmaStm to support new dma peripherals in G0, G4 and WB devices

.gitignore

@@ -1,3 +1,4 @@
+.cache
 .vs/
 .vscode/.cortex-debug*
 build/

.vscode/launch.json

@@ -1,5 +1,5 @@
 {
     // Use IntelliSense to learn about possible attributes.
     // Hover to view descriptions of existing attributes.
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
@@ -47,6 +47,26 @@
             "type": "cortex-debug",
             "servertype": "jlink",
             "device": "STM32G070RB"
+        },
+        {
+            "name": "stm32wb55rg",
+            "cwd": "${workspaceFolder}",
+            "executable": "${command:cmake.launchTargetPath}",
+            "request": "launch",
+            "type": "cortex-debug",
+            "device": "STM32WB55RG",
+            "servertype": "external",
+            "runToEntryPoint": "main",
+            "showDevDebugOutput": "both",
+            "gdbTarget": "host.docker.internal:61234",
+            "overrideLaunchCommands": [
+                "monitor reset",
+                "-target-download",
+                "monitor reset"
+            ],
+            "overrideRestartCommands": [
+                "monitor reset"
+            ]
         }
     ]
 }

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+  "cmake.copyCompileCommands": "${workspaceFolder}/build/compile_commands.json",
+  "sonarlint.pathToCompileCommands": "${workspaceFolder}/build/compile_commands.json",
+  "clangd.arguments": ["--query-driver=/**/arm-none-eabi-*"],
+  "C_Cpp.autoAddFileAssociations": false
+}

CMakeLists.txt

@@ -19,7 +19,7 @@ if (HALST_STANDALONE)
     FetchContent_Declare(
         emil
         GIT_REPOSITORY https://github.com/philips-software/amp-embedded-infra-lib.git
-        GIT_TAG        419f636bd76f2c0ee2f7524ca548e724bf479e27 # unreleased
+        GIT_TAG        16dde0b5e8a10acae790e00e1cbb75e891f5925f # unreleased
     )
 
     FetchContent_MakeAvailable(emil)

CMakePresets.json

@@ -7,7 +7,8 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "installDir": "${sourceDir}/install",
       "cacheVariables": {
-        "HALST_BUILD_EXAMPLES": true
+        "HALST_BUILD_EXAMPLES": true,
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "On"
       }
     },
     {
@@ -134,6 +135,18 @@
         "HALST_BUILD_EXAMPLES_FREERTOS": true,
         "FREERTOS_CONFIG_FILE_DIRECTORY": "${sourceDir}/examples/freertos/config"
       }
+    },
+    {
+      "name": "stm32g474",
+      "displayName": "stm32g474",
+      "description": "Build for stm32g474",
+      "inherits": "stm32",
+      "toolchainFile": "${sourceDir}/build/${presetName}/_deps/emil-src/cmake/toolchain-arm-gcc-m4-fpv4-sp-d16.cmake",
+      "cacheVariables": {
+        "TARGET_CORTEX": "m4",
+        "TARGET_MCU_FAMILY": "stm32g4xx",
+        "TARGET_MCU": "stm32g474"
+      }
     }
   ],
   "buildPresets": [

examples/CMakeLists.txt

@@ -1,2 +1,3 @@
 add_subdirectory(blink)
 add_subdirectory(freertos)
+add_subdirectory(helloworld)

examples/blink/CMakeLists.txt

@@ -1,5 +1,10 @@
 add_executable(hal_st.blink_nucleo144 Main.cpp)
-emil_build_for(hal_st.blink_nucleo144 TARGET_MCU_VENDOR st PREREQUISITE_BOOL HALST_BUILD_EXAMPLES)
+emil_build_for(hal_st.blink_nucleo144
+    TARGET_MCU stm32f429
+    TARGET_MCU stm32f746
+    TARGET_MCU stm32f767
+    PREREQUISITE_BOOL HALST_BUILD_EXAMPLES
+)
 
 target_compile_definitions(hal_st.blink_nucleo144 PUBLIC
     NUCLEO=Nucleo144Ui
@@ -18,10 +23,16 @@ emil_generate_artifacts(TARGET hal_st.blink_nucleo144 LST MAP BIN HEX)
 ######################################################################
 
 add_executable(hal_st.blink_nucleo64 Main.cpp)
-emil_build_for(hal_st.blink_nucleo64 TARGET_MCU_VENDOR st PREREQUISITE_BOOL HALST_BUILD_EXAMPLES)
+emil_build_for(hal_st.blink_nucleo64
+    TARGET_MCU stm32g431
+    TARGET_MCU stm32g474
+    TARGET_MCU stm32wb55
+    PREREQUISITE_BOOL HALST_BUILD_EXAMPLES
+)
 
 target_compile_definitions(hal_st.blink_nucleo64 PUBLIC
-    NUCLEO=Nucleo64Ui
+    $<$<NOT:$<STREQUAL:${TARGET_MCU},stm32wb55>>:NUCLEO=Nucleo64Ui>
+    $<$<STREQUAL:${TARGET_MCU},stm32wb55>:NUCLEO=Nucleo64WBUi>
 )
 
 target_link_libraries(hal_st.blink_nucleo64 PRIVATE

examples/helloworld/CMakeLists.txt

@@ -0,0 +1,21 @@
+add_executable(hal_st.helloworld_nucleo64 Main.cpp)
+emil_build_for(hal_st.helloworld_nucleo64
+    TARGET_MCU stm32g474
+    TARGET_MCU stm32wb55
+    PREREQUISITE_BOOL HALST_BUILD_EXAMPLES
+)
+
+target_compile_definitions(hal_st.helloworld_nucleo64 PUBLIC
+    $<$<NOT:$<STREQUAL:${TARGET_MCU},stm32wb55>>:NUCLEO=Nucleo64Ui>
+    $<$<STREQUAL:${TARGET_MCU},stm32wb55>:NUCLEO=Nucleo64WBUi>
+)
+
+target_link_libraries(hal_st.helloworld_nucleo64 PRIVATE
+    services.util
+    hal_st.instantiations
+)
+
+halst_target_default_linker_scripts(hal_st.helloworld_nucleo64)
+halst_target_default_init(hal_st.helloworld_nucleo64)
+
+emil_generate_artifacts(TARGET hal_st.helloworld_nucleo64 LST MAP BIN HEX)

examples/helloworld/Main.cpp

@@ -0,0 +1,51 @@
+#include "hal/interfaces/Gpio.hpp"
+#include "hal_st/instantiations/NucleoUi.hpp"
+#include "hal_st/instantiations/StmEventInfrastructure.hpp"
+#include "infra/timer/Timer.hpp"
+#include "services/tracer/GlobalTracer.hpp"
+#include "services/tracer/StreamWriterOnSerialCommunication.hpp"
+#include "services/tracer/Tracer.hpp"
+#include "services/tracer/TracerWithDateTime.hpp"
+#include "services/util/DebugLed.hpp"
+#include <array>
+#include <chrono>
+
+unsigned int hse_value = 24'000'000;
+
+int main()
+{
+    HAL_Init();
+
+    static main_::StmEventInfrastructure eventInfrastructure;
+    static main_::NUCLEO ui;
+    static services::DebugLed debugLed(ui.ledGreen);
+    static hal::DmaStm dmaStm;
+
+#if defined(STM32G0) || defined(STM32G4)
+    static hal::GpioPinStm stLinkUartTxPin{ hal::Port::A, 2 };
+    static hal::GpioPinStm stLinkUartRxPin{ hal::Port::A, 3 };
+    static hal::DmaStm::TransmitStream transmitStream{ dmaStm, hal::DmaChannelId{ 1, 1, DMA_REQUEST_USART2_TX } };
+    static hal::UartStmDma stLinkUartDma{ transmitStream, 2, stLinkUartTxPin, stLinkUartRxPin };
+#endif
+
+#if defined(STM32WB)
+    static hal::GpioPinStm stLinkUartTxPin{ hal::Port::B, 6 };
+    static hal::GpioPinStm stLinkUartRxPin{ hal::Port::B, 7 };
+    static hal::DmaStm::TransmitStream transmitStream{ dmaStm, hal::DmaChannelId{ 1, 1, DMA_REQUEST_USART1_TX } };
+    static hal::UartStmDma stLinkUartDma{ transmitStream, 1, stLinkUartTxPin, stLinkUartRxPin };
+#endif
+
+    static services::StreamWriterOnSerialCommunication::WithStorage<64> streamWriterOnSerialCommunication{ stLinkUartDma };
+    static infra::TextOutputStream::WithErrorPolicy textOutputStream{ streamWriterOnSerialCommunication };
+    static services::TracerWithDateTime tracerWithDateTime{ textOutputStream };
+
+    services::SetGlobalTracerInstance(tracerWithDateTime);
+
+    static infra::TimerRepeating timerRepeating{ std::chrono::seconds{ 1 }, []
+        {
+            services::GlobalTracer().Trace() << "Hello World !";
+        } };
+
+    eventInfrastructure.Run();
+    __builtin_unreachable();
+}

hal_st/instantiations/NucleoUi.hpp

@@ -1,7 +1,9 @@
 #ifndef HAL_ST_NUCLEO_UI_HPP
 #define HAL_ST_NUCLEO_UI_HPP
 
+#include "hal_st/stm32fxxx/DmaStm.hpp"
 #include "hal_st/stm32fxxx/GpioStm.hpp"
+#include "hal_st/stm32fxxx/UartStmDma.hpp"
 
 namespace main_
 {

hal_st/stm32fxxx/AnalogToDigitalPinStm.cpp

@@ -39,23 +39,20 @@ namespace hal
     {
         ADC_ChannelConfTypeDef channelConfig;
         channelConfig.Channel = adcChannel[analogPin.AdcChannel(adc.index + 1)];
-#if !defined(STM32WB)
-        channelConfig.Rank = 1;
-#else
+#if defined(STM32WB) || defined(STM32G0) || defined(STM32G4)
         channelConfig.Rank = ADC_REGULAR_RANK_1;
+#else
+        channelConfig.Rank = 1;
 #endif
 #if defined(STM32F0) || defined(STM32F3)
         channelConfig.SamplingTime = ADC_SAMPLETIME_7CYCLES_5;
-#elif defined(STM32WB)
+#elif defined(STM32WB) || defined(STM32G4)
         channelConfig.SamplingTime = ADC_SAMPLETIME_2CYCLES_5;
         channelConfig.Offset = 0;
         channelConfig.OffsetNumber = ADC_OFFSET_NONE;
         channelConfig.SingleDiff = ADC_SINGLE_ENDED;
 #elif defined(STM32G0)
         channelConfig.SamplingTime = ADC_SAMPLETIME_3CYCLES_5;
-#elif defined(STM32G4)
-        channelConfig.SamplingTime = ADC_SAMPLETIME_3CYCLES_5;
-        channelConfig.Offset = 0;
 #else
         channelConfig.SamplingTime = ADC_SAMPLETIME_3CYCLES;
         channelConfig.Offset = 0;
@@ -100,7 +97,7 @@ namespace hal
 #if !defined(STM32F3)
         handle.Init.DMAContinuousRequests = DISABLE;
 #endif
-#if defined(STM32WB)
+#if defined(STM32WB) || defined(STM32G0) || defined(STM32G4)
         handle.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
 #elif !defined(STM32F3)
         handle.Init.EOCSelection = DISABLE;

hal_st/stm32fxxx/CMakeLists.txt

@@ -33,6 +33,8 @@ target_sources(hal_st.stm32fxxx PRIVATE
     $<$<STREQUAL:${TARGET_MCU},stm32g070>:DefaultClockNucleoG070RB.hpp>
     $<$<STREQUAL:${TARGET_MCU},stm32g431>:DefaultClockNucleoG431RB.cpp>
     $<$<STREQUAL:${TARGET_MCU},stm32g431>:DefaultClockNucleoG431RB.hpp>
+    $<$<STREQUAL:${TARGET_MCU},stm32g474>:DefaultClockNucleoG474RE.cpp>
+    $<$<STREQUAL:${TARGET_MCU},stm32g474>:DefaultClockNucleoG474RE.hpp>
     $<$<STREQUAL:${TARGET_MCU},stm32wb55>:DefaultClockNucleoWB55RG.cpp>
     $<$<STREQUAL:${TARGET_MCU},stm32wb55>:DefaultClockNucleoWB55RG.hpp>
     DigitalToAnalogPinStm.cpp
@@ -111,6 +113,9 @@ if (TARGET_MCU_VENDOR STREQUAL st)
     elseif (TARGET_MCU STREQUAL stm32g431)
         set(gpio_xml "${CMAKE_CURRENT_SOURCE_DIR}/ip/GPIO-STM32G43x_gpio_v1_0_Modes.xml")
         set(mcu_xml "${CMAKE_CURRENT_SOURCE_DIR}/mcu/STM32G431R(6-8-B)Tx.xml")
+    elseif (TARGET_MCU STREQUAL stm32g474)
+        set(gpio_xml "${CMAKE_CURRENT_SOURCE_DIR}/ip/GPIO-STM32G47x_gpio_v1_0_Modes.xml")
+        set(mcu_xml "${CMAKE_CURRENT_SOURCE_DIR}/mcu/STM32G474R(B-C-E)Tx.xml")
     elseif (TARGET_MCU_VARIANT STREQUAL stm32wb55rg)
         set(gpio_xml "${CMAKE_CURRENT_SOURCE_DIR}/ip/GPIO-STM32WB55x_gpio_v1_0_Modes.xml")
         set(mcu_xml "${CMAKE_CURRENT_SOURCE_DIR}/mcu/STM32WB55RGVx.xml")

hal_st/stm32fxxx/DefaultClockNucleoG474RE.cpp

@@ -0,0 +1,47 @@
+#include DEVICE_HEADER
+#include "hal_st/stm32fxxx/DefaultClockNucleoG474RE.hpp"
+
+/* The system Clock is configured as follows:
+ *    System Clock source            = PLL (HSE)
+ *    SYSCLK(Hz)                     = 170,000,000
+ *    HCLK(Hz)                       = 170,000,000
+ *    AHB Prescaler                  = 1
+ *    APB1 Prescaler                 = 1
+ *    APB2 Prescaler                 = 1
+ *    HSI Frequency(Hz)              = 24MHz
+ *    VDD(V)                         = 3.3
+ *    Main regulator output voltage  = Scale1 mode
+ */
+void ConfigureDefaultClockNucleo474RE()
+{
+    RCC_OscInitTypeDef RCC_OscInitStruct = { 0 };
+    RCC_ClkInitTypeDef RCC_ClkInitStruct = { 0 };
+
+    /** Configure the main internal regulator output voltage
+     */
+    HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1_BOOST);
+
+    /** Initializes the RCC Oscillators according to the specified parameters
+     * in the RCC_OscInitTypeDef structure.
+     */
+    RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+    RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+    RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+    RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+    RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV6;
+    RCC_OscInitStruct.PLL.PLLN = 85;
+    RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
+    RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV2;
+    RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2;
+    HAL_RCC_OscConfig(&RCC_OscInitStruct);
+
+    /** Initializes the CPU, AHB and APB buses clocks
+     */
+    RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+    RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+    RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+    RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+    RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+
+    HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_4);
+}

hal_st/stm32fxxx/DefaultClockNucleoG474RE.hpp

@@ -0,0 +1,6 @@
+#ifndef HAL_ST_DEFAULT_CLOCK_HPP
+#define HAL_ST_DEFAULT_CLOCK_HPP
+
+void ConfigureDefaultClockNucleo474RE();
+
+#endif