Skip to content

Generate plugin_firmware_index.json with new boards data #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 12, 2023
Merged

Generate plugin_firmware_index.json with new boards data #172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2540a77
Add arduino uno r4 to boards.json
MatteoPologruto Jun 26, 2023
fe31ef7
Add arduino uno r4 to the generated boards json
MatteoPologruto Jun 26, 2023
7ab426e
Do not use precompiled sketches and skip core installation for new bo…
MatteoPologruto Jun 26, 2023
cabb751
Hard code uploader_plugin and additional_tools
MatteoPologruto Jul 3, 2023
730aeae
Add ESP32-S3 firmwares
MatteoPologruto Jul 3, 2023
23de16e
replace uno r4 placeholder fw with released ones
umbynos Jul 6, 2023
06ab23b
Add mkr wifi 1010 to old_boards
umbynos Jul 6, 2023
5fa54e6
Create a different json for the new boards
MatteoPologruto Jul 10, 2023
168eb49
Use the same directory for both of the json files
MatteoPologruto Jul 10, 2023
b280d02
Add plugin firmware index generation steps to the workflow
MatteoPologruto Jul 12, 2023
cb536bf
Reduce complexity using a new function to create the starting dictionary
MatteoPologruto Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Create a different json for the new boards
  • Loading branch information
@MatteoPologruto
MatteoPologruto committed Jul 12, 2023
commit 5fa54e66d39062508d26184cf81a837f7adb10db
4 changes: 0 additions & 4 deletions generator/boards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
79 changes: 48 additions & 31 deletions generator/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,26 +222,18 @@ def create_upload_data(fqbn, installed_cores): # noqa: C901
return upload_data


def generate_boards_json(input_data, arduino_cli_path):
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",
"arduino:samd:mkrwifi1010",
"arduino:samd:nano_33_iot",
"arduino:samd:mkrvidor4000",
"arduino:megaavr:uno2018",
"arduino:mbed_nano:nanorp2040connect",
]

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": [],
Expand All @@ -252,15 +244,27 @@ def generate_boards_json(input_data, arduino_cli_path):
},
}

# List of old boards that need precompiled sketch data and uploader information obtained through platform.txt.
old_boards = [
"arduino:samd:mkr1000",
"arduino:samd:mkrwifi1010",
"arduino:samd:nano_33_iot",
"arduino:samd:mkrvidor4000",
"arduino:megaavr:uno2018",
"arduino:mbed_nano:nanorp2040connect",
]
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"])
Expand Down Expand Up @@ -316,18 +320,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:
Expand Down
6 changes: 6 additions & 0 deletions generator/new_boards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"arduino:renesas_uno:unor4wifi": {
"moduleName": "ESP32-S3",
"versions": ["0.1.0", "0.2.0"]
}
}