Skip to content

Resolve the error 'Could not install firmware.' - Fixes #3195 #3496

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve the error 'Could not install firmware.' - Fixes #3195 #3496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 14 additions & 9 deletions core/services/ardupilot_manager/firmware/FirmwareInstall.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,21 @@ def _validate_apj(firmware_path: pathlib.Path, platform: Platform) -> None:
with open(firmware_path, "r", encoding="utf-8") as firmware_file:
firmware_data = firmware_file.read()
firm_board_id = int(json.loads(firmware_data).get("board_id", -1))
expected_board_id = get_board_id(platform)
if expected_board_id == -1:
raise UnsupportedPlatform("Firmware validation is not implemented for this board yet.")
if firm_board_id == -1:
raise InvalidFirmwareFile("Could not find board_id specification in the firmware file.")
if firm_board_id != expected_board_id:
raise InvalidFirmwareFile(f"Expected board_id {expected_board_id}, found {firm_board_id}.")
except (OSError, json.JSONDecodeError) as error:
raise InvalidFirmwareFile(f"Could not load firmware file for validation: {firmware_path}") from error

if platform == Platform.GenericSerial:
logger.warning("Skipping board_id validation for GenericSerial platform.")
return
except Exception as error:
raise InvalidFirmwareFile("Could not load firmware file for validation.") from error

expected_board_id = get_board_id(platform)
if expected_board_id == -1:
raise UnsupportedPlatform("Firmware validation is not implemented for this board yet.")
if firm_board_id == -1:
raise InvalidFirmwareFile("Could not find board_id specification in the firmware file.")
if firm_board_id != expected_board_id:
raise InvalidFirmwareFile(f"Expected board_id {expected_board_id}, found {firm_board_id}.")
return

@staticmethod
def _validate_elf(firmware_path: pathlib.Path, platform: Platform) -> None:
Expand Down