Skip to content

Commit 7b44bba

Browse files
committed
refactor(flightcontroller): Update the flight controller info to make the non-unique board IDs explicit
1 parent d2d1f78 commit 7b44bba

File tree

4 files changed

+880
-782
lines changed

4 files changed

+880
-782
lines changed

ardupilot_methodic_configurator/backend_flightcontroller_info.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ def set_board_version(self, board_version: int) -> None:
9494
self.board_version = str(board_version & 0x0FFFF)
9595
apj_board_id = board_version >> 16
9696
self.apj_board_id = str(apj_board_id)
97-
self.firmware_type = str(APJ_BOARD_ID_NAME_DICT.get(apj_board_id, _("Unknown")))
97+
self.firmware_type = str(",".join(APJ_BOARD_ID_NAME_DICT.get(apj_board_id, _("Unknown"))))
9898

99-
vendor_derived_from_apj_board_id = str(APJ_BOARD_ID_VENDOR_DICT.get(apj_board_id, "ArduPilot"))
99+
vendor_derived_from_apj_board_id = str(",".join(APJ_BOARD_ID_VENDOR_DICT.get(apj_board_id, "ArduPilot")))
100100
if vendor_derived_from_apj_board_id != "ArduPilot" and self.vendor in ["ArduPilot", _("Unknown")]:
101101
self.vendor = vendor_derived_from_apj_board_id
102102

@@ -108,11 +108,11 @@ def set_os_custom_version(self, os_custom_version: Sequence[int]) -> None:
108108

109109
def set_usb_vendor_and_product_ids(self, vendor_id: int, product_id: int) -> None:
110110
self.vendor_id = f"0x{vendor_id:04X}" if vendor_id else _("Unknown")
111-
self.vendor = str(VID_VENDOR_DICT.get(vendor_id, _("Unknown")))
111+
self.vendor = str(",".join(VID_VENDOR_DICT.get(vendor_id, _("Unknown"))))
112112
self.vendor_and_vendor_id = f"{self.vendor} ({self.vendor_id})"
113113

114114
self.product_id = f"0x{product_id:04X}" if product_id else _("Unknown")
115-
self.product = str(VID_PID_PRODUCT_DICT.get((vendor_id, product_id), _("Unknown")))
115+
self.product = str(",".join(VID_PID_PRODUCT_DICT.get((vendor_id, product_id), _("Unknown"))))
116116
self.product_and_product_id = f"{self.product} ({self.product_id})"
117117

118118
def set_capabilities(self, capabilities: int) -> None:

0 commit comments

Comments
 (0)