Create a different json for the new boards

Author: MatteoPologruto

generator/boards.json

@@ -74,9 +74,5 @@
   "arduino:mbed_nano:nanorp2040connect": {
     "moduleName": "NINA",
     "versions": ["1.4.5", "1.4.6", "1.4.7", "1.4.8", "1.5.0"]
-  },
-  "arduino:renesas_uno:unor4wifi": {
-    "moduleName": "ESP32-S3",
-    "versions": ["0.1.0", "0.2.0"]
   }
 }

generator/generator.py

@@ -222,36 +222,7 @@ def create_upload_data(fqbn, installed_cores):  # noqa: C901
     return upload_data
 
 
-def generate_boards_json(input_data, arduino_cli_path):
-    boards = {
-        "arduino:samd:mkr1000": {"fqbn": "arduino:samd:mkr1000", "firmware": []},
-        "arduino:samd:mkrwifi1010": {
-            "fqbn": "arduino:samd:mkrwifi1010",
-            "firmware": [],
-        },
-        "arduino:samd:nano_33_iot": {
-            "fqbn": "arduino:samd:nano_33_iot",
-            "firmware": [],
-        },
-        "arduino:samd:mkrvidor4000": {
-            "fqbn": "arduino:samd:mkrvidor4000",
-            "firmware": [],
-        },
-        "arduino:megaavr:uno2018": {"fqbn": "arduino:megaavr:uno2018", "firmware": []},
-        "arduino:mbed_nano:nanorp2040connect": {
-            "fqbn": "arduino:mbed_nano:nanorp2040connect",
-            "firmware": [],
-        },
-        "arduino:renesas_uno:unor4wifi": {
-            "fqbn": "arduino:renesas_uno:unor4wifi",
-            "firmware": [],
-            # "uploader_plugin" and "additional_tools" need to be hard coded because
-            # there is no way to retrieve them dinamically
-            "uploader_plugin": "arduino:[email protected]",
-            "additional_tools": ["arduino:[email protected]", "arduino:[email protected]"],
-        },
-    }
-
+def generate_boards_json(input_data, arduino_cli_path, new_boards):
     # List of old boards that need precompiled sketch data and uploader information obtained through platform.txt.
     old_boards = [
         "arduino:samd:mkr1000",
@@ -262,17 +233,49 @@ def generate_boards_json(input_data, arduino_cli_path):
         "arduino:mbed_nano:nanorp2040connect",
     ]
 
-    # Gets the installed cores
-    res = arduino_cli(cli_path=arduino_cli_path, args=["core", "list", "--format", "json"])
-    installed_cores = {c["id"]: c for c in json.loads(res)}
-
-    # Verify all necessary cores are installed
-    # TODO: Should we check that the latest version is installed too?
-    for fqbn in old_boards:
-        core_id = ":".join(fqbn.split(":")[:2])
-        if core_id not in installed_cores:
-            print(f"Board {fqbn} is not installed, install its core {core_id}")
-            sys.exit(1)
+    boards = {
+            "arduino:renesas_uno:unor4wifi": {
+                "fqbn": "arduino:renesas_uno:unor4wifi",
+                "firmware": [],
+                # "uploader_plugin" and "additional_tools" need to be hard coded because
+                # there is no way to retrieve them dinamically
+                "uploader_plugin": "arduino:[email protected]",
+                "additional_tools": ["arduino:[email protected]", "arduino:[email protected]"],
+            },
+        }
+
+    if not new_boards:
+        boards = {
+            "arduino:samd:mkr1000": {"fqbn": "arduino:samd:mkr1000", "firmware": []},
+            "arduino:samd:mkrwifi1010": {
+                "fqbn": "arduino:samd:mkrwifi1010",
+                "firmware": [],
+            },
+            "arduino:samd:nano_33_iot": {
+                "fqbn": "arduino:samd:nano_33_iot",
+                "firmware": [],
+            },
+            "arduino:samd:mkrvidor4000": {
+                "fqbn": "arduino:samd:mkrvidor4000",
+                "firmware": [],
+            },
+            "arduino:megaavr:uno2018": {"fqbn": "arduino:megaavr:uno2018", "firmware": []},
+            "arduino:mbed_nano:nanorp2040connect": {
+                "fqbn": "arduino:mbed_nano:nanorp2040connect",
+                "firmware": [],
+            },
+        }
+        # Gets the installed cores
+        res = arduino_cli(cli_path=arduino_cli_path, args=["core", "list", "--format", "json"])
+        installed_cores = {c["id"]: c for c in json.loads(res)}
+
+        # Verify all necessary cores are installed
+        # TODO: Should we check that the latest version is installed too?
+        for fqbn in old_boards:
+            core_id = ":".join(fqbn.split(":")[:2])
+            if core_id not in installed_cores:
+                print(f"Board {fqbn} is not installed, install its core {core_id}")
+                sys.exit(1)
 
     for fqbn, data in input_data.items():
         simple_fqbn = fqbn.replace(":", ".")
@@ -316,18 +319,31 @@ def generate_boards_json(input_data, arduino_cli_path):
         help="Path to arduino-cli executable",
         required=True,
     )
+    parser.add_argument(
+        "--new",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+        help="Generate the index for old boards",
+    )
     args = parser.parse_args(sys.argv[1:])
 
+    if args.new:
+        input_file = "new_boards.json"
+        output_file = "plugin_firmware_index.json"
+    else:
+        input_file = "boards.json"
+        output_file = "module_firmware_index.json"
+
     # raw_boards.json has been generated using --get_available_for FirmwareUploader (version 0.1.8) flag.
     # It has been edited a bit to better handle parsing.
-    with open("boards.json", "r") as f:
+    with open(input_file, "r") as f:
         boards = json.load(f)
 
-    boards_json = generate_boards_json(boards, args.arduino_cli)
+    boards_json = generate_boards_json(boards, args.arduino_cli, args.new)
 
     Path("boards").mkdir()
 
-    with open("boards/module_firmware_index.json", "w") as f:
+    with open("boards/" + output_file, "w") as f:
         json.dump(boards_json, f, indent=2)
 
 # board_index.json must be formatted like so:

generator/new_boards.json

@@ -0,0 +1,6 @@
+{
+  "arduino:renesas_uno:unor4wifi": {
+    "moduleName": "ESP32-S3",
+    "versions": ["0.1.0", "0.2.0"]
+  }
+}