CHORE: more work on the MCU series and start working on the ESC telemetry

Author: amilcarlucas

ardupilot_methodic_configurator/__main__.py

@@ -107,6 +107,7 @@ def component_editor(
     component_editor_window.set_vehicle_type_and_version(vehicle_type, flight_controller.info.flight_sw_version_and_type)
     component_editor_window.set_fc_manufacturer(flight_controller.info.vendor)
     component_editor_window.set_fc_model(flight_controller.info.firmware_type)
+    component_editor_window.set_mcu_series(flight_controller.info.mcu_series)
     if vehicle_dir_window and vehicle_dir_window.configuration_template:
         component_editor_window.set_vehicle_configuration_template(vehicle_dir_window.configuration_template)
     if args.skip_component_editor:

ardupilot_methodic_configurator/frontend_tkinter_component_editor.py

@@ -230,6 +230,7 @@ def __init__(self, version: str, local_filesystem: LocalFilesystem) -> None:
         _vehicle_components_strings = _("Version")
         _vehicle_components_strings = _("Firmware")
         _vehicle_components_strings = _("Type")
+        _vehicle_components_strings = _("MCU Series")
         _vehicle_components_strings = _("Notes")
         _vehicle_components_strings = _("Frame")
         _vehicle_components_strings = _("Specifications")
@@ -250,6 +251,7 @@ def __init__(self, version: str, local_filesystem: LocalFilesystem) -> None:
         _vehicle_components_strings = _("Number of cells")
         _vehicle_components_strings = _("Capacity mAh")
         _vehicle_components_strings = _("ESC")
+        _vehicle_components_strings = _("RPM Telemetry")
         _vehicle_components_strings = _("Motors")
         _vehicle_components_strings = _("Poles")
         _vehicle_components_strings = _("Propellers")
@@ -270,7 +272,7 @@ def update_json_data(self) -> None:
         if "Capacity mAh" not in self.data["Components"]["Battery"]["Specifications"]:
             self.data["Components"]["Battery"]["Specifications"]["Capacity mAh"] = 0
 
-        # To update old JSON files that do not have these new fields
+        # To update old JSON files that do not have these new "Frame.Specifications.TOW * Kg" fields
         if "Frame" not in self.data["Components"]:
             self.data["Components"]["Frame"] = {}
         if "Specifications" not in self.data["Components"]["Frame"]:
@@ -286,6 +288,30 @@ def update_json_data(self) -> None:
 
         self.data["Program version"] = __version__
 
+        # To update old JSON files that do not have this new "Flight Controller.Specifications.MCU Series" field
+        if "Flight Controller" not in self.data["Components"]:
+            self.data["Components"]["Flight Controller"] = {}
+        if "Specifications" not in self.data["Components"]["Flight Controller"]:
+            self.data["Components"]["Flight Controller"]["Specifications"] = {}
+        if "MCU Series" not in self.data["Components"]["Flight Controller"]["Specifications"]:
+            self.data["Components"]["Flight Controller"]["Specifications"]["MCU Series"] = "Unknown"
+
+        # To update old JSON files that do not have these new
+        # "ESC.RPM Telemetry.Connection" and "ESC.RPM Telemetry.Protocol" fields
+        if "ESC" not in self.data["Components"]:
+            self.data["Components"]["ESC"] = {}
+        if "RPM Telemetry" not in self.data["Components"]["ESC"]:
+            self.data["Components"]["ESC"] = {
+                "Product": self.data["Components"]["ESC"]["Product"],
+                "Firmware": self.data["Components"]["ESC"]["Firmware"],
+                "FC Connection": self.data["Components"]["ESC"]["FC Connection"],
+                "RPM Telemetry": {
+                    "Connection": "None",
+                    "Protocol": "None"
+                },
+                "Notes": self.data["Components"]["ESC"]["Notes"],
+            }
+
     def set_vehicle_type_and_version(self, vehicle_type: str, version: str) -> None:
         self._set_component_value_and_update_ui(("Flight Controller", "Firmware", "Type"), vehicle_type)
         if version:
@@ -299,6 +325,10 @@ def set_fc_model(self, model: str) -> None:
         if model and model not in (_("Unknown"), "MAVLink"):
             self._set_component_value_and_update_ui(("Flight Controller", "Product", "Model"), model)
 
+    def set_mcu_series(self, mcu: str) -> None:
+        if mcu:
+            self._set_component_value_and_update_ui(("Flight Controller", "Specifications", "MCU Series"), mcu)
+
     def set_vehicle_configuration_template(self, configuration_template: str) -> None:
         self.data["Configuration template"] = configuration_template
 
@@ -468,22 +498,59 @@ def update_esc_protocol_combobox_entries(self, esc_connection_type: str) -> None
         """Updates the ESC Protocol combobox entries based on the selected ESC Type."""
         if len(esc_connection_type) > 3 and esc_connection_type[:3] == "CAN":
             protocols = ["DroneCAN"]
+            rpm_connections = [esc_connection_type]
         elif len(esc_connection_type) > 6 and esc_connection_type[:6] == "SERIAL":
             protocols = [value["protocol"] for value in serial_protocols_dict.values() if value["component"] == "ESC"]
+            rpm_connections = [esc_connection_type]
         elif "MOT_PWM_TYPE" in self.local_filesystem.doc_dict:
             protocols = list(self.local_filesystem.doc_dict["MOT_PWM_TYPE"]["values"].values())
+            rpm_connections = ["None", "I/O Only", *serial_ports, *can_ports]
         elif "Q_M_PWM_TYPE" in self.local_filesystem.doc_dict:
             protocols = list(self.local_filesystem.doc_dict["Q_M_PWM_TYPE"]["values"].values())
+            rpm_connections = ["None", "I/O Only", *serial_ports, *can_ports]
         else:
             protocols = []
+            rpm_connections = []
 
+        protocol = ""
         protocol_path = ("ESC", "FC Connection", "Protocol")
         if protocol_path in self.entry_widgets:
             protocol_combobox = self.entry_widgets[protocol_path]
             protocol_combobox["values"] = protocols  # Update the combobox entries
             if protocol_combobox.get() not in protocols and isinstance(protocol_combobox, ttk.Combobox):
                 protocol_combobox.set(protocols[0] if protocols else "")
             protocol_combobox.update_idletasks()  # re-draw the combobox ASAP
+            protocol = protocol_combobox.get()
+            if protocol in ["Normal", "OneShot", "OneShot125", "Brushed", "PWMRange"]:
+                rpm_connections = ["None"]
+            elif "DShot" in protocol:
+                rpm_connections = ["None", "Main Out/AIO", *serial_ports]
+
+        rpm_connection_path = ("ESC", "RPM Telemetry", "Connection")
+        if rpm_connection_path in self.entry_widgets:
+            rpm_connection_combobox = self.entry_widgets[rpm_connection_path]
+            rpm_connection_combobox["values"] = rpm_connections  # Update the combobox entries
+            if rpm_connection_combobox.get() not in rpm_connections and isinstance(rpm_connection_combobox, ttk.Combobox):
+                rpm_connection_combobox.set(rpm_connections[0] if rpm_connections else "")
+            rpm_connection_combobox.update_idletasks()  # re-draw the combobox ASAP
+
+            if len(esc_connection_type) > 3 and esc_connection_type[:3] == "CAN":
+                rpm_protocols = ["None", "DroneCAN"]
+            elif len(esc_connection_type) > 6 and esc_connection_type[:6] == "SERIAL":
+                rpm_protocols = ["None", protocol]
+            elif "MOT_PWM_TYPE" in self.local_filesystem.doc_dict:
+                rpm_protocols = ["None", "Dshot", "BDshot"]
+            elif "Q_M_PWM_TYPE" in self.local_filesystem.doc_dict:
+                rpm_protocols = ["None", "Dshot", "BDshot"]
+            else:
+                rpm_protocols = []
+            rpm_protocol_path = ("ESC", "RPM Telemetry", "Protocol")
+            if rpm_protocol_path in self.entry_widgets:
+                rpm_protocol_combobox = self.entry_widgets[rpm_protocol_path]
+                rpm_protocol_combobox["values"] = rpm_protocols  # Update the combobox entries
+                if rpm_protocol_combobox.get() not in rpm_protocols and isinstance(rpm_protocol_combobox, ttk.Combobox):
+                    rpm_protocol_combobox.set(rpm_protocols[0] if rpm_protocols else "")
+                rpm_protocol_combobox.update_idletasks()  # re-draw the combobox ASAP
 
     def add_entry_or_combobox(
         self, value: float, entry_frame: ttk.Frame, path: tuple[str, str, str]
@@ -538,6 +605,12 @@ def get_combobox_values(param_name: str) -> list:
             ("GNSS Receiver", "FC Connection", "Type"): {
                 "values": ["None", *self.serial_ports, *self.can_ports],
             },
+            ("ESC", "RPM Telemetry", "Connection"): {
+                "values": ["None", "", *self.serial_ports, *self.can_ports],
+            },
+            ("ESC", "RPM Telemetry", "Protocol"): {
+                "values": ["None", "DSHot", "BDSHot"],
+            },
             ("GNSS Receiver", "FC Connection", "Protocol"): {
                 "values": get_combobox_values("GPS_TYPE"),
             },