From 46fe1406453dcdfd0d35820b9d3e2e3627ce2949 Mon Sep 17 00:00:00 2001 From: "Dr.-Ing. Amilcar do Carmo Lucas" Date: Mon, 10 Nov 2025 03:08:13 +0100 Subject: [PATCH] feat(component editor): Re-oder component data More important components first, less important and/or optional components last Product's Manufacturer, Model and version are now on consecutive fields --- .../backend_filesystem.py | 5 +- .../data_model_par_dict.py | 2 +- .../data_model_vehicle_components_base.py | 58 +++ .../AirCar_v1/vehicle_components.json | 152 +++---- .../Big_Owl/vehicle_components.json | 152 +++---- .../Chimera7/vehicle_components.json | 152 +++---- .../FETtec-5/vehicle_components.json | 152 +++---- .../vehicle_components.json | 152 +++---- .../Holybro_X500/vehicle_components.json | 152 +++---- .../Holybro_X500_V2/vehicle_components.json | 152 +++---- .../Holybro_X650_LTE/vehicle_components.json | 152 +++---- .../Hoverit_X11+/vehicle_components.json | 152 +++---- .../Hoverit_X13/vehicle_components.json | 152 +++---- .../Marmotte5v2/vehicle_components.json | 152 +++---- .../ReadyToSkyZD550/vehicle_components.json | 152 +++---- .../vehicle_components.json | 152 +++---- .../Tarot_X4/vehicle_components.json | 152 +++---- .../X11_plus/vehicle_components.json | 152 +++---- .../4.3.8-params/vehicle_components.json | 152 +++---- .../4.4.4-params/vehicle_components.json | 152 +++---- .../4.5.x-params/vehicle_components.json | 152 +++---- .../4.6.x-params/vehicle_components.json | 152 +++---- .../empty_4.5.x/vehicle_components.json | 138 +++---- .../empty_4.6.x/vehicle_components.json | 138 +++---- .../normal_plane/vehicle_components.json | 136 +++---- .../Rover/AION_R1/vehicle_components.json | 152 +++---- .../system_vehicle_components_template.json | 376 +++++++++--------- ...test_data_model_vehicle_components_base.py | 261 ++++++++++++ update_vehicle_templates.py | 25 +- 29 files changed, 2259 insertions(+), 1920 deletions(-) diff --git a/ardupilot_methodic_configurator/backend_filesystem.py b/ardupilot_methodic_configurator/backend_filesystem.py index 1c2283eb5..008d9dedc 100644 --- a/ardupilot_methodic_configurator/backend_filesystem.py +++ b/ardupilot_methodic_configurator/backend_filesystem.py @@ -121,9 +121,10 @@ def re_init(self, vehicle_dir: str, vehicle_type: str, blank_component_data: boo if not self.file_parameters: return # No files intermediate parameters files found, no need to continue, the rest needs them + fw_version = re_compile(r"[ _-]").split(self.fw_version, 1)[0] # Read ArduPilot parameter documentation - xml_url = get_xml_url(vehicle_type, self.fw_version) - fallback_xml_url = get_fallback_xml_url(vehicle_type, self.fw_version) + xml_url = get_xml_url(vehicle_type, fw_version) + fallback_xml_url = get_fallback_xml_url(vehicle_type, fw_version) xml_dir = get_xml_dir(vehicle_dir) self.doc_dict = parse_parameter_metadata( xml_url, xml_dir, PARAM_DEFINITION_XML_FILE, vehicle_type, TOOLTIP_MAX_LENGTH, fallback_xml_url diff --git a/ardupilot_methodic_configurator/data_model_par_dict.py b/ardupilot_methodic_configurator/data_model_par_dict.py index b487d1f85..11748a543 100644 --- a/ardupilot_methodic_configurator/data_model_par_dict.py +++ b/ardupilot_methodic_configurator/data_model_par_dict.py @@ -255,7 +255,7 @@ def export_to_param( """ formatted_params = self._format_params(file_format) - with open(filename_out, "w", encoding="utf-8") as output_file: + with open(filename_out, "w", encoding="utf-8", newline="\n") as output_file: # use Linux line endings even on windows if content_header: output_file.write("\n".join(content_header) + "\n") output_file.writelines(line + "\n" for line in formatted_params) diff --git a/ardupilot_methodic_configurator/data_model_vehicle_components_base.py b/ardupilot_methodic_configurator/data_model_vehicle_components_base.py index 5f76568c8..adf4db485 100644 --- a/ardupilot_methodic_configurator/data_model_vehicle_components_base.py +++ b/ardupilot_methodic_configurator/data_model_vehicle_components_base.py @@ -263,6 +263,7 @@ def update_json_structure(self) -> None: # Merge existing data onto default structure (preserves existing values) self._data = self._deep_merge_dicts(default_structure, self._data) + self._data["Components"] = self._reorder_components(self._data.get("Components", {})) self._data["Program version"] = __version__ def _deep_merge_dicts(self, default: dict[str, Any], existing: dict[str, Any]) -> dict[str, Any]: @@ -292,6 +293,63 @@ def _deep_merge_dicts(self, default: dict[str, Any], existing: dict[str, Any]) - return result + def _reorder_components(self, existing_components: ComponentData) -> ComponentData: + """ + Reorder components according to the desired structure while preserving existing data. + + Args: + existing_components: The existing components dictionary + + Returns: + A new dictionary with components reordered according to the desired structure + + """ + desired_component_order = [ + "Flight Controller", + "Frame", + "Battery Monitor", + "Battery", + "ESC", + "Motors", + "Propellers", + "GNSS Receiver", + "RC Controller", + "RC Transmitter", + "RC Receiver", + "Telemetry", + ] + + # Create reordered components dict + reordered_components = {} + remaining_components = existing_components.copy() + + # First, add components in the desired order + for component_name in desired_component_order: + if component_name in remaining_components: + reordered_components[component_name] = remaining_components.pop(component_name) + + # Then add any remaining unknown components at the end + reordered_components.update(remaining_components) + + # Second step: for each component, ensure Product fields are in correct order (Version before URL) + for component_name, component_data in reordered_components.items(): + if "Product" in component_data and isinstance(component_data["Product"], dict): + product = component_data["Product"] + if "Version" in product and "URL" in product: + # Create new ordered product dict + ordered_product = {} + # Add fields in desired order + for field in ["Manufacturer", "Model", "Version", "URL"]: + if field in product: + ordered_product[field] = product[field] + # Add any remaining fields + for field, value in product.items(): + if field not in ordered_product: + ordered_product[field] = value + reordered_components[component_name]["Product"] = ordered_product + + return reordered_components + def init_battery_chemistry(self) -> None: self._battery_chemistry = ( self._data.get("Components", {}).get("Battery", {}).get("Specifications", {}).get("Chemistry", "") diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json index dc2a9988c..f15464a90 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "CubeOrange", - "URL": "https://www.robotshop.com/products/cubepilot-the-cube-orange-standard-set-ads-b-carrier-board", - "Version": "1.0" + "Version": "1.0", + "URL": "https://www.robotshop.com/products/cubepilot-the-cube-orange-standard-set-ads-b-carrier-board" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Aircar Technology and Aviation ", "Model": "prototype", - "URL": "https://www.aircar.aero/", - "Version": "v1" + "Version": "v1", + "URL": "https://www.aircar.aero/" }, "Specifications": { "TOW min Kg": 320, @@ -30,72 +30,12 @@ }, "Notes": "Frame is custom, X type frame. Arm length is 2650mm." }, - "RC Controller": { - "Product": { - "Manufacturer": "", - "Model": "", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "", - "Model": "", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "integrated in RC controller" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "", - "Model": "", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "All" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "", - "Model": "", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "" - }, "Battery Monitor": { "Product": { "Manufacturer": "CubePilot", "Model": "HX4-06008", - "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-user-manual#power-module-connection", - "Version": "PB01A21" + "Version": "PB01A21", + "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-user-manual#power-module-connection" }, "Firmware": { "Type": "", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Chemistry": "LipoHV", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Diameter_inches": 52 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here 3", - "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual", - "Version": "1" + "Version": "1", + "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual" }, "Firmware": { "Type": "UBlox", @@ -181,6 +121,66 @@ "Protocol": "DroneCAN" }, "Notes": "uBlox M8P GNSS with a patch antenna." + }, + "RC Controller": { + "Product": { + "Manufacturer": "", + "Model": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "", + "Model": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "integrated in RC controller" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "", + "Model": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "All" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "", + "Model": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "" } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json index 264b36c2b..9fd04d48c 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Pixhawk6C", - "URL": "https://holybro.com/products/pixhawk-6c?srsltid=AfmBOoqx6fEclM8l4wICaZcGtR5ecABosliproB7TozPMEdYY7SG0A_t", - "Version": "1.0" + "Version": "1.0", + "URL": "https://holybro.com/products/pixhawk-6c?srsltid=AfmBOoqx6fEclM8l4wICaZcGtR5ecABosliproB7TozPMEdYY7SG0A_t" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "", "Model": "Owls", - "URL": "", - "Version": "Custom" + "Version": "Custom", + "URL": "" }, "Specifications": { "TOW min Kg": 7.0, @@ -30,72 +30,12 @@ }, "Notes": "" }, - "RC Controller": { - "Product": { - "Manufacturer": "Sony", - "Model": "Dualsense wireless controller", - "URL": "https://www.playstation.com/de-de/accessories/dualsense-wireless-controller/", - "Version": "Playstation 5" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "MP", - "Model": "Joystick support", - "URL": "https://ardupilot.org/copter/docs/common-joystick.html", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "CUAV", - "Model": "LTE-Link SE", - "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "All" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "CUAV", - "Model": "LTE-Link SE", - "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "" - }, "Battery Monitor": { "Product": { "Manufacturer": "Holybro", "Model": "PM02 V3 Power Module (12S)", - "URL": "https://holybro.com/products/pm02-v3-12s-power-module?srsltid=AfmBOoruyyy13wBspPFngCWD-IdOxUHiH3nfgUpN79MuVgugcMqUUxGK", - "Version": "V3" + "Version": "V3", + "URL": "https://holybro.com/products/pm02-v3-12s-power-module?srsltid=AfmBOoruyyy13wBspPFngCWD-IdOxUHiH3nfgUpN79MuVgugcMqUUxGK" }, "Firmware": { "Type": "", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "Gens ace", "Model": "Tattu 17000mAh 22.8V 15C 6S1P HV", - "URL": "https://gensace.de/products/tattu-17000mah-22-8v-15c-6s1p-hv-high-voltage-lipo-battery-with-as150-xt150-plug", - "Version": "" + "Version": "", + "URL": "https://gensace.de/products/tattu-17000mah-22-8v-15c-6s1p-hv-high-voltage-lipo-battery-with-as150-xt150-plug" }, "Specifications": { "Chemistry": "LipoHV", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "hobbywing", "Model": "X6 Plus", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "hobbywing", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "hobbywing", "Model": "x6 plus", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "hobbywing", "Model": "Paddle 2388", - "URL": "", - "Version": "2" + "Version": "2", + "URL": "" }, "Specifications": { "Diameter_inches": 23 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "M10", - "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL" }, "Firmware": { "Type": "Ublox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "uBlox M10 GNSS" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Sony", + "Model": "Dualsense wireless controller", + "Version": "Playstation 5", + "URL": "https://www.playstation.com/de-de/accessories/dualsense-wireless-controller/" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "MP", + "Model": "Joystick support", + "Version": "", + "URL": "https://ardupilot.org/copter/docs/common-joystick.html" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "CUAV", + "Model": "LTE-Link SE", + "Version": "", + "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "All" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "CUAV", + "Model": "LTE-Link SE", + "Version": "", + "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "" } }, "Program version": "2.0.1", diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json index 5f14b71f5..22bf52a66 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Matek", "Model": "H743 Slim", - "URL": "", - "Version": "V4" + "Version": "V4", + "URL": "" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "iFlight", "Model": "Titan Chimera7", - "URL": "", - "Version": "LR" + "Version": "LR", + "URL": "" }, "Specifications": { "TOW min Kg": 0.9, @@ -30,72 +30,12 @@ }, "Notes": "" }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "TX16S", - "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller", - "Version": "MKI" - }, - "Firmware": { - "Type": "EdgeTx", - "Version": "2.9.2-providence" - }, - "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "TBS", - "Model": "TRACER Micro TX", - "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx", - "Version": "2" - }, - "Firmware": { - "Type": "Crossfire TX", - "Version": "4.0.0" - }, - "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "TBS", - "Model": "Tracer RX", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "Crossfire", - "Version": "7" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "All" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Espressif", - "Model": "ESP32 WROOM", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "dronebridge", - "Version": "1.5" - }, - "FC Connection": { - "Type": "SERIAL4", - "Protocol": "MAVLink2" - }, - "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" - }, "Battery Monitor": { "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "3" + "Version": "3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "Turnigy", "Model": "Graphene Panther", - "URL": "", - "Version": "3000mAh 6S 75C" + "Version": "3000mAh 6S 75C", + "URL": "" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "F55A F3 Pro II", - "URL": "", - "Version": "4-in-1 ESC" + "Version": "4-in-1 ESC", + "URL": "" }, "Firmware": { "Type": "BLHeli32", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "XING", "Model": "2806.5 1300KV", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "Gemfan", "Model": "7040 7x4.2", - "URL": "https://www.gfprops.com/products/gemfan-flash-7042-2.html", - "Version": "" + "Version": "", + "URL": "https://www.gfprops.com/products/gemfan-flash-7042-2.html" }, "Specifications": { "Diameter_inches": 7 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Matek", "Model": "M8Q-5883", - "URL": "", - "Version": "1" + "Version": "1", + "URL": "" }, "Firmware": { "Type": "UBlox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "TX16S", + "Version": "MKI", + "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller" + }, + "Firmware": { + "Type": "EdgeTx", + "Version": "2.9.2-providence" + }, + "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "TBS", + "Model": "TRACER Micro TX", + "Version": "2", + "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx" + }, + "Firmware": { + "Type": "Crossfire TX", + "Version": "4.0.0" + }, + "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "TBS", + "Model": "Tracer RX", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "Crossfire", + "Version": "7" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "All" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Espressif", + "Model": "ESP32 WROOM", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "dronebridge", + "Version": "1.5" + }, + "FC Connection": { + "Type": "SERIAL4", + "Protocol": "MAVLink2" + }, + "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json index 66b65462a..c295d62ec 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "CubeOrangePlus", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "TOW min Kg": 1.3, @@ -30,72 +30,12 @@ }, "Notes": "5\" Props" }, - "RC Controller": { - "Product": { - "Manufacturer": "FrSky", - "Model": "Taranis Q X7", - "URL": "https://www.frsky-rc.com/product/taranis-q-x7-2/", - "Version": "" - }, - "Firmware": { - "Type": "OpenTx", - "Version": "" - }, - "Notes": "" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "TBS", - "Model": "Tracer", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "TBS", - "Model": "Tracer Nano RX", - "URL": "https://www.team-blacksheep.com/products/prod:tracer_nanorx", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "All" - }, - "Notes": "" - }, - "Telemetry": { - "Product": { - "Manufacturer": "", - "Model": "", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL2", - "Protocol": "MAVLink2" - }, - "Notes": "" - }, "Battery Monitor": { "Product": { "Manufacturer": "FETtec", "Model": "4in1 ESC 65A", - "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-65a", - "Version": "" + "Version": "", + "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-65a" }, "Firmware": { "Type": "FETtec", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "FETtec", "Model": "4in1 ESC 65A", - "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-65a", - "Version": "" + "Version": "", + "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-65a" }, "Firmware": { "Type": "FETtec", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "F80", - "URL": "https://shop.tmotor.com/products/fpv-drones-brushless-motor-f80-pro", - "Version": "1900KV" + "Version": "1900KV", + "URL": "https://shop.tmotor.com/products/fpv-drones-brushless-motor-f80-pro" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HQProp", "Model": "5043 5X4.3X3", - "URL": "https://www.hqprop.com/", - "Version": "V2S" + "Version": "V2S", + "URL": "https://www.hqprop.com/" }, "Specifications": { "Diameter_inches": 5 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here3/Here3+", - "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual", - "Version": "3.0" + "Version": "3.0", + "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual" }, "Firmware": { "Type": "uBlox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "First GNSS receiver is connected to SERIAL4 the second to CAN1" + }, + "RC Controller": { + "Product": { + "Manufacturer": "FrSky", + "Model": "Taranis Q X7", + "Version": "", + "URL": "https://www.frsky-rc.com/product/taranis-q-x7-2/" + }, + "Firmware": { + "Type": "OpenTx", + "Version": "" + }, + "Notes": "" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "TBS", + "Model": "Tracer", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "TBS", + "Model": "Tracer Nano RX", + "Version": "", + "URL": "https://www.team-blacksheep.com/products/prod:tracer_nanorx" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "All" + }, + "Notes": "" + }, + "Telemetry": { + "Product": { + "Manufacturer": "", + "Model": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL2", + "Protocol": "MAVLink2" + }, + "Notes": "" } }, "Program version": "2.0.1", diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json index b5b87adda..43145110f 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "ArduPilot", "Model": "SITL", - "URL": "-", - "Version": "-" + "Version": "-", + "URL": "-" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Gazebo", "Model": "iris_with_gimbal", - "URL": "-", - "Version": "-" + "Version": "-", + "URL": "-" }, "Specifications": { "TOW min Kg": 0.6, @@ -30,72 +30,12 @@ }, "Notes": "TOW in this case a taken ideal, and not calculated including gimbal." }, - "RC Controller": { - "Product": { - "Manufacturer": "-", - "Model": "-", - "URL": "-", - "Version": "-" - }, - "Firmware": { - "Type": "-", - "Version": "-" - }, - "Notes": "" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "-", - "Model": "-", - "URL": "-", - "Version": "-" - }, - "Firmware": { - "Type": "-", - "Version": "-" - }, - "Notes": "-" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "-", - "Model": "-", - "URL": "-", - "Version": "" - }, - "Firmware": { - "Type": "-", - "Version": "-" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "All" - }, - "Notes": "" - }, - "Telemetry": { - "Product": { - "Manufacturer": "ArduPilot", - "Model": "SITL", - "URL": "", - "Version": "4.6.x" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "" - }, "Battery Monitor": { "Product": { "Manufacturer": "ArduPilot", "Model": "SITL", - "URL": "-", - "Version": "4.6.x" + "Version": "4.6.x", + "URL": "-" }, "Firmware": { "Type": "", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "ArduPilot", "Model": "SITL", - "URL": "-", - "Version": "4.6.x" + "Version": "4.6.x", + "URL": "-" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "ArduPilot", "Model": "SITL", - "URL": "-", - "Version": "4.6.x" + "Version": "4.6.x", + "URL": "-" }, "Firmware": { "Type": "-", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "ArduPilot", "Model": "gz-sim-apply-joint-force-system", - "URL": "-", - "Version": "-" + "Version": "-", + "URL": "-" }, "Specifications": { "Poles": 3 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "ArduPilot", "Model": "gz-sim-apply-joint-force-system", - "URL": "-", - "Version": "-" + "Version": "-", + "URL": "-" }, "Specifications": { "Diameter_inches": 3 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "ArduPilot", "Model": "SITL", - "URL": "-", - "Version": "4.6.x" + "Version": "4.6.x", + "URL": "-" }, "Firmware": { "Type": "", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "-" + }, + "RC Controller": { + "Product": { + "Manufacturer": "-", + "Model": "-", + "Version": "-", + "URL": "-" + }, + "Firmware": { + "Type": "-", + "Version": "-" + }, + "Notes": "" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "-", + "Model": "-", + "Version": "-", + "URL": "-" + }, + "Firmware": { + "Type": "-", + "Version": "-" + }, + "Notes": "-" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "-", + "Model": "-", + "Version": "", + "URL": "-" + }, + "Firmware": { + "Type": "-", + "Version": "-" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "All" + }, + "Notes": "" + }, + "Telemetry": { + "Product": { + "Manufacturer": "ArduPilot", + "Model": "SITL", + "Version": "4.6.x", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "" } }, "Program version": "2.0.1", diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json index 9fa0b597e..7b554ecf2 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Pixhawk4", - "URL": "https://holybro.com/products/pixhawk-4?srsltid=AfmBOooNvEAR2_85PybTqRHhojmQW-aMW8TY-iQfI1v2qUU50AfxmCYg", - "Version": "1.0" + "Version": "1.0", + "URL": "https://holybro.com/products/pixhawk-4?srsltid=AfmBOooNvEAR2_85PybTqRHhojmQW-aMW8TY-iQfI1v2qUU50AfxmCYg" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "X500", - "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8", - "Version": "Payload: 1500g (without Battery, 70% Throttle)" + "Version": "Payload: 1500g (without Battery, 70% Throttle)", + "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8" }, "Specifications": { "TOW min Kg": 1.09, @@ -30,72 +30,12 @@ }, "Notes": "Frame is X500 type. Look on holybro site for more specifications" }, - "RC Controller": { - "Product": { - "Manufacturer": "FrSky", - "Model": "Taranis Q X7", - "URL": "https://www.frsky-rc.com/product/taranis-q-x7-2/", - "Version": "" - }, - "Firmware": { - "Type": "OpenTx", - "Version": "2.3.10-otx (7ac1ecb6)" - }, - "Notes": "With yappu 2.9.5" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "FrSky", - "Model": "ISRM-N 1.1.1/2.1.0EU", - "URL": "https://www.frsky-rc.com/product/taranis-q-x7-2/", - "Version": "1.1.1" - }, - "Firmware": { - "Type": "ISRM-M", - "Version": "2.1.10EU" - }, - "Notes": "integrated in RC controller" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "FrSky", - "Model": "Archer R6", - "URL": "https://www.frsky-rc.com/archer-r6/", - "Version": "1.2.0" - }, - "Firmware": { - "Type": "Archer-X", - "Version": "2.1.14" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "SBUS" - }, - "Notes": "" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Holybro", - "Model": "SiK Telemetry Radio", - "URL": "https://holybro.com/products/sik-telemetry-radio-v3?variant=41562952270013", - "Version": "V3.0" - }, - "Firmware": { - "Type": "Open-source SIK firmware", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "100mW at 433MHz, 13.6g without antenna + \n7.4g for 433MHz antenna" - }, "Battery Monitor": { "Product": { "Manufacturer": "Holybro", "Model": "PM02 Power Module (12S)", - "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02-v3-12s-power-module", - "Version": "V3" + "Version": "V3", + "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02-v3-12s-power-module" }, "Firmware": { "Type": "", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "Gens Ace", "Model": "4S1P 5000mAh", - "URL": "https://www.rccorner.ae/gens-ace-5000mah-14-8v-45c-4s1p-lipo-battery", - "Version": "B-45C-5000-4S1P" + "Version": "B-45C-5000-4S1P", + "URL": "https://www.rccorner.ae/gens-ace-5000mah-14-8v-45c-4s1p-lipo-battery" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "X500 V2-BLHeli S 20A", - "URL": "https://www.mybotshop.de/Holybro-X500-V2-BLHeli-S-20A-ESC_1", - "Version": "1" + "Version": "1", + "URL": "https://www.mybotshop.de/Holybro-X500-V2-BLHeli-S-20A-ESC_1" }, "Firmware": { "Type": "", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "2216-880KV", - "URL": "https://www.mybotshop.de/Holybro-Brushless-S500-V2-Motor", - "Version": "" + "Version": "", + "URL": "https://www.mybotshop.de/Holybro-Brushless-S500-V2-Motor" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Propeller 1045", - "URL": "https://holybro.com/collections/multicopter-kit/products/spare-parts-x500-v2-kit?variant=41591073669309", - "Version": "" + "Version": "", + "URL": "https://holybro.com/collections/multicopter-kit/products/spare-parts-x500-v2-kit?variant=41591073669309" }, "Specifications": { "Diameter_inches": 10 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here+", - "URL": "https://ardupilot.org/copter/docs/common-here-plus-gps.html", - "Version": "" + "Version": "", + "URL": "https://ardupilot.org/copter/docs/common-here-plus-gps.html" }, "Firmware": { "Type": "uBlox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "" + }, + "RC Controller": { + "Product": { + "Manufacturer": "FrSky", + "Model": "Taranis Q X7", + "Version": "", + "URL": "https://www.frsky-rc.com/product/taranis-q-x7-2/" + }, + "Firmware": { + "Type": "OpenTx", + "Version": "2.3.10-otx (7ac1ecb6)" + }, + "Notes": "With yappu 2.9.5" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "FrSky", + "Model": "ISRM-N 1.1.1/2.1.0EU", + "Version": "1.1.1", + "URL": "https://www.frsky-rc.com/product/taranis-q-x7-2/" + }, + "Firmware": { + "Type": "ISRM-M", + "Version": "2.1.10EU" + }, + "Notes": "integrated in RC controller" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "FrSky", + "Model": "Archer R6", + "Version": "1.2.0", + "URL": "https://www.frsky-rc.com/archer-r6/" + }, + "Firmware": { + "Type": "Archer-X", + "Version": "2.1.14" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "SBUS" + }, + "Notes": "" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Holybro", + "Model": "SiK Telemetry Radio", + "Version": "V3.0", + "URL": "https://holybro.com/products/sik-telemetry-radio-v3?variant=41562952270013" + }, + "Firmware": { + "Type": "Open-source SIK firmware", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "100mW at 433MHz, 13.6g without antenna + \n7.4g for 433MHz antenna" } }, "Program version": "2.5.0" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json index 641b9da9d..5c9104ab7 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Pixhawk6C-bdshot", - "URL": "https://holybro.com/products/pixhawk-6c?srsltid=AfmBOoqx6fEclM8l4wICaZcGtR5ecABosliproB7TozPMEdYY7SG0A_t", - "Version": "1.0" + "Version": "1.0", + "URL": "https://holybro.com/products/pixhawk-6c?srsltid=AfmBOoqx6fEclM8l4wICaZcGtR5ecABosliproB7TozPMEdYY7SG0A_t" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "X500 V2", - "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8", - "Version": "Payload: 1500g (without Battery, 70% Throttle)" + "Version": "Payload: 1500g (without Battery, 70% Throttle)", + "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8" }, "Specifications": { "TOW min Kg": 1.09, @@ -30,72 +30,12 @@ }, "Notes": "Frame is X500 V2 type. Look on holybro site for more specifications" }, - "RC Controller": { - "Product": { - "Manufacturer": "FlySky", - "Model": "FS-i6X", - "URL": "https://www.flysky-cn.com/fsi6x", - "Version": "1.0" - }, - "Firmware": { - "Type": "AFHDS 2A", - "Version": "V1.0.52" - }, - "Notes": "It has 10 channels, but only 6 can be used by the receiver." - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "FlySky", - "Model": "FS-i6X", - "URL": "ttps://www.flysky-cn.com/fsi6x", - "Version": "1.0" - }, - "Firmware": { - "Type": "AFHDS 2A", - "Version": "V1.0.52" - }, - "Notes": "integrated in RC controller" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "FlySky", - "Model": "FS-IA6B", - "URL": "https://www.flysky-cn.com/ia6b-canshu", - "Version": "V1.0" - }, - "Firmware": { - "Type": "AFHDS 2A", - "Version": "V1.0.52" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "PPM" - }, - "Notes": "This receiver is connected to the pixhawk 6C PPM/SBUS RC entrance and uses PPM protocol" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Holybro", - "Model": "SiK Telemetry Radio", - "URL": "https://holybro.com/products/sik-telemetry-radio-v3?variant=41562952270013", - "Version": "V3.0" - }, - "Firmware": { - "Type": "Open-source SIK firmware", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "100mW at 433MHz, 13.6g without antenna + \n7.4g for 433MHz antenna" - }, "Battery Monitor": { "Product": { "Manufacturer": "Holybro", "Model": "PM02 Power Module (12S)", - "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02-v3-12s-power-module", - "Version": "V3" + "Version": "V3", + "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02-v3-12s-power-module" }, "Firmware": { "Type": "", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "Gens Ace", "Model": "4S1P 5000mAh", - "URL": "https://www.rccorner.ae/gens-ace-5000mah-14-8v-45c-4s1p-lipo-battery", - "Version": "B-45C-5000-4S1P" + "Version": "B-45C-5000-4S1P", + "URL": "https://www.rccorner.ae/gens-ace-5000mah-14-8v-45c-4s1p-lipo-battery" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "X500 V2-BLHeli S 20A", - "URL": "https://www.mybotshop.de/Holybro-X500-V2-BLHeli-S-20A-ESC_1", - "Version": "1" + "Version": "1", + "URL": "https://www.mybotshop.de/Holybro-X500-V2-BLHeli-S-20A-ESC_1" }, "Firmware": { "Type": "", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "2216-920KV", - "URL": "https://nl.aliexpress.com/item/1005003954474597.html?gatewayAdapt=glo2nld", - "Version": "" + "Version": "", + "URL": "https://nl.aliexpress.com/item/1005003954474597.html?gatewayAdapt=glo2nld" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Propeller 1045", - "URL": "https://holybro.com/collections/multicopter-kit/products/spare-parts-x500-v2-kit?variant=41591073669309", - "Version": "" + "Version": "", + "URL": "https://holybro.com/collections/multicopter-kit/products/spare-parts-x500-v2-kit?variant=41591073669309" }, "Specifications": { "Diameter_inches": 10 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "M10", - "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL" }, "Firmware": { "Type": "Ublox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "uBlox M10 GNSS" + }, + "RC Controller": { + "Product": { + "Manufacturer": "FlySky", + "Model": "FS-i6X", + "Version": "1.0", + "URL": "https://www.flysky-cn.com/fsi6x" + }, + "Firmware": { + "Type": "AFHDS 2A", + "Version": "V1.0.52" + }, + "Notes": "It has 10 channels, but only 6 can be used by the receiver." + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "FlySky", + "Model": "FS-i6X", + "Version": "1.0", + "URL": "ttps://www.flysky-cn.com/fsi6x" + }, + "Firmware": { + "Type": "AFHDS 2A", + "Version": "V1.0.52" + }, + "Notes": "integrated in RC controller" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "FlySky", + "Model": "FS-IA6B", + "Version": "V1.0", + "URL": "https://www.flysky-cn.com/ia6b-canshu" + }, + "Firmware": { + "Type": "AFHDS 2A", + "Version": "V1.0.52" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "PPM" + }, + "Notes": "This receiver is connected to the pixhawk 6C PPM/SBUS RC entrance and uses PPM protocol" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Holybro", + "Model": "SiK Telemetry Radio", + "Version": "V3.0", + "URL": "https://holybro.com/products/sik-telemetry-radio-v3?variant=41562952270013" + }, + "Firmware": { + "Type": "Open-source SIK firmware", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "100mW at 433MHz, 13.6g without antenna + \n7.4g for 433MHz antenna" } }, "Program version": "2.0.1", diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json index c5f46288d..1d05a4752 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Pixhawk6C-bdshot", - "URL": "https://holybro.com/products/pixhawk-6c?srsltid=AfmBOoqx6fEclM8l4wICaZcGtR5ecABosliproB7TozPMEdYY7SG0A_t", - "Version": "1.0" + "Version": "1.0", + "URL": "https://holybro.com/products/pixhawk-6c?srsltid=AfmBOoqx6fEclM8l4wICaZcGtR5ecABosliproB7TozPMEdYY7SG0A_t" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "X650 V2", - "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8", - "Version": "Payload: 1500g (without Battery, 70% Throttle)" + "Version": "Payload: 1500g (without Battery, 70% Throttle)", + "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8" }, "Specifications": { "TOW min Kg": 5.6, @@ -30,72 +30,12 @@ }, "Notes": "Frame is X650 V2 type. Look on holybro site for more specifications" }, - "RC Controller": { - "Product": { - "Manufacturer": "MP", - "Model": "Joystick support", - "URL": "https://ardupilot.org/copter/docs/common-joystick.html", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "Microsoft", - "Model": "X-box One controller", - "URL": "https://www.microsoft.com/store/collections/xboxcontrollers", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "CUAV", - "Model": "LTE-Link SE", - "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "All" - }, - "Notes": "This receiver is connected to the pixhawk 6C PPM/SBUS RC entrance and uses PPM protocol" - }, - "Telemetry": { - "Product": { - "Manufacturer": "CUAV", - "Model": "LTE-Link SE", - "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "" - }, "Battery Monitor": { "Product": { "Manufacturer": "Holybro", "Model": "PM02 V3 Power Module (12S)", - "URL": "https://holybro.com/products/pm02-v3-12s-power-module?srsltid=AfmBOoruyyy13wBspPFngCWD-IdOxUHiH3nfgUpN79MuVgugcMqUUxGK", - "Version": "V3" + "Version": "V3", + "URL": "https://holybro.com/products/pm02-v3-12s-power-module?srsltid=AfmBOoruyyy13wBspPFngCWD-IdOxUHiH3nfgUpN79MuVgugcMqUUxGK" }, "Firmware": { "Type": "", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "Gens Ace", "Model": "Tattu 6S1P 11000mAh", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Chemistry": "LipoHV", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Tekko32 F4-45A", - "URL": "https://holybro.com/products/tekko32-f4-45a-esc", - "Version": "AM32" + "Version": "AM32", + "URL": "https://holybro.com/products/tekko32-f4-45a-esc" }, "Firmware": { "Type": "AM32", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "MN4014", - "URL": "https://store.tmotor.com/product/mn4014-kv330-motor-navigator-type.html", - "Version": "KV3330" + "Version": "KV3330", + "URL": "https://store.tmotor.com/product/mn4014-kv330-motor-navigator-type.html" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "GEMFAN", "Model": "1555 carbon fiber", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Diameter_inches": 15.5 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "M10", - "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL" }, "Firmware": { "Type": "Ublox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "uBlox M10 GNSS" + }, + "RC Controller": { + "Product": { + "Manufacturer": "MP", + "Model": "Joystick support", + "Version": "", + "URL": "https://ardupilot.org/copter/docs/common-joystick.html" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "Microsoft", + "Model": "X-box One controller", + "Version": "", + "URL": "https://www.microsoft.com/store/collections/xboxcontrollers" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "CUAV", + "Model": "LTE-Link SE", + "Version": "", + "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "All" + }, + "Notes": "This receiver is connected to the pixhawk 6C PPM/SBUS RC entrance and uses PPM protocol" + }, + "Telemetry": { + "Product": { + "Manufacturer": "CUAV", + "Model": "LTE-Link SE", + "Version": "", + "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "" } }, "Program version": "2.0.1", diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json index 3f2de33ec..b4dc26453 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Hex/ProfiCNC", "Model": "CubeOrangePlus", - "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-module-overview", - "Version": "1.0" + "Version": "1.0", + "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-module-overview" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "HOVERIT", "Model": "BAAZ", - "URL": "https://hoverit.in/baaz-1", - "Version": "v2" + "Version": "v2", + "URL": "https://hoverit.in/baaz-1" }, "Specifications": { "TOW min Kg": 35, @@ -30,72 +30,12 @@ }, "Notes": "customized drone" }, - "RC Controller": { - "Product": { - "Manufacturer": "SIYI", - "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "mk32 COMBO" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "SIYI ", - "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "mk32 COMBO" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "SIYI", - "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "SBUS" - }, - "Notes": "MK32 RADIO COMBO " - }, - "Telemetry": { - "Product": { - "Manufacturer": "SIYI", - "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "mk32 COMBO RADIO " - }, "Battery Monitor": { "Product": { "Manufacturer": "HOBBYWING", "Model": "X11 Plus", - "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html", - "Version": "" + "Version": "", + "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html" }, "Firmware": { "Type": "", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "HOVERIT", "Model": "80Ah", - "URL": "https://hoverit.in/home", - "Version": "80ah baaz" + "Version": "80ah baaz", + "URL": "https://hoverit.in/home" }, "Specifications": { "Chemistry": "LiIonSS", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "X11 Plus", - "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html", - "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm" + "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm", + "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html" }, "Firmware": { "Type": "", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "X11 Plus 1118-85KV", - "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html", - "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm" + "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm", + "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "43\"", - "URL": "https://www.amazon.com/HAWEWE-Hobbywing-Plastics-Propeller-Agricultural/dp/B0CH7WLPCG", - "Version": "" + "Version": "", + "URL": "https://www.amazon.com/HAWEWE-Hobbywing-Plastics-Propeller-Agricultural/dp/B0CH7WLPCG" }, "Specifications": { "Diameter_inches": 43 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "CubePilot HEX", "Model": "com.cubepilot.here4", - "URL": "https://docs.cubepilot.org/user-guides/here-4/here-4-manual", - "Version": "1.12" + "Version": "1.12", + "URL": "https://docs.cubepilot.org/user-guides/here-4/here-4-manual" }, "Firmware": { "Type": "", @@ -181,6 +121,66 @@ "Protocol": "DroneCAN" }, "Notes": "RTK GNSS receiver HERE 4 " + }, + "RC Controller": { + "Product": { + "Manufacturer": "SIYI", + "Model": "mk32 RADIO", + "Version": "1", + "URL": "https://shop.siyi.biz/products/siyi-mk32" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "mk32 COMBO" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "SIYI ", + "Model": "mk32 RADIO", + "Version": "1", + "URL": "https://shop.siyi.biz/products/siyi-mk32" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "mk32 COMBO" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "SIYI", + "Model": "mk32 RADIO", + "Version": "1", + "URL": "https://shop.siyi.biz/products/siyi-mk32" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "SBUS" + }, + "Notes": "MK32 RADIO COMBO " + }, + "Telemetry": { + "Product": { + "Manufacturer": "SIYI", + "Model": "mk32 RADIO", + "Version": "", + "URL": "https://shop.siyi.biz/products/siyi-mk32" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "mk32 COMBO RADIO " } }, "Program version": "2.0.1", diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json index b3ea07586..a5306aa5e 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Hex/ProfiCNC,CubePilot", "Model": "CubeOrangePlus", - "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-module-overview", - "Version": "1.0" + "Version": "1.0", + "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-module-overview" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "HOVERIT", "Model": "BAAZ v2", - "URL": "https://hoverit.in/baaz-1", - "Version": "v2" + "Version": "v2", + "URL": "https://hoverit.in/baaz-1" }, "Specifications": { "TOW min Kg": 56, @@ -30,72 +30,12 @@ }, "Notes": "z50 eft frame" }, - "RC Controller": { - "Product": { - "Manufacturer": "SIYI", - "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "mk32 COMBO" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "SIYI", - "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "mk32 COMBO" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "SIYI", - "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "SBUS" - }, - "Notes": "MK32 RADIO COMBO" - }, - "Telemetry": { - "Product": { - "Manufacturer": "SIYI", - "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "mk32 COMBO RADIO" - }, "Battery Monitor": { "Product": { "Manufacturer": "HOBBYWING", "Model": "XRotor X13-14S", - "URL": "https://www.hobbywing.com/en/products/xrotorx13", - "Version": "" + "Version": "", + "URL": "https://www.hobbywing.com/en/products/xrotorx13" }, "Firmware": { "Type": "https://www.hobbywing.com/en/products/datalinkv2273", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "HOVERIT", "Model": "160Ah", - "URL": "https://hoverit.in/home", - "Version": "160ah baaz" + "Version": "160ah baaz", + "URL": "https://hoverit.in/home" }, "Specifications": { "Chemistry": "LiIonSS", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "XRotor X13-14S", - "URL": "https://www.hobbywing.com/en/products/xrotorx13", - "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm" + "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm", + "URL": "https://www.hobbywing.com/en/products/xrotorx13" }, "Firmware": { "Type": "", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "XRotor X13-14S", - "URL": "https://www.hobbywing.com/en/products/xrotorx13", - "Version": "" + "Version": "", + "URL": "https://www.hobbywing.com/en/products/xrotorx13" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "56*20''", - "URL": "https://www.amazon.com/HAWEWE-Hobbywing-Plastics-Propeller-Agricultural/dp/B0CH7WLPCG", - "Version": "" + "Version": "", + "URL": "https://www.amazon.com/HAWEWE-Hobbywing-Plastics-Propeller-Agricultural/dp/B0CH7WLPCG" }, "Specifications": { "Diameter_inches": 56 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "CubePilot HEX", "Model": "com.cubepilot.here4", - "URL": "https://docs.cubepilot.org/user-guides/here-4/here-4-manual", - "Version": "1.12" + "Version": "1.12", + "URL": "https://docs.cubepilot.org/user-guides/here-4/here-4-manual" }, "Firmware": { "Type": "", @@ -181,6 +121,66 @@ "Protocol": "DroneCAN" }, "Notes": "RTK GNSS receiver HERE 4" + }, + "RC Controller": { + "Product": { + "Manufacturer": "SIYI", + "Model": "mk32 RADIO", + "Version": "1", + "URL": "https://shop.siyi.biz/products/siyi-mk32" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "mk32 COMBO" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "SIYI", + "Model": "mk32 RADIO", + "Version": "1", + "URL": "https://shop.siyi.biz/products/siyi-mk32" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "mk32 COMBO" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "SIYI", + "Model": "mk32 RADIO", + "Version": "1", + "URL": "https://shop.siyi.biz/products/siyi-mk32" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "SBUS" + }, + "Notes": "MK32 RADIO COMBO" + }, + "Telemetry": { + "Product": { + "Manufacturer": "SIYI", + "Model": "mk32 RADIO", + "Version": "", + "URL": "https://shop.siyi.biz/products/siyi-mk32" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "mk32 COMBO RADIO" } }, "Program version": "2.0.1", diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json index 794df82c9..584a3a5f2 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Mamba", "Model": "H743", - "URL": "", - "Version": "V4" + "Version": "V4", + "URL": "" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Armattan", "Model": "Marmotte", - "URL": "", - "Version": "5v2" + "Version": "5v2", + "URL": "" }, "Specifications": { "TOW min Kg": 0.7, @@ -30,72 +30,12 @@ }, "Notes": "" }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "TX16S", - "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller", - "Version": "MKI" - }, - "Firmware": { - "Type": "EdgeTx", - "Version": "2.9.2-providence" - }, - "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "TBS", - "Model": "TRACER Micro TX", - "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx", - "Version": "2" - }, - "Firmware": { - "Type": "Crossfire TX", - "Version": "4.0.0" - }, - "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "TBS", - "Model": "Crossfire RX se", - "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se", - "Version": "" - }, - "Firmware": { - "Type": "Crossfire", - "Version": "7" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "All" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Espressif", - "Model": "ESP32 WROOM", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "dronebridge", - "Version": "1.5" - }, - "FC Connection": { - "Type": "SERIAL2", - "Protocol": "MAVLink2" - }, - "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" - }, "Battery Monitor": { "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "3" + "Version": "3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "SLS", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "Mamba System", "Model": "F45_128k 4in1 ESC", - "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc", - "Version": "1" + "Version": "1", + "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc" }, "Firmware": { "Type": "BLHeli32", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "T-Motor 15507 3800kv", - "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s", - "Version": "" + "Version": "", + "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HQProp", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Diameter_inches": 5 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "H-RTK F9P Helical", - "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445" }, "Firmware": { "Type": "UBlox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "A very good receiver with an excellent antenna https://docs.holybro.com/gps-and-rtk-system/gps-led-and-buzzer/status-led-changes" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "TX16S", + "Version": "MKI", + "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller" + }, + "Firmware": { + "Type": "EdgeTx", + "Version": "2.9.2-providence" + }, + "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "TBS", + "Model": "TRACER Micro TX", + "Version": "2", + "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx" + }, + "Firmware": { + "Type": "Crossfire TX", + "Version": "4.0.0" + }, + "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "TBS", + "Model": "Crossfire RX se", + "Version": "", + "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se" + }, + "Firmware": { + "Type": "Crossfire", + "Version": "7" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "All" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Espressif", + "Model": "ESP32 WROOM", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "dronebridge", + "Version": "1.5" + }, + "FC Connection": { + "Type": "SERIAL2", + "Protocol": "MAVLink2" + }, + "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json index f4716f057..cadded6e9 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "CubeOrange", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "ReadyToSky", "Model": "ZD550", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "TOW min Kg": 2.884, @@ -30,72 +30,12 @@ }, "Notes": "10-14\" Props" }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "TX16S", - "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller", - "Version": "MKI" - }, - "Firmware": { - "Type": "EdgeTx", - "Version": "2.9.2-providence" - }, - "Notes": "" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "BetaFPV", - "Model": "ExpressLRS 1W", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "Matek", - "Model": "ExpressLRS Diversity", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL5", - "Protocol": "CRSF" - }, - "Notes": "ExpressLRS" - }, - "Telemetry": { - "Product": { - "Manufacturer": "mRo", - "Model": "SiK 915Mhz", - "URL": "https://mrobotics.io/docs/mro-sik-telemetry-radio-v2/", - "Version": "" - }, - "Firmware": { - "Type": "SiK", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink High Latency" - }, - "Notes": "" - }, "Battery Monitor": { "Product": { "Manufacturer": "Cube", "Model": "Orange", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "ArduCopter", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "Zeee", "Model": "6S 6500mAh LiHV", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Chemistry": "LipoHV", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "iFlight", "Model": "Blitz 4-in-1 80A", - "URL": "https://shop.iflight.com/BLITZ-E80-4-IN1-Pro-ESC-G2-Pro1770", - "Version": "" + "Version": "", + "URL": "https://shop.iflight.com/BLITZ-E80-4-IN1-Pro-ESC-G2-Pro1770" }, "Firmware": { "Type": "BLHeli32", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "iFlight", "Model": "Xing 4214", - "URL": "https://shop.iflight.com/xing-x4214-2-8s-x-class-fpv-nextgen-motor-pro802", - "Version": "660KV" + "Version": "660KV", + "URL": "https://shop.iflight.com/xing-x4214-2-8s-x-class-fpv-nextgen-motor-pro802" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "Master Airscrew", "Model": "11x3, 10 pitch", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Diameter_inches": 11 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Cube", "Model": "Here3", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "DroneCAN/uBlox", @@ -181,6 +121,66 @@ "Protocol": "DroneCAN" }, "Notes": "" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "TX16S", + "Version": "MKI", + "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller" + }, + "Firmware": { + "Type": "EdgeTx", + "Version": "2.9.2-providence" + }, + "Notes": "" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "BetaFPV", + "Model": "ExpressLRS 1W", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "Matek", + "Model": "ExpressLRS Diversity", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL5", + "Protocol": "CRSF" + }, + "Notes": "ExpressLRS" + }, + "Telemetry": { + "Product": { + "Manufacturer": "mRo", + "Model": "SiK 915Mhz", + "Version": "", + "URL": "https://mrobotics.io/docs/mro-sik-telemetry-radio-v2/" + }, + "Firmware": { + "Type": "SiK", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink High Latency" + }, + "Notes": "" } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json index 7a2dd1e21..f1bc9bcd6 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "MicoAir", "Model": "MicoAir743v2", - "URL": "https://micoair.com/flightcontroller_micoair743v2/", - "Version": "" + "Version": "", + "URL": "https://micoair.com/flightcontroller_micoair743v2/" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Tarot", "Model": "FY680", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "TOW min Kg": 1.6, @@ -30,72 +30,12 @@ }, "Notes": "With or without 1 Gallon of water (for spraying my small garden/vineyard)" }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "Pocket", - "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller", - "Version": "" - }, - "Firmware": { - "Type": "EdgeTx", - "Version": "\"Centurion\" v2.10.6" - }, - "Notes": "Yaapu telem installed, this is just the controller with the sticks. Some controllers do not include the RC transmitter, this one does." - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "internal", - "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2", - "Version": "Pocket" - }, - "Firmware": { - "Type": "ELRS (internal)", - "Version": "3.4.3" - }, - "Notes": "Using the internal RF module" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "BetaFPV", - "Model": "SuperD ELRS Diversity 2.4GHz", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "ExpressLRS", - "Version": "3.5.5" - }, - "FC Connection": { - "Type": "SERIAL6", - "Protocol": "CRSF" - }, - "Notes": "Diversity, ExpressLRS 2.4GHz to match my radio, ELRS may need to be updated via WiFi or FTDI to bind\\." - }, - "Telemetry": { - "Product": { - "Manufacturer": "MicoAir", - "Model": "LR24Fmini", - "URL": "https://store.micoair.com/product/lr24-telemetry-radio/", - "Version": "24F mini" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "UART1 For Telemetry Module. Bluetooth Telem is UART8." - }, "Battery Monitor": { "Product": { "Manufacturer": "MicoAir", "Model": "4in1 ESC 60A", - "URL": "https://store.micoair.com/product/micoair743-v2/?attribute_type=Only+FC&attribute_pa_firmware_1=ardupilot", - "Version": "" + "Version": "", + "URL": "https://store.micoair.com/product/micoair743-v2/?attribute_type=Only+FC&attribute_pa_firmware_1=ardupilot" }, "Firmware": { "Type": "BlueJay", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "Ovonic", "Model": "Orange", - "URL": "", - "Version": "5500mAh 6S 75C" + "Version": "5500mAh 6S 75C", + "URL": "" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "MicoAir", "Model": "60A BlueJay", - "URL": "https://store.micoair.com/product/micoair743-v2/?attribute_type=Only+FC&attribute_pa_firmware_1=ardupilot", - "Version": "1" + "Version": "1", + "URL": "https://store.micoair.com/product/micoair743-v2/?attribute_type=Only+FC&attribute_pa_firmware_1=ardupilot" }, "Firmware": { "Type": "BlueJay", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "Generic", "Model": "3115-900KV", - "URL": "https://www.aliexpress.us/item/3256807108933595.html?spm=a2g0o.order_list.order_list_main.5.13841802tr0Uqr&gatewayAdapt=glo2usa", - "Version": "" + "Version": "", + "URL": "https://www.aliexpress.us/item/3256807108933595.html?spm=a2g0o.order_list.order_list_main.5.13841802tr0Uqr&gatewayAdapt=glo2usa" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HQPROP", "Model": "10x5x3", - "URL": "https://holybro.com/collections/multicopter-kit/products/spare-parts-x500-v2-kit?variant=41591073669309", - "Version": "" + "Version": "", + "URL": "https://holybro.com/collections/multicopter-kit/products/spare-parts-x500-v2-kit?variant=41591073669309" }, "Specifications": { "Diameter_inches": 10.0 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "MicoAir", "Model": "MG-A01", - "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL" }, "Firmware": { "Type": "Ublox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "uBlox M10 GNSS with compass running on the I2C bus" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "Pocket", + "Version": "", + "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller" + }, + "Firmware": { + "Type": "EdgeTx", + "Version": "\"Centurion\" v2.10.6" + }, + "Notes": "Yaapu telem installed, this is just the controller with the sticks. Some controllers do not include the RC transmitter, this one does." + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "internal", + "Version": "Pocket", + "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2" + }, + "Firmware": { + "Type": "ELRS (internal)", + "Version": "3.4.3" + }, + "Notes": "Using the internal RF module" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "BetaFPV", + "Model": "SuperD ELRS Diversity 2.4GHz", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "ExpressLRS", + "Version": "3.5.5" + }, + "FC Connection": { + "Type": "SERIAL6", + "Protocol": "CRSF" + }, + "Notes": "Diversity, ExpressLRS 2.4GHz to match my radio, ELRS may need to be updated via WiFi or FTDI to bind\\." + }, + "Telemetry": { + "Product": { + "Manufacturer": "MicoAir", + "Model": "LR24Fmini", + "Version": "24F mini", + "URL": "https://store.micoair.com/product/lr24-telemetry-radio/" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "UART1 For Telemetry Module. Bluetooth Telem is UART8." } }, "Program version": "2.3.0", diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json index e7505652f..b1102ea3e 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Pixhawk6X", - "URL": "https://holybro.com/products/pixhawk-6x", - "Version": "Standard v1" + "Version": "Standard v1", + "URL": "https://holybro.com/products/pixhawk-6x" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Tarot", "Model": "X4", - "URL": "http://www.tarotrc.com/Product/Detail.aspx?Lang=en&Id=3c47ef4b-df8a-40f1-b43e-64b6364e9882", - "Version": "Custom" + "Version": "Custom", + "URL": "http://www.tarotrc.com/Product/Detail.aspx?Lang=en&Id=3c47ef4b-df8a-40f1-b43e-64b6364e9882" }, "Specifications": { "TOW min Kg": 5, @@ -30,72 +30,12 @@ }, "Notes": "A frame with 960mm diameter (motor to notor) using T-Motor MN7005(7206) propulsion sets for 25mm tube arms" }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "Boxer", - "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2", - "Version": "M2 ELRS LBT (EU)" - }, - "Firmware": { - "Type": "EdgeTx", - "Version": "2.10.2" - }, - "Notes": "Yaapu telem included. 2.4 GHz RC transmitter included." - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "internal", - "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2", - "Version": "M2" - }, - "Firmware": { - "Type": "ELRS (internal)", - "Version": "3.4.3" - }, - "Notes": "Using the internal RF module" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "RPTD4 ExpressLRS 2.4Ghz diversity receiver", - "URL": "https://www.radiomasterrc.com/products/rp4td-expresslrs-2-4ghz-diversity-receiver", - "Version": "EU LBT" - }, - "Firmware": { - "Type": "ELRS", - "Version": "3.4.3" - }, - "FC Connection": { - "Type": "SERIAL6", - "Protocol": "CRSF" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Espressif", - "Model": "Xiao ESP32C3", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "Serial Bridge Custom", - "Version": "1.0" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "A cheap ESP Now based alternative to the more commonly used 3DR and RFDesigns telemetry modems. Custom developed firmware." - }, "Battery Monitor": { "Product": { "Manufacturer": "Holybro", "Model": "PM02D HV Power Module", - "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02d-power-module", - "Version": "HV" + "Version": "HV", + "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02d-power-module" }, "Firmware": { "Type": "HolyBro", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "Custom made", "Model": "6S 30Ah", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Chemistry": "LiIon", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "STAR 50 iESC", - "URL": "https://iha-race.com/de/producto/dron-t-motor-m1000/", - "Version": "" + "Version": "", + "URL": "https://iha-race.com/de/producto/dron-t-motor-m1000/" }, "Firmware": { "Type": "T-Motor", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "T-Motor MN7005(7206) 230KV", - "URL": "https://store.tmotor.com/product/mn7005-kv230-motor-antigravity-type.html", - "Version": "" + "Version": "", + "URL": "https://store.tmotor.com/product/mn7005-kv230-motor-antigravity-type.html" }, "Specifications": { "Poles": 28 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "Mejzlik", "Model": "24 x 8.1", - "URL": "https://www.mejzlik.eu", - "Version": "LAF" + "Version": "LAF", + "URL": "https://www.mejzlik.eu" }, "Specifications": { "Diameter_inches": 24 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "M9N GPS", - "URL": "https://holybro.com/products/m9n-gps", - "Version": "Standard" + "Version": "Standard", + "URL": "https://holybro.com/products/m9n-gps" }, "Firmware": { "Type": "ublox", @@ -181,6 +121,66 @@ "Protocol": "AUTO" }, "Notes": "Standard GPS" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "Boxer", + "Version": "M2 ELRS LBT (EU)", + "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2" + }, + "Firmware": { + "Type": "EdgeTx", + "Version": "2.10.2" + }, + "Notes": "Yaapu telem included. 2.4 GHz RC transmitter included." + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "internal", + "Version": "M2", + "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2" + }, + "Firmware": { + "Type": "ELRS (internal)", + "Version": "3.4.3" + }, + "Notes": "Using the internal RF module" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "RPTD4 ExpressLRS 2.4Ghz diversity receiver", + "Version": "EU LBT", + "URL": "https://www.radiomasterrc.com/products/rp4td-expresslrs-2-4ghz-diversity-receiver" + }, + "Firmware": { + "Type": "ELRS", + "Version": "3.4.3" + }, + "FC Connection": { + "Type": "SERIAL6", + "Protocol": "CRSF" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Espressif", + "Model": "Xiao ESP32C3", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "Serial Bridge Custom", + "Version": "1.0" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "A cheap ESP Now based alternative to the more commonly used 3DR and RFDesigns telemetry modems. Custom developed firmware." } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json index 094a48949..947bcc592 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "CubeOrange", - "URL": "https://www.robotshop.com/products/cubepilot-the-cube-orange-standard-set-ads-b-carrier-board", - "Version": "1.0" + "Version": "1.0", + "URL": "https://www.robotshop.com/products/cubepilot-the-cube-orange-standard-set-ads-b-carrier-board" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Papa Seleckis", "Model": "Custom Aluminum", - "URL": "", - "Version": "30 Kg payload" + "Version": "30 Kg payload", + "URL": "" }, "Specifications": { "TOW min Kg": 20, @@ -30,72 +30,12 @@ }, "Notes": "Frame is custom, X type frame, the middle is welded. Arm length is 1950mm." }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiolink", - "Model": "AT9S Pro", - "URL": "https://www.amazon.com/Radiolink-Remote-Controller-Receiver-Helicopter/dp/B07VC3VJGM?th=1", - "Version": "" - }, - "Firmware": { - "Type": "AT9S", - "Version": "V1.2.9" - }, - "Notes": "It has 10 channels and an integrated RC transmitter" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "", - "Model": "", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "integrated in RC controller" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "RadioLink", - "Model": "R9DS", - "URL": "https://www.amazon.com/Radiolink-2-4GHz-Receiver-Spectrum-Compatible/dp/B01KX3IVOK", - "Version": "V2.0" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "SBUS_NI" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Holybro", - "Model": "Microhard Radio P840", - "URL": "https://holybro.com/products/microhard-radio?variant=41473588265149", - "Version": "" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "High range and strength telemetry." - }, "Battery Monitor": { "Product": { "Manufacturer": "CubePilot", "Model": "HX4-06008", - "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-user-manual#power-module-connection", - "Version": "PB01A21" + "Version": "PB01A21", + "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-user-manual#power-module-connection" }, "Firmware": { "Type": "", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "Gens Ace", "Model": "Tattu 6C 30000mAh", - "URL": "https://genstattu.com/tattu-g-tech-30000mah-6s-22-2v-25c-lipo-battery-pack-with-as150u-f-plug/", - "Version": "AS150U-F" + "Version": "AS150U-F", + "URL": "https://genstattu.com/tattu-g-tech-30000mah-6s-22-2v-25c-lipo-battery-pack-with-as150u-f-plug/" }, "Specifications": { "Chemistry": "LipoHV", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "X11 Plus", - "URL": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm", - "Version": "1" + "Version": "1", + "URL": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm" }, "Firmware": { "Type": "", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "X11 Plus 1118-85KV", - "URL": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm", - "Version": "" + "Version": "", + "URL": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "43\"", - "URL": "https://www.amazon.com/HAWEWE-Hobbywing-Plastics-Propeller-Agricultural/dp/B0CH7WLPCG", - "Version": "" + "Version": "", + "URL": "https://www.amazon.com/HAWEWE-Hobbywing-Plastics-Propeller-Agricultural/dp/B0CH7WLPCG" }, "Specifications": { "Diameter_inches": 43 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here 3", - "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual", - "Version": "1" + "Version": "1", + "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual" }, "Firmware": { "Type": "UBlox", @@ -181,6 +121,66 @@ "Protocol": "DroneCAN" }, "Notes": "uBlox M8P GNSS with a patch antenna." + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiolink", + "Model": "AT9S Pro", + "Version": "", + "URL": "https://www.amazon.com/Radiolink-Remote-Controller-Receiver-Helicopter/dp/B07VC3VJGM?th=1" + }, + "Firmware": { + "Type": "AT9S", + "Version": "V1.2.9" + }, + "Notes": "It has 10 channels and an integrated RC transmitter" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "", + "Model": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "integrated in RC controller" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "RadioLink", + "Model": "R9DS", + "Version": "V2.0", + "URL": "https://www.amazon.com/Radiolink-2-4GHz-Receiver-Spectrum-Compatible/dp/B01KX3IVOK" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "SBUS_NI" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Holybro", + "Model": "Microhard Radio P840", + "Version": "", + "URL": "https://holybro.com/products/microhard-radio?variant=41473588265149" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "High range and strength telemetry." } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json index ae8d94935..949c23ed1 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "V3" + "Version": "V3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Diatone", "Model": "Taycan MX-C", - "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone", - "Version": "2022" + "Version": "2022", + "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone" }, "Specifications": { "TOW min Kg": 0.6, @@ -30,72 +30,12 @@ }, "Notes": "A small 3'' ducted frame" }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "TX16S", - "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller", - "Version": "MKI" - }, - "Firmware": { - "Type": "EdgeTx", - "Version": "2.9.2-providence" - }, - "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "TBS", - "Model": "TRACER Micro TX", - "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx", - "Version": "2" - }, - "Firmware": { - "Type": "Crossfire TX", - "Version": "4.0.0" - }, - "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "TBS", - "Model": "Crossfire RX se", - "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se", - "Version": "" - }, - "Firmware": { - "Type": "Crossfire", - "Version": "7" - }, - "FC Connection": { - "Type": "SERIAL7", - "Protocol": "CRSF" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Espressif", - "Model": "ESP32 WROOM", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "dronebridge", - "Version": "1.5" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" - }, "Battery Monitor": { "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "3" + "Version": "3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "SLS", "Model": "X-Cube 1800mAh 4S1P 14,8V 40C/80C", - "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html", - "Version": "" + "Version": "", + "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "Mamba System", "Model": "F45_128k 4in1 ESC", - "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc", - "Version": "1" + "Version": "1", + "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc" }, "Firmware": { "Type": "BLHeli32", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "T-Motor 15507 3800kv", - "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s", - "Version": "" + "Version": "", + "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HQProp", "Model": "CineWhoop 3\", 8-Blade", - "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau", - "Version": "" + "Version": "", + "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau" }, "Specifications": { "Diameter_inches": 3 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "H-RTK F9P Helical", - "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445" }, "Firmware": { "Type": "UBlox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "A very good receiver with an excellent antenna https://docs.holybro.com/gps-and-rtk-system/gps-led-and-buzzer/status-led-changes" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "TX16S", + "Version": "MKI", + "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller" + }, + "Firmware": { + "Type": "EdgeTx", + "Version": "2.9.2-providence" + }, + "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "TBS", + "Model": "TRACER Micro TX", + "Version": "2", + "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx" + }, + "Firmware": { + "Type": "Crossfire TX", + "Version": "4.0.0" + }, + "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "TBS", + "Model": "Crossfire RX se", + "Version": "", + "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se" + }, + "Firmware": { + "Type": "Crossfire", + "Version": "7" + }, + "FC Connection": { + "Type": "SERIAL7", + "Protocol": "CRSF" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Espressif", + "Model": "ESP32 WROOM", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "dronebridge", + "Version": "1.5" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json index 927520359..5d075888a 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "V3" + "Version": "V3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Diatone", "Model": "Taycan MX-C", - "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone", - "Version": "2022" + "Version": "2022", + "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone" }, "Specifications": { "TOW min Kg": 0.6, @@ -30,72 +30,12 @@ }, "Notes": "A small 3'' ducted frame" }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "TX16S", - "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller", - "Version": "MKI" - }, - "Firmware": { - "Type": "EdgeTx", - "Version": "2.9.2-providence" - }, - "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "TBS", - "Model": "TRACER Micro TX", - "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx", - "Version": "2" - }, - "Firmware": { - "Type": "Crossfire TX", - "Version": "4.0.0" - }, - "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "TBS", - "Model": "Crossfire RX se", - "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se", - "Version": "" - }, - "Firmware": { - "Type": "Crossfire", - "Version": "7" - }, - "FC Connection": { - "Type": "SERIAL7", - "Protocol": "CRSF" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Espressif", - "Model": "ESP32 WROOM", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "dronebridge", - "Version": "1.5" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" - }, "Battery Monitor": { "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "3" + "Version": "3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "SLS", "Model": "X-Cube 1800mAh 4S1P 14,8V 40C/80C", - "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html", - "Version": "" + "Version": "", + "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "Mamba System", "Model": "F45_128k 4in1 ESC", - "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc", - "Version": "1" + "Version": "1", + "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc" }, "Firmware": { "Type": "BLHeli32", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "T-Motor 15507 3800kv", - "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s", - "Version": "" + "Version": "", + "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HQProp", "Model": "CineWhoop 3\", 8-Blade", - "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau", - "Version": "" + "Version": "", + "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau" }, "Specifications": { "Diameter_inches": 3 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "H-RTK F9P Helical", - "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445" }, "Firmware": { "Type": "UBlox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "A very good receiver with an excellent antenna https://docs.holybro.com/gps-and-rtk-system/gps-led-and-buzzer/status-led-changes" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "TX16S", + "Version": "MKI", + "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller" + }, + "Firmware": { + "Type": "EdgeTx", + "Version": "2.9.2-providence" + }, + "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "TBS", + "Model": "TRACER Micro TX", + "Version": "2", + "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx" + }, + "Firmware": { + "Type": "Crossfire TX", + "Version": "4.0.0" + }, + "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "TBS", + "Model": "Crossfire RX se", + "Version": "", + "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se" + }, + "Firmware": { + "Type": "Crossfire", + "Version": "7" + }, + "FC Connection": { + "Type": "SERIAL7", + "Protocol": "CRSF" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Espressif", + "Model": "ESP32 WROOM", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "dronebridge", + "Version": "1.5" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json index 07e33f750..c95b952c9 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "V3" + "Version": "V3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Diatone", "Model": "Taycan MX-C", - "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone", - "Version": "2022" + "Version": "2022", + "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone" }, "Specifications": { "TOW min Kg": 0.6, @@ -30,72 +30,12 @@ }, "Notes": "A small 3'' ducted frame" }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "TX16S", - "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller", - "Version": "MKI" - }, - "Firmware": { - "Type": "EdgeTx", - "Version": "2.9.2-providence" - }, - "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "TBS", - "Model": "TRACER Micro TX", - "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx", - "Version": "2" - }, - "Firmware": { - "Type": "Crossfire TX", - "Version": "4.0.0" - }, - "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "TBS", - "Model": "Crossfire RX se", - "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se", - "Version": "" - }, - "Firmware": { - "Type": "Crossfire", - "Version": "7" - }, - "FC Connection": { - "Type": "SERIAL7", - "Protocol": "CRSF" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Espressif", - "Model": "ESP32 WROOM", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "dronebridge", - "Version": "1.5" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" - }, "Battery Monitor": { "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "3" + "Version": "3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "SLS", "Model": "X-Cube 1800mAh 4S1P 14,8V 40C/80C", - "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html", - "Version": "" + "Version": "", + "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "Mamba System", "Model": "F45_128k 4in1 ESC", - "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc", - "Version": "1" + "Version": "1", + "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc" }, "Firmware": { "Type": "BLHeli32", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "F15507", - "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s", - "Version": "3800kv" + "Version": "3800kv", + "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HQProp", "Model": "CineWhoop 3\", 8-Blade", - "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau", - "Version": "" + "Version": "", + "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau" }, "Specifications": { "Diameter_inches": 3 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "H-RTK F9P Helical", - "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445" }, "Firmware": { "Type": "UBlox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "A very good receiver with an excellent antenna https://docs.holybro.com/gps-and-rtk-system/gps-led-and-buzzer/status-led-changes" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "TX16S", + "Version": "MKI", + "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller" + }, + "Firmware": { + "Type": "EdgeTx", + "Version": "2.9.2-providence" + }, + "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "TBS", + "Model": "TRACER Micro TX", + "Version": "2", + "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx" + }, + "Firmware": { + "Type": "Crossfire TX", + "Version": "4.0.0" + }, + "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "TBS", + "Model": "Crossfire RX se", + "Version": "", + "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se" + }, + "Firmware": { + "Type": "Crossfire", + "Version": "7" + }, + "FC Connection": { + "Type": "SERIAL7", + "Protocol": "CRSF" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Espressif", + "Model": "ESP32 WROOM", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "dronebridge", + "Version": "1.5" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json index 8aa644b02..0f028a522 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "V3" + "Version": "V3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "Diatone", "Model": "Taycan MX-C", - "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone", - "Version": "2022" + "Version": "2022", + "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone" }, "Specifications": { "TOW min Kg": 0.6, @@ -30,72 +30,12 @@ }, "Notes": "A small 3'' ducted frame" }, - "RC Controller": { - "Product": { - "Manufacturer": "Radiomaster", - "Model": "TX16S", - "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller", - "Version": "MKI" - }, - "Firmware": { - "Type": "EdgeTx", - "Version": "2.9.2-providence" - }, - "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "TBS", - "Model": "TRACER Micro TX", - "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx", - "Version": "2" - }, - "Firmware": { - "Type": "Crossfire TX", - "Version": "4.0.0" - }, - "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "TBS", - "Model": "Crossfire RX se", - "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se", - "Version": "" - }, - "Firmware": { - "Type": "Crossfire", - "Version": "7" - }, - "FC Connection": { - "Type": "SERIAL7", - "Protocol": "CRSF" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "Espressif", - "Model": "ESP32 WROOM", - "URL": "", - "Version": "" - }, - "Firmware": { - "Type": "dronebridge", - "Version": "1.5" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" - }, "Battery Monitor": { "Product": { "Manufacturer": "Matek", "Model": "H743 SLIM", - "URL": "https://www.mateksys.com/?portfolio=h743-slim", - "Version": "3" + "Version": "3", + "URL": "https://www.mateksys.com/?portfolio=h743-slim" }, "Firmware": { "Type": "ArduCopter", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "SLS", "Model": "X-Cube 1800mAh 4S1P 14,8V 40C/80C", - "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html", - "Version": "" + "Version": "", + "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "Mamba System", "Model": "F45_128k 4in1 ESC", - "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc", - "Version": "1" + "Version": "1", + "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc" }, "Firmware": { "Type": "BLHeli32", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "T-Motor 15507 3800kv", - "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s", - "Version": "" + "Version": "", + "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s" }, "Specifications": { "Poles": 14 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "HQProp", "Model": "CineWhoop 3\", 8-Blade", - "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau", - "Version": "" + "Version": "", + "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau" }, "Specifications": { "Diameter_inches": 3 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "H-RTK F9P Helical", - "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445" }, "Firmware": { "Type": "UBlox", @@ -181,6 +121,66 @@ "Protocol": "uBlox" }, "Notes": "A very good receiver with an excellent antenna https://docs.holybro.com/gps-and-rtk-system/gps-led-and-buzzer/status-led-changes" + }, + "RC Controller": { + "Product": { + "Manufacturer": "Radiomaster", + "Model": "TX16S", + "Version": "MKI", + "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller" + }, + "Firmware": { + "Type": "EdgeTx", + "Version": "2.9.2-providence" + }, + "Notes": "Yaapu telem included, this is just the controller with the sticks. Some controllers include the RC transmitter, this one does not." + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "TBS", + "Model": "TRACER Micro TX", + "Version": "2", + "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx" + }, + "Firmware": { + "Type": "Crossfire TX", + "Version": "4.0.0" + }, + "Notes": "This RC transmitter piggie-backs on the back of the Radiomaster TX16S" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "TBS", + "Model": "Crossfire RX se", + "Version": "", + "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se" + }, + "Firmware": { + "Type": "Crossfire", + "Version": "7" + }, + "FC Connection": { + "Type": "SERIAL7", + "Protocol": "CRSF" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "Espressif", + "Model": "ESP32 WROOM", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "dronebridge", + "Version": "1.5" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems" } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json index 36f78f5e5..66605a72e 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json @@ -5,12 +5,12 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "ArduCopter", - "Version": "4.5.x" + "Version": "4.5.7" }, "Specifications": { "MCU Series": "" @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "TOW min Kg": 0.1, @@ -30,155 +30,155 @@ }, "Notes": "" }, - "RC Controller": { + "Battery Monitor": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, + "FC Connection": { + "Type": "None", + "Protocol": "None" + }, "Notes": "" }, - "RC Transmitter": { + "Battery": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Firmware": { - "Type": "", - "Version": "" + "Specifications": { + "Chemistry": "Lipo", + "Volt per cell max": 4.2, + "Volt per cell low": 3.6, + "Volt per cell crit": 3.55, + "Number of cells": 0, + "Capacity mAh": 0 }, "Notes": "" }, - "RC Receiver": { + "ESC": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "All" + "Type": "Main Out", + "Protocol": "Normal" }, "Notes": "" }, - "Telemetry": { + "Motors": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" + "Specifications": { + "Poles": 14 }, "Notes": "" }, - "Battery Monitor": { + "Propellers": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "None", - "Protocol": "None" + "Specifications": { + "Diameter_inches": 0 }, "Notes": "" }, - "Battery": { + "GNSS Receiver": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", "Version": "" }, - "Specifications": { - "Chemistry": "Lipo", - "Volt per cell max": 4.2, - "Volt per cell low": 3.6, - "Volt per cell crit": 3.55, - "Number of cells": 0, - "Capacity mAh": 0 + "FC Connection": { + "Type": "SERIAL3", + "Protocol": "AUTO" }, "Notes": "" }, - "ESC": { + "RC Controller": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, - "FC Connection": { - "Type": "Main Out", - "Protocol": "Normal" - }, "Notes": "" }, - "Motors": { + "RC Transmitter": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Specifications": { - "Poles": 14 + "Firmware": { + "Type": "", + "Version": "" }, "Notes": "" }, - "Propellers": { + "RC Receiver": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", "Version": "" }, - "Specifications": { - "Diameter_inches": 0 + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "All" }, "Notes": "" }, - "GNSS Receiver": { + "Telemetry": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, "FC Connection": { - "Type": "SERIAL3", - "Protocol": "AUTO" + "Type": "SERIAL1", + "Protocol": "MAVLink2" }, "Notes": "" } diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json index 624ce7d65..89fca9378 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json @@ -5,12 +5,12 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "ArduCopter", - "Version": "4.6.x" + "Version": "4.6.3" }, "Specifications": { "MCU Series": "" @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "TOW min Kg": 0.1, @@ -30,155 +30,155 @@ }, "Notes": "" }, - "RC Controller": { + "Battery Monitor": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, + "FC Connection": { + "Type": "None", + "Protocol": "None" + }, "Notes": "" }, - "RC Transmitter": { + "Battery": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Firmware": { - "Type": "", - "Version": "" + "Specifications": { + "Chemistry": "Lipo", + "Volt per cell max": 4.2, + "Volt per cell low": 3.6, + "Volt per cell crit": 3.55, + "Number of cells": 0, + "Capacity mAh": 0 }, "Notes": "" }, - "RC Receiver": { + "ESC": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "All" + "Type": "Main Out", + "Protocol": "Normal" }, "Notes": "" }, - "Telemetry": { + "Motors": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" + "Specifications": { + "Poles": 14 }, "Notes": "" }, - "Battery Monitor": { + "Propellers": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "None", - "Protocol": "None" + "Specifications": { + "Diameter_inches": 0 }, "Notes": "" }, - "Battery": { + "GNSS Receiver": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", "Version": "" }, - "Specifications": { - "Chemistry": "Lipo", - "Volt per cell max": 4.2, - "Volt per cell low": 3.6, - "Volt per cell crit": 3.55, - "Number of cells": 0, - "Capacity mAh": 0 + "FC Connection": { + "Type": "SERIAL3", + "Protocol": "AUTO" }, "Notes": "" }, - "ESC": { + "RC Controller": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, - "FC Connection": { - "Type": "Main Out", - "Protocol": "Normal" - }, "Notes": "" }, - "Motors": { + "RC Transmitter": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Specifications": { - "Poles": 14 + "Firmware": { + "Type": "", + "Version": "" }, "Notes": "" }, - "Propellers": { + "RC Receiver": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", "Version": "" }, - "Specifications": { - "Diameter_inches": 0 + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "All" }, "Notes": "" }, - "GNSS Receiver": { + "Telemetry": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, "FC Connection": { - "Type": "SERIAL3", - "Protocol": "AUTO" + "Type": "SERIAL1", + "Protocol": "MAVLink2" }, "Notes": "" } diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json index 42a596618..df5bead3b 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "ArduPlane", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "TOW min Kg": 5, @@ -30,155 +30,155 @@ }, "Notes": "" }, - "RC Controller": { + "Battery Monitor": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, + "FC Connection": { + "Type": "Analog", + "Protocol": "Analog Voltage and Current" + }, "Notes": "" }, - "RC Transmitter": { + "Battery": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Firmware": { - "Type": "", - "Version": "" + "Specifications": { + "Chemistry": "Lipo", + "Volt per cell max": 4.2, + "Volt per cell low": 3.8, + "Volt per cell crit": 3.5, + "Number of cells": 6, + "Capacity mAh": 3300 }, "Notes": "" }, - "RC Receiver": { + "ESC": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, "FC Connection": { - "Type": "SERIAL2", - "Protocol": "All" + "Type": "Main Out", + "Protocol": "Normal" }, "Notes": "" }, - "Telemetry": { + "Motors": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL4", - "Protocol": "MAVLink2" + "Specifications": { + "Poles": 14 }, "Notes": "" }, - "Battery Monitor": { + "Propellers": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "Analog", - "Protocol": "Analog Voltage and Current" + "Specifications": { + "Diameter_inches": 9 }, "Notes": "" }, - "Battery": { + "GNSS Receiver": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", "Version": "" }, - "Specifications": { - "Chemistry": "Lipo", - "Volt per cell max": 4.2, - "Volt per cell low": 3.8, - "Volt per cell crit": 3.5, - "Number of cells": 6, - "Capacity mAh": 3300 + "FC Connection": { + "Type": "SERIAL3", + "Protocol": "AUTO" }, "Notes": "" }, - "ESC": { + "RC Controller": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, - "FC Connection": { - "Type": "Main Out", - "Protocol": "Normal" - }, "Notes": "" }, - "Motors": { + "RC Transmitter": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, - "Specifications": { - "Poles": 14 + "Firmware": { + "Type": "", + "Version": "" }, "Notes": "" }, - "Propellers": { + "RC Receiver": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", + "Version": "", + "URL": "" + }, + "Firmware": { + "Type": "", "Version": "" }, - "Specifications": { - "Diameter_inches": 9 + "FC Connection": { + "Type": "SERIAL2", + "Protocol": "All" }, "Notes": "" }, - "GNSS Receiver": { + "Telemetry": { "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", "Version": "" }, "FC Connection": { - "Type": "SERIAL3", - "Protocol": "AUTO" + "Type": "SERIAL4", + "Protocol": "MAVLink2" }, "Notes": "" } diff --git a/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json index b405b3127..79e57bdaa 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json +++ b/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json @@ -5,8 +5,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "CubeOrange", - "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-module-overview", - "Version": "2" + "Version": "2", + "URL": "https://docs.cubepilot.org/user-guides/autopilot/the-cube-module-overview" }, "Firmware": { "Type": "Rover", @@ -21,8 +21,8 @@ "Product": { "Manufacturer": "AION robotics", "Model": "R1", - "URL": "https://www.aionrobotics.com/", - "Version": "" + "Version": "", + "URL": "https://www.aionrobotics.com/" }, "Specifications": { "TOW min Kg": 0.6, @@ -30,72 +30,12 @@ }, "Notes": "" }, - "RC Controller": { - "Product": { - "Manufacturer": "CubePilot", - "Model": "Herelink controller", - "URL": "https://docs.cubepilot.org/user-guides/herelink/herelink-overview", - "Version": "1.1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "" - }, - "RC Transmitter": { - "Product": { - "Manufacturer": "CubePilot", - "Model": "Herelink controller", - "URL": "https://docs.cubepilot.org/user-guides/herelink/herelink-overview", - "Version": "1.1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "Notes": "This RC transmitter is integrated inside the Herelink above" - }, - "RC Receiver": { - "Product": { - "Manufacturer": "CubePilot", - "Model": "Herelink airunit", - "URL": "https://docs.cubepilot.org/user-guides/herelink/herelink-overview", - "Version": "1.1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "RCin/SBUS", - "Protocol": "All" - }, - "Notes": "This receiver is on the vehicle and is connected to the flight controller" - }, - "Telemetry": { - "Product": { - "Manufacturer": "CubePilot", - "Model": "Herelink", - "URL": "https://docs.cubepilot.org/user-guides/herelink/herelink-overview", - "Version": "1.1" - }, - "Firmware": { - "Type": "", - "Version": "" - }, - "FC Connection": { - "Type": "SERIAL1", - "Protocol": "MAVLink2" - }, - "Notes": "Integrated in the herelink controller and airunit" - }, "Battery Monitor": { "Product": { "Manufacturer": "3DR robotics", "Model": "Solo battery", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", @@ -111,8 +51,8 @@ "Product": { "Manufacturer": "3DR robotics", "Model": "Solo battery", - "URL": "https://www.ebay.com/p/2303831811", - "Version": "" + "Version": "", + "URL": "https://www.ebay.com/p/2303831811" }, "Specifications": { "Chemistry": "Lipo", @@ -128,8 +68,8 @@ "Product": { "Manufacturer": "AION robotics", "Model": "Unknown", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", @@ -145,8 +85,8 @@ "Product": { "Manufacturer": "AION robotics", "Model": "Unknown", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Poles": 3 @@ -157,8 +97,8 @@ "Product": { "Manufacturer": "", "Model": "", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Diameter_inches": 1 @@ -169,8 +109,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here4", - "URL": "https://docs.cubepilot.org/user-guides/here-4/here-4-manual", - "Version": "" + "Version": "", + "URL": "https://docs.cubepilot.org/user-guides/here-4/here-4-manual" }, "Firmware": { "Type": "UBlox", @@ -181,6 +121,66 @@ "Protocol": "DroneCAN" }, "Notes": "A very good receiver" + }, + "RC Controller": { + "Product": { + "Manufacturer": "CubePilot", + "Model": "Herelink controller", + "Version": "1.1", + "URL": "https://docs.cubepilot.org/user-guides/herelink/herelink-overview" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "" + }, + "RC Transmitter": { + "Product": { + "Manufacturer": "CubePilot", + "Model": "Herelink controller", + "Version": "1.1", + "URL": "https://docs.cubepilot.org/user-guides/herelink/herelink-overview" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "Notes": "This RC transmitter is integrated inside the Herelink above" + }, + "RC Receiver": { + "Product": { + "Manufacturer": "CubePilot", + "Model": "Herelink airunit", + "Version": "1.1", + "URL": "https://docs.cubepilot.org/user-guides/herelink/herelink-overview" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "RCin/SBUS", + "Protocol": "All" + }, + "Notes": "This receiver is on the vehicle and is connected to the flight controller" + }, + "Telemetry": { + "Product": { + "Manufacturer": "CubePilot", + "Model": "Herelink", + "Version": "1.1", + "URL": "https://docs.cubepilot.org/user-guides/herelink/herelink-overview" + }, + "Firmware": { + "Type": "", + "Version": "" + }, + "FC Connection": { + "Type": "SERIAL1", + "Protocol": "MAVLink2" + }, + "Notes": "Integrated in the herelink controller and airunit" } }, "Program version": "2.0.1" diff --git a/ardupilot_methodic_configurator/vehicle_templates/system_vehicle_components_template.json b/ardupilot_methodic_configurator/vehicle_templates/system_vehicle_components_template.json index e256b6cc4..4a91784f8 100644 --- a/ardupilot_methodic_configurator/vehicle_templates/system_vehicle_components_template.json +++ b/ardupilot_methodic_configurator/vehicle_templates/system_vehicle_components_template.json @@ -6,8 +6,8 @@ "Product": { "Manufacturer": "Radiomaster", "Model": "TX16S", - "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller", - "Version": "MKI" + "Version": "MKI", + "URL": "https://www.radiomasterrc.com/products/tx16s-mark-ii-radio-controller" }, "Firmware": { "Type": "EdgeTx", @@ -22,8 +22,8 @@ "Product": { "Manufacturer": "FlySky", "Model": "FS-i6X", - "URL": "https://www.flysky-cn.com/fsi6x", - "Version": "1.0" + "Version": "1.0", + "URL": "https://www.flysky-cn.com/fsi6x" }, "Firmware": { "Type": "AFHDS 2A", @@ -38,8 +38,8 @@ "Product": { "Manufacturer": "MP", "Model": "Joystick support", - "URL": "https://ardupilot.org/copter/docs/common-joystick.html", - "Version": "" + "Version": "", + "URL": "https://ardupilot.org/copter/docs/common-joystick.html" }, "Firmware": { "Type": "", @@ -54,8 +54,8 @@ "Product": { "Manufacturer": "SIYI", "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "1" + "Version": "1", + "URL": "https://shop.siyi.biz/products/siyi-mk32" }, "Firmware": { "Type": "", @@ -70,8 +70,8 @@ "Product": { "Manufacturer": "FrSky", "Model": "Taranis Q X7", - "URL": "https://www.frsky-rc.com/product/taranis-q-x7-2/", - "Version": "" + "Version": "", + "URL": "https://www.frsky-rc.com/product/taranis-q-x7-2/" }, "Firmware": { "Type": "OpenTx", @@ -86,8 +86,8 @@ "Product": { "Manufacturer": "Skydroid", "Model": "T12", - "URL": "https://worldronemarket.com/product/skydroid-t12/", - "Version": "" + "Version": "", + "URL": "https://worldronemarket.com/product/skydroid-t12/" }, "Firmware": { "Type": "", @@ -102,8 +102,8 @@ "Product": { "Manufacturer": "Radiomaster", "Model": "Boxer", - "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2", - "Version": "M2 ELRS LBT (EU)" + "Version": "M2 ELRS LBT (EU)", + "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2" }, "Firmware": { "Type": "EdgeTx", @@ -118,8 +118,8 @@ "Product": { "Manufacturer": "Radiolink", "Model": "AT9S Pro", - "URL": "https://www.amazon.com/Radiolink-Remote-Controller-Receiver-Helicopter/dp/B07VC3VJGM?th=1", - "Version": "" + "Version": "", + "URL": "https://www.amazon.com/Radiolink-Remote-Controller-Receiver-Helicopter/dp/B07VC3VJGM?th=1" }, "Firmware": { "Type": "AT9S", @@ -136,8 +136,8 @@ "Product": { "Manufacturer": "TBS", "Model": "TRACER Micro TX", - "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx", - "Version": "2" + "Version": "2", + "URL": "https://www.team-blacksheep.com/products/prod:tbs_tracer_mtx" }, "Firmware": { "Type": "Crossfire TX", @@ -152,8 +152,8 @@ "Product": { "Manufacturer": "FlySky", "Model": "FS-i6X", - "URL": "ttps://www.flysky-cn.com/fsi6x", - "Version": "1.0" + "Version": "1.0", + "URL": "ttps://www.flysky-cn.com/fsi6x" }, "Firmware": { "Type": "AFHDS 2A", @@ -168,8 +168,8 @@ "Product": { "Manufacturer": "Microsoft", "Model": "X-box One controller", - "URL": "https://www.microsoft.com/store/collections/xboxcontrollers", - "Version": "" + "Version": "", + "URL": "https://www.microsoft.com/store/collections/xboxcontrollers" }, "Firmware": { "Type": "", @@ -184,8 +184,8 @@ "Product": { "Manufacturer": "SIYI", "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "1" + "Version": "1", + "URL": "https://shop.siyi.biz/products/siyi-mk32" }, "Firmware": { "Type": "", @@ -200,8 +200,8 @@ "Product": { "Manufacturer": "Skydroid", "Model": "T12", - "URL": "https://worldronemarket.com/product/skydroid-t12/", - "Version": "" + "Version": "", + "URL": "https://worldronemarket.com/product/skydroid-t12/" }, "Firmware": { "Type": "", @@ -216,8 +216,8 @@ "Product": { "Manufacturer": "BetaFPV", "Model": "ExpressLRS 1W", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", @@ -232,8 +232,8 @@ "Product": { "Manufacturer": "Radiomaster", "Model": "internal", - "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2", - "Version": "M2" + "Version": "M2", + "URL": "https://www.radiomasterrc.com/products/boxer-radio-controller-m2" }, "Firmware": { "Type": "ELRS (internal)", @@ -250,8 +250,8 @@ "Product": { "Manufacturer": "TBS", "Model": "Tracer RX", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "Crossfire", @@ -270,8 +270,8 @@ "Product": { "Manufacturer": "TBS", "Model": "Crossfire RX se", - "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se", - "Version": "" + "Version": "", + "URL": "https://www.team-blacksheep.com/products/prod:crossfire_nano_se" }, "Firmware": { "Type": "Crossfire", @@ -290,8 +290,8 @@ "Product": { "Manufacturer": "FlySky", "Model": "FS-IA6B", - "URL": "https://www.flysky-cn.com/ia6b-canshu", - "Version": "V1.0" + "Version": "V1.0", + "URL": "https://www.flysky-cn.com/ia6b-canshu" }, "Firmware": { "Type": "AFHDS 2A", @@ -310,8 +310,8 @@ "Product": { "Manufacturer": "CUAV", "Model": "LTE-Link SE", - "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html", - "Version": "" + "Version": "", + "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html" }, "Firmware": { "Type": "", @@ -330,8 +330,8 @@ "Product": { "Manufacturer": "SIYI", "Model": "mk32 RADIO", - "URL": "https://shop.siyi.biz/products/siyi-mk32", - "Version": "1" + "Version": "1", + "URL": "https://shop.siyi.biz/products/siyi-mk32" }, "Firmware": { "Type": "", @@ -350,8 +350,8 @@ "Product": { "Manufacturer": "TBS", "Model": "Tracer Nano RX", - "URL": "https://www.team-blacksheep.com/products/prod:tracer_nanorx", - "Version": "" + "Version": "", + "URL": "https://www.team-blacksheep.com/products/prod:tracer_nanorx" }, "Firmware": { "Type": "", @@ -370,8 +370,8 @@ "Product": { "Manufacturer": "Skydroid", "Model": "T12", - "URL": "https://worldronemarket.com/product/skydroid-t12/", - "Version": "" + "Version": "", + "URL": "https://worldronemarket.com/product/skydroid-t12/" }, "Firmware": { "Type": "", @@ -390,8 +390,8 @@ "Product": { "Manufacturer": "Matek", "Model": "ExpressLRS Diversity", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "", @@ -410,8 +410,8 @@ "Product": { "Manufacturer": "Radiomaster", "Model": "RPTD4 ExpressLRS 2.4Ghz diversity receiver", - "URL": "https://www.radiomasterrc.com/products/rp4td-expresslrs-2-4ghz-diversity-receiver", - "Version": "EU LBT" + "Version": "EU LBT", + "URL": "https://www.radiomasterrc.com/products/rp4td-expresslrs-2-4ghz-diversity-receiver" }, "Firmware": { "Type": "ELRS", @@ -430,8 +430,8 @@ "Product": { "Manufacturer": "RadioLink", "Model": "R9DS", - "URL": "https://www.amazon.com/Radiolink-2-4GHz-Receiver-Spectrum-Compatible/dp/B01KX3IVOK", - "Version": "V2.0" + "Version": "V2.0", + "URL": "https://www.amazon.com/Radiolink-2-4GHz-Receiver-Spectrum-Compatible/dp/B01KX3IVOK" }, "Firmware": { "Type": "", @@ -452,8 +452,8 @@ "Product": { "Manufacturer": "Espressif", "Model": "ESP32 WROOM", - "URL": "https://dronebridge.github.io/ESP32/", - "Version": "" + "Version": "", + "URL": "https://dronebridge.github.io/ESP32/" }, "Firmware": { "Type": "dronebridge", @@ -472,8 +472,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "SiK Telemetry Radio", - "URL": "https://holybro.com/products/sik-telemetry-radio-v3?variant=41562952270013", - "Version": "V3.0" + "Version": "V3.0", + "URL": "https://holybro.com/products/sik-telemetry-radio-v3?variant=41562952270013" }, "Firmware": { "Type": "Open-source SIK firmware", @@ -492,8 +492,8 @@ "Product": { "Manufacturer": "CUAV", "Model": "LTE-Link SE", - "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html", - "Version": "" + "Version": "", + "URL": "https://doc.cuav.net/link/lte-link/en/lte-link-se.html" }, "Firmware": { "Type": "", @@ -512,8 +512,8 @@ "Product": { "Manufacturer": "mRo", "Model": "SiK 915Mhz", - "URL": "https://mrobotics.io/docs/mro-sik-telemetry-radio-v2/", - "Version": "" + "Version": "", + "URL": "https://mrobotics.io/docs/mro-sik-telemetry-radio-v2/" }, "Firmware": { "Type": "SiK", @@ -532,8 +532,8 @@ "Product": { "Manufacturer": "Espressif", "Model": "Xiao ESP32C3", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Firmware": { "Type": "Serial Bridge Custom", @@ -552,8 +552,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Microhard Radio P840", - "URL": "https://holybro.com/products/microhard-radio?variant=41473588265149", - "Version": "" + "Version": "", + "URL": "https://holybro.com/products/microhard-radio?variant=41473588265149" }, "Firmware": { "Type": "", @@ -574,8 +574,8 @@ "Product": { "Manufacturer": "Turnigy", "Model": "Graphene Panther", - "URL": "", - "Version": "3000mAh 6S 75C" + "Version": "3000mAh 6S 75C", + "URL": "" }, "Specifications": { "Chemistry": "Lipo", @@ -594,8 +594,8 @@ "Product": { "Manufacturer": "SLS", "Model": "X-Cube 1800mAh 4S1P 14,8V 40C/80C", - "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html", - "Version": "" + "Version": "", + "URL": "https://www.stefansliposhop.de/akkus/sls-x-cube/sls-x-cube-40c/sls-x-cube-1800mah-4s1p-14-8v-40c-80c::1568.html" }, "Specifications": { "Chemistry": "Lipo", @@ -614,8 +614,8 @@ "Product": { "Manufacturer": "Gens Ace", "Model": "4S1P 5000mAh", - "URL": "https://www.rccorner.ae/gens-ace-5000mah-14-8v-45c-4s1p-lipo-battery", - "Version": "B-45C-5000-4S1P" + "Version": "B-45C-5000-4S1P", + "URL": "https://www.rccorner.ae/gens-ace-5000mah-14-8v-45c-4s1p-lipo-battery" }, "Specifications": { "Chemistry": "Lipo", @@ -634,8 +634,8 @@ "Product": { "Manufacturer": "Gens Ace", "Model": "Tattu 6S1P 11000mAh", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Chemistry": "LipoHVSS", @@ -654,8 +654,8 @@ "Product": { "Manufacturer": "Zeee", "Model": "6S 6500mAh LiHV", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Chemistry": "LipoHV", @@ -674,8 +674,8 @@ "Product": { "Manufacturer": "Gens Ace", "Model": "Tattu 6C 30000mAh", - "URL": "https://genstattu.com/tattu-g-tech-30000mah-6s-22-2v-25c-lipo-battery-pack-with-as150u-f-plug/", - "Version": "AS150U-F" + "Version": "AS150U-F", + "URL": "https://genstattu.com/tattu-g-tech-30000mah-6s-22-2v-25c-lipo-battery-pack-with-as150u-f-plug/" }, "Specifications": { "Chemistry": "LipoHV", @@ -696,8 +696,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "F55A Pro II", - "URL": "https://shop.tmotor.com/products/fpv-drones-esc-f55a-proii-6s-4in1", - "Version": "32bit 4in1-6S" + "Version": "32bit 4in1-6S", + "URL": "https://shop.tmotor.com/products/fpv-drones-esc-f55a-proii-6s-4in1" }, "Firmware": { "Type": "BLHeli32", @@ -716,8 +716,8 @@ "Product": { "Manufacturer": "Mamba System", "Model": "F45_128k 4in1 ESC", - "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc", - "Version": "1" + "Version": "1", + "URL": "https://www.diatone.us/products/mb-f45_128k-bl32-esc" }, "Firmware": { "Type": "BLHeli32", @@ -736,8 +736,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "X500 V2-BLHeli S 20A", - "URL": "https://www.mybotshop.de/Holybro-X500-V2-BLHeli-S-20A-ESC_1", - "Version": "1" + "Version": "1", + "URL": "https://www.mybotshop.de/Holybro-X500-V2-BLHeli-S-20A-ESC_1" }, "Firmware": { "Type": "", @@ -756,8 +756,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Tekko32 F4-45A", - "URL": "https://holybro.com/products/tekko32-f4-45a-esc", - "Version": "AM32" + "Version": "AM32", + "URL": "https://holybro.com/products/tekko32-f4-45a-esc" }, "Firmware": { "Type": "AM32", @@ -776,8 +776,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "X11 Plus", - "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html", - "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm" + "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm", + "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html" }, "Firmware": { "Type": "", @@ -796,8 +796,8 @@ "Product": { "Manufacturer": "FETtec", "Model": "4in1 ESC 65A", - "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-65a", - "Version": "" + "Version": "", + "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-65a" }, "Firmware": { "Type": "FETtec", @@ -816,8 +816,8 @@ "Product": { "Manufacturer": "FETtec", "Model": "4in1 ESC 35A", - "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-35a-v1.1", - "Version": "1.1" + "Version": "1.1", + "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-35a-v1.1" }, "Firmware": { "Type": "FETtec", @@ -836,8 +836,8 @@ "Product": { "Manufacturer": "FETtec", "Model": "4in1 ESC 45A", - "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-45a", - "Version": "" + "Version": "", + "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-45a" }, "Firmware": { "Type": "FETtec", @@ -856,8 +856,8 @@ "Product": { "Manufacturer": "FETtec", "Model": "SFOC 4in1 ESC 50A", - "URL": "https://fettec.net/en/shop/electronics/esc/sfoc-4in1-esc-50a", - "Version": "" + "Version": "", + "URL": "https://fettec.net/en/shop/electronics/esc/sfoc-4in1-esc-50a" }, "Firmware": { "Type": "FETtec", @@ -876,8 +876,8 @@ "Product": { "Manufacturer": "Spedix", "Model": "ES30HV", - "URL": "https://aerokartindia.in/product/spedix-es30-hv-3-6s-blheli_s-30a-esc/", - "Version": "" + "Version": "", + "URL": "https://aerokartindia.in/product/spedix-es30-hv-3-6s-blheli_s-30a-esc/" }, "Firmware": { "Type": "BLHeLi_S", @@ -896,8 +896,8 @@ "Product": { "Manufacturer": "iFlight", "Model": "Blitz 4-in-1 80A", - "URL": "https://shop.iflight.com/BLITZ-E80-4-IN1-Pro-ESC-G2-Pro1770", - "Version": "" + "Version": "", + "URL": "https://shop.iflight.com/BLITZ-E80-4-IN1-Pro-ESC-G2-Pro1770" }, "Firmware": { "Type": "BLHeli32", @@ -916,8 +916,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "STAR 50 iESC", - "URL": "https://iha-race.com/de/producto/dron-t-motor-m1000/", - "Version": "" + "Version": "", + "URL": "https://iha-race.com/de/producto/dron-t-motor-m1000/" }, "Firmware": { "Type": "T-Motor", @@ -938,8 +938,8 @@ "Product": { "Manufacturer": "iFlight", "Model": "XING 2806.5", - "URL": "https://shop.iflight.com/xing-x2806-5-fpv-nextgen-motor-pro1001", - "Version": "1300KV" + "Version": "1300KV", + "URL": "https://shop.iflight.com/xing-x2806-5-fpv-nextgen-motor-pro1001" }, "Specifications": { "Poles": 14 @@ -953,8 +953,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "F15507", - "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s", - "Version": "3800kv" + "Version": "3800kv", + "URL": "https://www.fpv24.com/de/t-motor/t-motor-f-serie-f1507-cinematic-3800kv-3s-4s" }, "Specifications": { "Poles": 14 @@ -968,8 +968,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "2216-920KV", - "URL": "https://nl.aliexpress.com/item/1005003954474597.html?gatewayAdapt=glo2nld", - "Version": "" + "Version": "", + "URL": "https://nl.aliexpress.com/item/1005003954474597.html?gatewayAdapt=glo2nld" }, "Specifications": { "Poles": 14 @@ -983,8 +983,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "MN4014", - "URL": "https://store.tmotor.com/product/mn4014-kv330-motor-navigator-type.html", - "Version": "KV3330" + "Version": "KV3330", + "URL": "https://store.tmotor.com/product/mn4014-kv330-motor-navigator-type.html" }, "Specifications": { "Poles": 14 @@ -998,8 +998,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "X11 Plus 1118-85KV", - "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html", - "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm" + "Version": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm", + "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html" }, "Specifications": { "Poles": 14 @@ -1013,8 +1013,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "F1507", - "URL": "https://shop.tmotor.com/products/cinewhoop-drones-fpv-brushless-motor-f1507", - "Version": "3800kv" + "Version": "3800kv", + "URL": "https://shop.tmotor.com/products/cinewhoop-drones-fpv-brushless-motor-f1507" }, "Specifications": { "Poles": 14 @@ -1028,8 +1028,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "F80", - "URL": "https://shop.tmotor.com/products/fpv-drones-brushless-motor-f80-pro", - "Version": "1900KV" + "Version": "1900KV", + "URL": "https://shop.tmotor.com/products/fpv-drones-brushless-motor-f80-pro" }, "Specifications": { "Poles": 14 @@ -1043,8 +1043,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "MN5008", - "URL": "https://robu.in/product/t-motor-antigravity-mn5008-kv170/", - "Version": "" + "Version": "", + "URL": "https://robu.in/product/t-motor-antigravity-mn5008-kv170/" }, "Specifications": { "Poles": 28 @@ -1058,8 +1058,8 @@ "Product": { "Manufacturer": "iFlight", "Model": "Xing 4214", - "URL": "https://shop.iflight.com/xing-x4214-2-8s-x-class-fpv-nextgen-motor-pro802", - "Version": "660KV" + "Version": "660KV", + "URL": "https://shop.iflight.com/xing-x4214-2-8s-x-class-fpv-nextgen-motor-pro802" }, "Specifications": { "Poles": 14 @@ -1073,8 +1073,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "T-Motor MN7005(7206) 230KV", - "URL": "https://store.tmotor.com/product/mn7005-kv230-motor-antigravity-type.html", - "Version": "" + "Version": "", + "URL": "https://store.tmotor.com/product/mn7005-kv230-motor-antigravity-type.html" }, "Specifications": { "Poles": 28 @@ -1088,8 +1088,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "X11 Plus 1118-85KV", - "URL": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm", - "Version": "" + "Version": "", + "URL": "https://vi.aliexpress.com/i/1005005384267348.html?gatewayAdapt=glo2vnm" }, "Specifications": { "Poles": 14 @@ -1105,8 +1105,8 @@ "Product": { "Manufacturer": "Gemfan", "Model": "7040 7x4.2", - "URL": "https://www.gfprops.com/products/gemfan-flash-7042-2.html", - "Version": "" + "Version": "", + "URL": "https://www.gfprops.com/products/gemfan-flash-7042-2.html" }, "Specifications": { "Diameter_inches": 7 @@ -1120,8 +1120,8 @@ "Product": { "Manufacturer": "HQProp", "Model": "CineWhoop 3\", 8-Blade", - "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau", - "Version": "" + "Version": "", + "URL": "https://shop.rc-hangar15.de/HQProp-76mm-CineWhoop-3-8-Blatt-Propeller-grau" }, "Specifications": { "Diameter_inches": 3 @@ -1135,8 +1135,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "Propeller 1045", - "URL": "https://holybro.com/collections/multicopter-kit/products/spare-parts-x500-v2-kit?variant=41591073669309", - "Version": "" + "Version": "", + "URL": "https://holybro.com/collections/multicopter-kit/products/spare-parts-x500-v2-kit?variant=41591073669309" }, "Specifications": { "Diameter_inches": 10 @@ -1150,8 +1150,8 @@ "Product": { "Manufacturer": "GEMFAN", "Model": "1555 carbon fiber", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Diameter_inches": 15.5 @@ -1165,8 +1165,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "43\"", - "URL": "https://www.amazon.com/HAWEWE-Hobbywing-Plastics-Propeller-Agricultural/dp/B0CH7WLPCG", - "Version": "" + "Version": "", + "URL": "https://www.amazon.com/HAWEWE-Hobbywing-Plastics-Propeller-Agricultural/dp/B0CH7WLPCG" }, "Specifications": { "Diameter_inches": 43 @@ -1180,8 +1180,8 @@ "Product": { "Manufacturer": "HQProp", "Model": "5043 5X4.3X3", - "URL": "https://www.hqprop.com/", - "Version": "V2S" + "Version": "V2S", + "URL": "https://www.hqprop.com/" }, "Specifications": { "Diameter_inches": 5 @@ -1195,8 +1195,8 @@ "Product": { "Manufacturer": "T-Motor", "Model": "24x7.8", - "URL": "https://www.uavmarketplace.in/products/t-motor-g24x7-8-propeller-2pcs-pair/895789000012622470", - "Version": "V2S" + "Version": "V2S", + "URL": "https://www.uavmarketplace.in/products/t-motor-g24x7-8-propeller-2pcs-pair/895789000012622470" }, "Specifications": { "Diameter_inches": 24 @@ -1210,8 +1210,8 @@ "Product": { "Manufacturer": "Master Airscrew", "Model": "11x3, 10 pitch", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "Diameter_inches": 11 @@ -1225,8 +1225,8 @@ "Product": { "Manufacturer": "Mejzlik", "Model": "24 x 8.1", - "URL": "https://www.mejzlik.eu", - "Version": "LAF" + "Version": "LAF", + "URL": "https://www.mejzlik.eu" }, "Specifications": { "Diameter_inches": 24 @@ -1242,8 +1242,8 @@ "Product": { "Manufacturer": "iFlight", "Model": "Titan Chimera7", - "URL": "https://shop.iflight.com/Chimera7-Pro-V2-6S-HD-Pro1881", - "Version": "LR" + "Version": "LR", + "URL": "https://shop.iflight.com/Chimera7-Pro-V2-6S-HD-Pro1881" }, "Specifications": { "TOW min Kg": 0.9, @@ -1258,8 +1258,8 @@ "Product": { "Manufacturer": "Diatone", "Model": "Taycan MX-C", - "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone", - "Version": "2022" + "Version": "2022", + "URL": "https://www.diatone.us/products/diatone-mxc-taycan-duct-3-inch-cinewhoop-fpv-drone" }, "Specifications": { "TOW min Kg": 0.6, @@ -1274,8 +1274,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "X500 V2", - "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8", - "Version": "Payload: 1500g (without Battery, 70% Throttle)" + "Version": "Payload: 1500g (without Battery, 70% Throttle)", + "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8" }, "Specifications": { "TOW min Kg": 1.09, @@ -1290,8 +1290,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "X650 V2", - "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8", - "Version": "Payload: 1500g (without Battery, 70% Throttle)" + "Version": "Payload: 1500g (without Battery, 70% Throttle)", + "URL": "https://holybro.com/products/x500-v2-kits?srsltid=AfmBOor9p_QpA5CNDhM99OCZ4DMVM1eUJ8H_dLW4FpDZgz0VR01YJ_M8" }, "Specifications": { "TOW min Kg": 5.6, @@ -1306,8 +1306,8 @@ "Product": { "Manufacturer": "HOVERIT", "Model": "BAAZ", - "URL": "https://hoverit.in/baaz-1", - "Version": "v2" + "Version": "v2", + "URL": "https://hoverit.in/baaz-1" }, "Specifications": { "TOW min Kg": 35, @@ -1322,8 +1322,8 @@ "Product": { "Manufacturer": "Armattan", "Model": "Marmotte", - "URL": "", - "Version": "5v2" + "Version": "5v2", + "URL": "" }, "Specifications": { "TOW min Kg": 0.7, @@ -1338,8 +1338,8 @@ "Product": { "Manufacturer": "ReadyToSky", "Model": "ZD550", - "URL": "", - "Version": "" + "Version": "", + "URL": "" }, "Specifications": { "TOW min Kg": 2.884, @@ -1354,8 +1354,8 @@ "Product": { "Manufacturer": "Tarot", "Model": "X4", - "URL": "http://www.tarotrc.com/Product/Detail.aspx?Lang=en&Id=3c47ef4b-df8a-40f1-b43e-64b6364e9882", - "Version": "Custom" + "Version": "Custom", + "URL": "http://www.tarotrc.com/Product/Detail.aspx?Lang=en&Id=3c47ef4b-df8a-40f1-b43e-64b6364e9882" }, "Specifications": { "TOW min Kg": 5, @@ -1372,8 +1372,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "PM02 Power Module (12S)", - "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02-v3-12s-power-module", - "Version": "V3" + "Version": "V3", + "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02-v3-12s-power-module" }, "Firmware": { "Type": "", @@ -1392,8 +1392,8 @@ "Product": { "Manufacturer": "HOBBYWING", "Model": "X11 Plus", - "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html", - "Version": "" + "Version": "", + "URL": "https://www.hobbywing.com/en/products/xrotor-x11-plus270.html" }, "Firmware": { "Type": "", @@ -1412,8 +1412,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "PM02D HV Power Module", - "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02d-power-module", - "Version": "HV" + "Version": "HV", + "URL": "https://holybro.com/collections/power-modules-pdbs/products/pm02d-power-module" }, "Firmware": { "Type": "HolyBro", @@ -1432,8 +1432,8 @@ "Product": { "Manufacturer": "FETtec", "Model": "4in1 ESC 65A", - "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-65a", - "Version": "" + "Version": "", + "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-65a" }, "Firmware": { "Type": "FETtec", @@ -1452,8 +1452,8 @@ "Product": { "Manufacturer": "FETtec", "Model": "4in1 ESC 35A", - "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-35a-v1.1", - "Version": "" + "Version": "", + "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-35a-v1.1" }, "Firmware": { "Type": "FETtec", @@ -1472,8 +1472,8 @@ "Product": { "Manufacturer": "FETtec", "Model": "4in1 ESC 45A", - "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-45a", - "Version": "" + "Version": "", + "URL": "https://fettec.net/en/shop/electronics/esc/fettec-4in1-esc-45a" }, "Firmware": { "Type": "FETtec", @@ -1492,8 +1492,8 @@ "Product": { "Manufacturer": "FETtec", "Model": "SFOC 4in1 ESC 50A", - "URL": "https://fettec.net/en/shop/electronics/esc/sfoc-4in1-esc-50a", - "Version": "" + "Version": "", + "URL": "https://fettec.net/en/shop/electronics/esc/sfoc-4in1-esc-50a" }, "Firmware": { "Type": "FETtec", @@ -1514,8 +1514,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here2", - "URL": "https://docs.cubepilot.org/user-guides/here-2/updating-here-2-firmware", - "Version": "2.1" + "Version": "2.1", + "URL": "https://docs.cubepilot.org/user-guides/here-2/updating-here-2-firmware" }, "Firmware": { "Type": "uBlox", @@ -1534,8 +1534,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here2", - "URL": "https://docs.cubepilot.org/user-guides/here-2/updating-here-2-firmware", - "Version": "2.1" + "Version": "2.1", + "URL": "https://docs.cubepilot.org/user-guides/here-2/updating-here-2-firmware" }, "Firmware": { "Type": "DroneCAN", @@ -1554,8 +1554,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here3/Here3+", - "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual", - "Version": "3.0" + "Version": "3.0", + "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual" }, "Firmware": { "Type": "uBlox", @@ -1574,8 +1574,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here3/Here3+", - "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual", - "Version": "3.0" + "Version": "3.0", + "URL": "https://docs.cubepilot.org/user-guides/here-3/here-3-manual" }, "Firmware": { "Type": "uBlox", @@ -1594,8 +1594,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "Here4", - "URL": "https://docs.cubepilot.org/user-guides/here-4/here-4-manual", - "Version": "4.19" + "Version": "4.19", + "URL": "https://docs.cubepilot.org/user-guides/here-4/here-4-manual" }, "Firmware": { "Type": "DroneCAN", @@ -1614,8 +1614,8 @@ "Product": { "Manufacturer": "CubePilot", "Model": "HerePro", - "URL": "https://docs.cubepilot.org/user-guides/herepro/herepro-manual", - "Version": "4.13" + "Version": "4.13", + "URL": "https://docs.cubepilot.org/user-guides/herepro/herepro-manual" }, "Firmware": { "Type": "DroneCAN", @@ -1634,8 +1634,8 @@ "Product": { "Manufacturer": "Matek", "Model": "M8Q-5883", - "URL": "https://www.mateksys.com/?portfolio=m8q-5883", - "Version": "1" + "Version": "1", + "URL": "https://www.mateksys.com/?portfolio=m8q-5883" }, "Firmware": { "Type": "UBlox", @@ -1654,8 +1654,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "H-RTK F9P Helical", - "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/h-rtk-f9p-gnss-series?variant=41466787168445" }, "Firmware": { "Type": "UBlox", @@ -1674,8 +1674,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "M10", - "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL", - "Version": "1" + "Version": "1", + "URL": "https://holybro.com/products/m10-gps?srsltid=AfmBOootSZi5Pc_2XhliqsKy-u3_8l8SKZ8tzd5wDuPMENtL-ZeLngUL" }, "Firmware": { "Type": "Ublox", @@ -1694,8 +1694,8 @@ "Product": { "Manufacturer": "Holybro", "Model": "M9N GPS", - "URL": "https://holybro.com/products/m9n-gps", - "Version": "Standard" + "Version": "Standard", + "URL": "https://holybro.com/products/m9n-gps" }, "Firmware": { "Type": "ublox", diff --git a/tests/test_data_model_vehicle_components_base.py b/tests/test_data_model_vehicle_components_base.py index 31121ea3f..c1d1c6c90 100755 --- a/tests/test_data_model_vehicle_components_base.py +++ b/tests/test_data_model_vehicle_components_base.py @@ -1045,3 +1045,264 @@ def test_process_value_none_and_version_handling(self, model_with_datatypes) -> result = model_with_datatypes._process_value(numeric_path, None) assert result == "" + + +class TestComponentReordering: + """Test component reordering functionality in ComponentDataModelBase.""" + + @pytest.fixture + def model_instance(self) -> ComponentDataModelBase: + """Create a ComponentDataModelBase instance for testing reordering.""" + schema = VehicleComponentsJsonSchema({}) + return ComponentDataModelBase({}, {}, schema) + + def test_user_sees_components_reordered_to_logical_sequence(self, model_instance) -> None: + """ + User sees vehicle components displayed in a logical, workflow-oriented order. + + GIVEN: A vehicle configuration with components in random order + WHEN: The system processes the component data + THEN: Components are reordered to follow the expected workflow sequence + AND: Known components appear before unknown/custom components + """ + # Arrange: Create components in random order + existing_components = { + "RC Controller": {"Product": {"Manufacturer": "FrSky", "Model": "Taranis"}}, + "GNSS Receiver": {"Product": {"Manufacturer": "u-blox", "Model": "NEO-M8N"}}, + "Battery": {"Product": {"Manufacturer": "Tattu", "Model": "25C"}}, + "Flight Controller": {"Product": {"Manufacturer": "Pixhawk", "Model": "6C"}}, + "Custom Sensor": {"Product": {"Manufacturer": "Custom", "Model": "Sensor1"}}, # Unknown component + } + + # Act: Reorder components + result = model_instance._reorder_components(existing_components) + + # Assert: Components are in the expected order + component_order = list(result.keys()) + expected_known_order = ["Flight Controller", "Battery", "GNSS Receiver", "RC Controller"] + + # Check that known components appear in the expected relative order + for _i, component in enumerate(expected_known_order): + if component in component_order: + assert component_order.index(component) < component_order.index("Custom Sensor"), ( + f"Known component {component} should appear before unknown components" + ) + + # Custom/unknown components should be at the end + assert component_order[-1] == "Custom Sensor" + + def test_user_sees_product_fields_ordered_consistently(self, model_instance) -> None: + """ + User sees product information fields displayed in a consistent, logical order. + + GIVEN: A component with product fields in random order + WHEN: The system processes the component data + THEN: Product fields are reordered with Version appearing before URL + AND: All existing field values are preserved + """ + # Arrange: Create component with Product fields in wrong order + existing_components = { + "Flight Controller": { + "Product": {"Manufacturer": "Pixhawk", "URL": "https://pixhawk.org", "Model": "6C", "Version": "1.0"}, + "Firmware": {"Type": "ArduCopter", "Version": "4.5.x"}, + } + } + + # Act: Reorder components + result = model_instance._reorder_components(existing_components) + + # Assert: Product fields are reordered correctly + product_fields = list(result["Flight Controller"]["Product"].keys()) + version_index = product_fields.index("Version") + url_index = product_fields.index("URL") + + assert version_index < url_index, "Version should appear before URL in Product fields" + + # Verify all original values are preserved + assert result["Flight Controller"]["Product"]["Manufacturer"] == "Pixhawk" + assert result["Flight Controller"]["Product"]["Model"] == "6C" + assert result["Flight Controller"]["Product"]["Version"] == "1.0" + assert result["Flight Controller"]["Product"]["URL"] == "https://pixhawk.org" + + def test_user_sees_unknown_components_preserved_at_end(self, model_instance) -> None: + """ + User sees custom or unknown components preserved and displayed at the end of the list. + + GIVEN: A vehicle configuration with both known and unknown components + WHEN: The system processes the component data + THEN: Unknown components are preserved and appear at the end + AND: Their data remains unchanged + """ + # Arrange: Mix of known and unknown components + existing_components = { + "Flight Controller": {"Product": {"Manufacturer": "Pixhawk"}}, + "Custom IMU": {"Product": {"Manufacturer": "Custom IMU Corp", "Model": "IMU-X1"}}, # Unknown + "Battery": {"Product": {"Manufacturer": "Tattu"}}, + "Proprietary Sensor": {"Product": {"Manufacturer": "Proprietary Inc", "Model": "Sensor-Z"}}, # Unknown + "GNSS Receiver": {"Product": {"Manufacturer": "u-blox"}}, + } + + # Act: Reorder components + result = model_instance._reorder_components(existing_components) + + # Assert: Unknown components appear at the end + component_order = list(result.keys()) + + # Known components should come first in some logical order + known_components = ["Flight Controller", "Battery", "GNSS Receiver"] + unknown_components = ["Custom IMU", "Proprietary Sensor"] + + # Find positions of known vs unknown components + known_positions = [component_order.index(comp) for comp in known_components if comp in component_order] + unknown_positions = [component_order.index(comp) for comp in unknown_components if comp in component_order] + + # All unknown components should be at the end + if unknown_positions: + min_unknown_pos = min(unknown_positions) + max_known_pos = max(known_positions) if known_positions else -1 + assert min_unknown_pos > max_known_pos, "Unknown components should appear after known components" + + # Verify unknown component data is preserved + assert result["Custom IMU"]["Product"]["Manufacturer"] == "Custom IMU Corp" + assert result["Custom IMU"]["Product"]["Model"] == "IMU-X1" + assert result["Proprietary Sensor"]["Product"]["Manufacturer"] == "Proprietary Inc" + assert result["Proprietary Sensor"]["Product"]["Model"] == "Sensor-Z" + + def test_user_sees_components_without_product_sections_unchanged(self, model_instance) -> None: + """ + User sees components without Product sections remain completely unchanged. + + GIVEN: Components with various section types but no Product section + WHEN: The system processes the component data + THEN: Components without Product sections are unchanged + AND: Their structure and values are preserved exactly + """ + # Arrange: Components without Product sections + existing_components = { + "Flight Controller": { + "Firmware": {"Type": "ArduCopter", "Version": "4.5.x"}, + "Specifications": {"MCU Series": "STM32H7"}, + }, + "Battery": {"Specifications": {"Chemistry": "Lipo", "Capacity mAh": 5000}}, + } + + # Act: Reorder components + result = model_instance._reorder_components(existing_components) + + # Assert: Components without Product sections are unchanged + assert result["Flight Controller"]["Firmware"]["Type"] == "ArduCopter" + assert result["Flight Controller"]["Firmware"]["Version"] == "4.5.x" + assert result["Flight Controller"]["Specifications"]["MCU Series"] == "STM32H7" + + assert result["Battery"]["Specifications"]["Chemistry"] == "Lipo" + assert result["Battery"]["Specifications"]["Capacity mAh"] == 5000 + + def test_user_sees_product_sections_with_missing_fields_handled_gracefully(self, model_instance) -> None: + """ + User sees product sections with missing Version or URL fields handled gracefully. + + GIVEN: Components with Product sections missing Version or URL fields + WHEN: The system processes the component data + THEN: Product sections without both Version and URL fields are unchanged + AND: No reordering occurs when required fields are missing + """ + # Arrange: Product sections with incomplete field sets + existing_components = { + "Flight Controller": { + "Product": { + "Manufacturer": "Pixhawk", + "Model": "6C", + # Missing Version and URL + } + }, + "GNSS Receiver": { + "Product": { + "Manufacturer": "u-blox", + "Version": "1.0", + # Missing URL + } + }, + "Telemetry": { + "Product": { + "Manufacturer": "SiK", + "URL": "https://sik.org", + # Missing Version + } + }, + } + + # Act: Reorder components + result = model_instance._reorder_components(existing_components) + + # Assert: Product sections with missing fields are unchanged + # Flight Controller: missing both Version and URL + fc_product = result["Flight Controller"]["Product"] + assert list(fc_product.keys()) == ["Manufacturer", "Model"] + + # GNSS Receiver: missing URL + gnss_product = result["GNSS Receiver"]["Product"] + assert list(gnss_product.keys()) == ["Manufacturer", "Version"] + + # Telemetry: missing Version + telemetry_product = result["Telemetry"]["Product"] + assert list(telemetry_product.keys()) == ["Manufacturer", "URL"] + + def test_user_sees_complex_product_sections_with_extra_fields_preserved(self, model_instance) -> None: + """ + User sees complex product sections with extra custom fields preserved correctly. + + GIVEN: Components with Product sections containing extra custom fields + WHEN: The system processes the component data + THEN: Standard fields are reordered correctly + AND: Extra custom fields are preserved at the end + AND: All field values remain unchanged + """ + # Arrange: Product sections with extra custom fields + existing_components = { + "Flight Controller": { + "Product": { + "URL": "https://pixhawk.org", + "Custom Field 1": "Custom Value 1", + "Manufacturer": "Pixhawk", + "Version": "1.0", + "Custom Field 2": "Custom Value 2", + "Model": "6C", + "Custom Field 3": "Custom Value 3", + } + } + } + + # Act: Reorder components + result = model_instance._reorder_components(existing_components) + + # Assert: Standard fields are reordered, custom fields preserved + product_fields = list(result["Flight Controller"]["Product"].keys()) + + # Standard fields should be first in correct order + manufacturer_idx = product_fields.index("Manufacturer") + model_idx = product_fields.index("Model") + version_idx = product_fields.index("Version") + url_idx = product_fields.index("URL") + + assert manufacturer_idx < model_idx < version_idx < url_idx, ( + "Standard fields should be in correct order: Manufacturer, Model, Version, URL" + ) + + # Custom fields should appear after standard fields + custom1_idx = product_fields.index("Custom Field 1") + custom2_idx = product_fields.index("Custom Field 2") + custom3_idx = product_fields.index("Custom Field 3") + + assert custom1_idx > url_idx, "Custom fields should appear after standard fields" + assert custom2_idx > url_idx, "Custom fields should appear after standard fields" + assert custom3_idx > url_idx, "Custom fields should appear after standard fields" + + # Verify all values are preserved + product = result["Flight Controller"]["Product"] + assert product["Manufacturer"] == "Pixhawk" + assert product["Model"] == "6C" + assert product["Version"] == "1.0" + assert product["URL"] == "https://pixhawk.org" + assert product["Custom Field 1"] == "Custom Value 1" + assert product["Custom Field 2"] == "Custom Value 2" + assert product["Custom Field 3"] == "Custom Value 3" diff --git a/update_vehicle_templates.py b/update_vehicle_templates.py index 2ad2a0d9b..952aff6c4 100755 --- a/update_vehicle_templates.py +++ b/update_vehicle_templates.py @@ -13,6 +13,7 @@ SPDX-License-Identifier: GPL-3.0-or-later """ +import json import logging import os import sys @@ -21,7 +22,6 @@ # Add parent directory to path to import from ardupilot_methodic_configurator sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from ardupilot_methodic_configurator import __version__ # pylint: disable=wrong-import-position from ardupilot_methodic_configurator.backend_filesystem import LocalFilesystem # pylint: disable=wrong-import-position from ardupilot_methodic_configurator.data_model_vehicle_components import ( # pylint: disable=wrong-import-position ComponentDataModel, @@ -62,11 +62,30 @@ def process_template_directory(template_dir: Path) -> None: logging.info("\nProcessing template: %s", template_dir) try: - # Initialize LocalFilesystem with the template directory + # Load vehicle components data first to extract firmware version + vehicle_components_file = template_dir / "vehicle_components.json" + if not vehicle_components_file.exists(): + logging.error("vehicle_components.json not found in %s", template_dir) + return + + with open(vehicle_components_file, encoding="utf-8") as f: + vehicle_components_data = json.load(f) + + # Extract firmware version from Flight Controller component + fw_version = "4.6.3" # default fallback + if isinstance(vehicle_components_data, dict) and "Components" in vehicle_components_data: + flight_controller = vehicle_components_data["Components"].get("Flight Controller", {}) + firmware = flight_controller.get("Firmware", {}) + if isinstance(firmware, dict) and "Version" in firmware: + fw_version = firmware["Version"] + + logging.info("Using firmware version: %s", fw_version) + + # Initialize LocalFilesystem with the correct firmware version local_fs = LocalFilesystem( vehicle_dir=str(template_dir), vehicle_type="", - fw_version=__version__, + fw_version=fw_version, allow_editing_template_files=True, save_component_to_system_templates=False, )