Merge branch 'main' into cmake_dev

Author: massonal

Diff for: .github/workflows/arduino-lint.yml

@@ -17,3 +17,5 @@ jobs:
 
       - name: Arduino Lint
         uses: arduino/arduino-lint-action@v1
+        with:
+          version: 1.2.0

Diff for: CI/build/conf/cores_config.json

@@ -0,0 +1,58 @@
+import argparse
+from pathlib import Path
+
+
+script_path = Path(__file__).parent.resolve()
+# Base path
+core_path = script_path.parent.parent
+variant_path = core_path / "variants"
+boards_entry_filename = "boards_entry.txt"
+output_filemane = script_path / "generic_boards_to_skip.json"
+
+# Parser
+parser = argparse.ArgumentParser(
+    description="Generate list of generic boards to skip for ci core config"
+)
+
+parser.add_argument("-f", "--family", metavar="pattern", help="Family name to generate")
+
+args = parser.parse_args()
+
+
+def main():
+    if args.family:
+        filtered_family = args.family.upper()
+    # Get mcu_family directories
+    mcu_families = sorted(variant_path.glob("STM32*/"))
+    boards_list = []
+    # Parse boards from all
+    for mcu_family in mcu_families:
+        if args.family and filtered_family not in str(mcu_family):
+            continue
+        # Search all directory with ldscript.ld
+        variants_list = sorted(mcu_family.glob("**/ldscript.ld"))
+        for variant in variants_list:
+            # Opend boards_entry.txt and extract build.board
+            with open(variant.parent / "boards_entry.txt") as myfile:
+                for line in myfile:
+                    if "build.board" in line:
+                        boards_list.append(line.partition("=")[-1].strip())
+            # Remove last board of the boards_entry to not skip it
+            boards_list.pop()
+    # Create file
+    try:
+        output_file = open(output_filemane, "w", newline="\n")
+        for count, board in enumerate(sorted(boards_list), start=1):
+            if count % 4 == 0:
+                output_file.write(f'"{board}",\n')
+            else:
+                output_file.write(f'"{board}", ')
+        output_file.close()
+    except IOError:
+        print(f"Failed to open {output_filemane}")
+        exit(1)
+    exit(0)
+
+
+if __name__ == "__main__":
+    main()

Diff for: CI/build/conf/cores_config_ci.json

@@ -5,4 +5,5 @@ hart
 hsi
 noe
 nwe
+ore
 

Diff for: CI/build/generic_boards_to_skip.py

@@ -2033,13 +2033,16 @@ def aggregate_dir():
             variant_exp = []
             # Compare the first directory to all other directories
             while mcu_dirs and index < len(mcu_dirs):
-                # Compare all the variant file except the generic_boards.txt
+                # Compare all the variant files except the generic_boards.txt
                 mcu_dir2_files_list = [
                     mcu_dirs[index] / periph_c_filename,
                     mcu_dirs[index] / pinvar_h_filename,
                     mcu_dirs[index] / variant_cpp_filename,
                     mcu_dirs[index] / variant_h_filename,
                 ]
+                # Iterate over each variant files
+                periph_xml_tmp = []
+                variant_exp_tmp = []
                 for index2, fname in enumerate(mcu_dir1_files_list):
                     with open(fname, "r") as f1:
                         with open(mcu_dir2_files_list[index2], "r") as f2:
@@ -2048,20 +2051,30 @@ def aggregate_dir():
                             if not diff or len(diff) == 2:
                                 if index2 == 0:
                                     for line in diff:
-                                        periph_xml += periperalpins_regex.findall(line)
+                                        periph_xml_tmp += periperalpins_regex.findall(
+                                            line
+                                        )
                                 elif index2 == 2:
                                     for line in diff:
-                                        variant_exp += variant_regex.findall(line)
+                                        variant_exp_tmp += variant_regex.findall(line)
                                 continue
                             else:
                                 # Not the same directory compare with the next one
                                 index += 1
                                 break
                 # All files compared and matched
                 else:
+                    # Concatenate lists without duplicate
+                    uniq_periph_xml = set(periph_xml_tmp) - set(periph_xml)
+                    periph_xml = periph_xml + list(uniq_periph_xml)
+                    uniq_variant_exp = set(variant_exp_tmp) - set(variant_exp)
+                    variant_exp = variant_exp + list(uniq_variant_exp)
                     # Matched files append to the group list
                     group_mcu_dir.append(mcu_dirs.pop(index))
+                    del periph_xml_tmp[:]
+                    del variant_exp_tmp[:]
                 del mcu_dir2_files_list[:]
+
             # Merge directories name and contents if needed
             mcu_dir = merge_dir(
                 out_temp_path, group_mcu_dir, mcu_family, periph_xml, variant_exp