Merge pull request #2987 from fpistm/c5_support

STMC5xx support based on HALv2

Author: fpistm

.github/workflows/Cmake.yml

@@ -32,6 +32,7 @@ jobs:
       matrix:
         boardname:
           - NUCLEO_C092RC
+          - NUCLEO_C562RE
           - NUCLEO_F091RC
           - NUCLEO_F103RB
           - NUCLEO_F207ZG

CI/build/examples/BareMinimum/BareMinimum.ino

@@ -3,8 +3,9 @@
  * It allows to test build of built-in libraries
  * and can not be executed.
  */
-
+#if defined(HAL_FLASH_MODULE_ENABLED)
 #include <EEPROM.h>
+#endif
 #ifndef STM32MP1xx
 #include <IWatchdog.h>
 #endif
@@ -14,7 +15,7 @@
 #include <SPI.h>
 #include <SoftwareSerial.h>
 #include <Wire.h>
-#if defined(I3C1_BASE) || defined(I3C2_BASE)
+#if (defined(I3C1_BASE) || defined(I3C2_BASE)) && defined(HAL_I3C_MODULE_ENABLED)
   #include <I3C.h>
 #endif
 
@@ -91,10 +92,11 @@ void setup() {
   }
   swSerial.end();
 
+#if defined(HAL_FLASH_MODULE_ENABLED)
   // EEPROM
   byte value = EEPROM.read(0x01);
   EEPROM.write(EEPROM.length() - 1, value);
-
+#endif
 #ifndef STM32MP1xx
   // IWDG
   if (!IWatchdog.isReset(true)) {
@@ -135,7 +137,7 @@ void setup() {
   Wire.requestFrom(2, 1);
   Wire.end();
 
-#if defined(I3C1_BASE) || defined(I3C2_BASE)
+#if (defined(I3C1_BASE) || defined(I3C2_BASE)) && defined(HAL_I3C_MODULE_ENABLED)
   // I3C
   I3C.setBusType(I3CBusType::Pure);
   I3C.setMixedBusOpenDrainFrequency(1000000U);

CI/update/stm32_series.json

@@ -24,5 +24,8 @@
     "WB": "xx",
     "WL3": "x",
     "WL": "xx"
+  },
+  "seriesv2": {
+    "C5": "xx"
   }
-}
+}

CI/update/stm32cube.py

@@ -24,6 +24,7 @@
     getRepoBranchName,
     commitFiles,
     loadSTM32Series,
+    addSeriesToConfig,
 )
 
 if sys.platform.startswith("win32"):
@@ -138,7 +139,7 @@ def checkConfig():
     else:
         defaultConfig(config_file_path, {"REPO_LOCAL_PATH": str(repo_local_path)})
     createFolder(repo_local_path)
-    stm32_dict = loadSTM32Series(script_path)
+    stm32_dict = loadSTM32Series(script_path, True, False)
 
 
 def updateStm32Def(series):
@@ -903,17 +904,6 @@ def updateOpenAmp():
     copyFolder(OpenAmp_cube_path, OpenAmp_core_path)
 
 
-def addSeriesToConfig(series, nx):
-    stm32_series_file = stm32_series_json_path / "stm32_series.json"
-    with open(stm32_series_file, "r") as fp:
-        stm32_series_data = json.load(fp)
-    if series not in stm32_series_data:
-        stm32_series_data["series"][series] = nx
-        with open(stm32_series_file, "w") as fp:
-            json.dump(stm32_series_data, fp, indent=2)
-        print(f"Added series {series} with nx={nx} to stm32_series.json")
-
-
 def updateCore():
     global nx
     for series in stm32_list:
@@ -1046,7 +1036,7 @@ def updateCore():
                 print("No stm32_def file were updated!")
                 sys.exit(1)
             # Add the new series to the json config file
-            addSeriesToConfig(series, nx)
+            addSeriesToConfig(stm32_series_json_path, series, nx, "series")
             if not commitFiles(core_path, series_commit_msg):
                 print("No stm32_series.json file were updated!")