ardupilot-methodic-configurator 2.1.3__py3-none-any.whl → 2.3.0__py3-none-any.whl

ardupilot_methodic_configurator/data_model_fc_ids.py

@@ -16,7 +16,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 # Maps USB VID to vendor(s) (manufacturer) name
 VID_VENDOR_DICT: dict[int, list[str]] = {
     0x26AC: ["3DR"],
-    0x1209: ["ArduPilot", "AET", "Airvolute", "Aocoda-RC-H743Dual", "DM", "CSKY", "GreenSight", "Japan Aviation Electronics Industry Ltd.", "mRo", "ORBITH743", "Horizon31", "Dheeran labs", "Qiotek", "Sierra Aerospace", "SkySakura"],
+    0x1209: ["ArduPilot", "AET", "Airvolute", "Aocoda-RC-H743Dual", "CSKY", "GreenSight", "Japan Aviation Electronics Industry Ltd.", "mRo", "ORBITH743", "Horizon31", "Dheeran labs", "Qiotek", "Sierra Aerospace", "SkySakura"],
     0x2DAE: ["Hex/ProfiCNC", "CubePilot"],
     0x3162: ["Holybro"],
     0x27AC: ["Swift-Flyer", "Laser Navigation"],
@@ -26,7 +26,7 @@ VID_VENDOR_DICT: dict[int, list[str]] = {
 # Maps USB VID,PID tuple to product name(s)
 VID_PID_PRODUCT_DICT: dict[tuple[int, int], list[str]] = {
     (0x26AC, 0x1124): ["CZOEMrevG"],
-    (0x1209, 0x5741): ["AcctonGodwit_GA1", "ACNS-CM4Pilot", "ACNS-F405AIO", "AEDROXH7", "AEROFOX-H7", "AET-H743-Basic", "airbotf4", "AIRLink", "Airvolute-DCS2", "AnyleafH7", "Aocoda-RC-H743Dual", "AR-F407SmartBat", "ARK_CANNODE", "ARK_FPV", "ARKV6X", "AtomRCF405NAVI", "ATOMRCF405NAVI-Deluxe", "BeastF7", "BeastF7v2", "BeastH7", "BeastH7v2", "BETAFPV-F405", "BirdCANdy", "BlitzF745", "BlitzF745AIO", "BlitzH743Pro", "BlitzMiniF745", "BlitzWingH743", "BotBloxDroneNet", "BOTWINGF405", "BrahmaF4", "BROTHERHOBBYF405v3", "BROTHERHOBBYH743", "C-RTK2-HP", "CarbonixF405", "CBU-H7-LC-Stamp", "CBU-H7-Stamp", "CORVON405V2_1", "CORVON743V1", "CrazyF405", "crazyflie2", "CSKY405", "CUAV-7-Nano", "CUAV-Nora", "CUAV-Pixhack-v3", "CUAV-V6X-v2", "CUAV-X25-EVO", "CUAV-X7", "CUAVv5", "CUAVv5Nano", "CubeNode", "CubeRedSecondary", "CubeRedSecondary-IO", "CubeSolo", "DAKEFPVF405", "DAKEFPVH743", "DAKEFPVH743Pro", "DevEBoxH7v2", "DroneerF405", "DrotekP3Pro", "F35Lightning", "FlyingMoonF407", "FlyingMoonF427", "FlyingMoonH743", "FlywooF405HD-AIOv2", "FlywooF405Pro", "FlywooF405S-AIO", "FlywooF745", "FlywooF745Nano", "FlywooH743Pro", "fmuv2", "fmuv3", "fmuv5", "FoxeerF405v2", "FoxeerH743v1", "FreeflyRTK", "GEPRC_TAKER_H743", "GEPRCF745BTHD", "UltraBlue", "%BOARD%", "HEEWING-F405", "HEEWING-F405v2", "Here4AP", "Here4FC", "HolybroF4_PMU", "IFLIGHT_2RAW_H7", "JFB100", "JFB-110", "JHEM_JHEF405", "JHEMCU-GSF405A", "JHEMCU-GSF405A-RX2", "JHEMCU-H743HD", "JHEMCUF405PRO", "JHEMCUF405WING", "KakuteF4", "KakuteF4-Wing", "KakuteF4Mini", "KakuteF7", "KakuteF7Mini", "KakuteH7", "KakuteH7-Wing", "KakuteH7Mini", "KakuteH7Mini-Nand", "KakuteH7v2", "LongBowF405WING", "LumenierLUXF765-NDAA", "luminousbee4", "luminousbee5", "MambaF405-2022", "MambaF405v2", "MambaH743v4", "MatekF405", "MatekF405-CAN", "MatekF405-STD", "MatekF405-TE", "MatekF405-Wing", "MatekF765-SE", "MatekF765-Wing", "MatekH743", "MatekH7A3", "MazzyStarDrone", "MFE_POS3_CAN", "MFT-SEMA100", "MicoAir405Mini", "MicoAir405v2", "MicoAir743", "MicoAir743-AIO", "MicoAir743v2", "mindpx-v2", "mini-pix", "modalai_fc-v1", "mRoControlZeroClassic", "mRoControlZeroF7", "mRoControlZeroH7", "mRoControlZeroOEMH7", "mRoCZeroOEMH7", "mRoNexus", "mRoPixracerPro", "mRoX21", "mRoX21-777", "MUPilot", "NarinFC-H5", "NarinFC-H7", "Nucleo-L476", "Nucleo-L496", "NucleoH743", "NucleoH755", "NxtPX4v2", "omnibusf4", "omnibusf4pro", "omnibusf4pro-one", "omnibusf4v6", "OMNIBUSF7V2", "OmnibusNanoV6", "ORBITH743", "OrqaF405Pro", "PH4-mini", "PixC4-Jetson", "PixFlamingo", "Pixhawk1", "Pixhawk1-1M", "Pixhawk4", "Pixhawk6X", "Pixhawk6X-PPPGW", "PixPilot-C3", "PixPilot-V3", "PixPilot-V6", "PixPilot-V6PRO", "Pixracer", "PixSurveyA1", "PixSurveyA1-IND", "PixSurveyA2-IND", "QioTekAdeptF407", "QioTekZealotF427", "QioTekZealotH743", "R9Pilot", "RadiolinkPIX6", "RADIX2HD", "ReaperF745", "revo-mini", "revo-mini-i2c", "revo-mini-sd", "rFCU", "SDMODELH7V1", "SDMODELH7V2", "SequreH743", "Sierra-F405", "Sierra-F412", "Sierra-F9P", "Sierra-PrecisionPoint", "SIYI_N7", "SkySakuraH743", "SkystarsF405v2", "SkystarsH7HD", "SkystarsH7HDv2", "skyviper-f412-rev1", "skyviper-journey", "skyviper-v2450", "sparky2", "SPEDIXF405", "SPEDIXH743", "speedybeef4", "SpeedyBeeF405AIO", "SpeedyBeeF405Mini", "SpeedyBeeF405WING", "speedybeef4v3", "speedybeef4v4", "SPRacingH7", "SPRacingH7RF", "StellarF4", "StellarF4V2", "StellarH7V2", "SuccexF4", "SULILGH7-P1-P2", "SVehicle-E2", "sw-boom-f407", "sw-nav-f405", "sw-spar-f407", "Swan-K1", "TBS-Colibri-F7", "TBS_LUCID_H7", "TBS_LUCID_H7_WING", "TBS_LUCID_PRO", "TMotorH743", "uav-dev-fc-um982", "VUAV-V7pro", "X-MAV-AP-H743v2", "YARIV6X", "YJUAV_A6", "YJUAV_A6SE", "YJUAV_A6SE_H743", "YJUAV_A6Ultra", "ZeroOneX6", "ZeroOneX6_Air"],
+    (0x1209, 0x5741): ["AcctonGodwit_GA1", "ACNS-CM4Pilot", "ACNS-F405AIO", "AEDROXH7", "AeroCogito-H7Digital", "AEROFOX-H7", "AET-H743-Basic", "airbotf4", "AIRLink", "Airvolute-DCS2", "AnyleafH7", "Aocoda-RC-H743Dual", "AR-F407SmartBat", "ARK_CANNODE", "ARK_FPV", "ARK_PI6X", "ARKV6X", "AtomRCF405NAVI", "ATOMRCF405NAVI-Deluxe", "BeastF7", "BeastF7v2", "BeastH7", "BeastH7v2", "BETAFPV-F405", "BirdCANdy", "BlitzF745", "BlitzF745AIO", "BlitzH743Pro", "BlitzMiniF745", "BlitzWingH743", "BotBloxDroneNet", "BOTWINGF405", "BrahmaF4", "BROTHERHOBBYF405v3", "BROTHERHOBBYH743", "C-RTK2-HP", "CarbonixF405", "CBU-H7-LC-Stamp", "CBU-H7-Stamp", "CORVON405V2_1", "CORVON743V1", "CrazyF405", "crazyflie2", "CSKY405", "CUAV-7-Nano", "CUAV-Nora", "CUAV-Pixhack-v3", "CUAV-V6X-v2", "CUAV-X25-EVO", "CUAV-X7", "CUAVv5", "CUAVv5Nano", "CubeNode", "CubeRedSecondary", "CubeRedSecondary-IO", "CubeSolo", "DAKEFPVF405", "DAKEFPVH743", "DAKEFPVH743Pro", "DevEBoxH7v2", "DroneerF405", "DrotekP3Pro", "F35Lightning", "F4BY_H743", "FlyingMoonF407", "FlyingMoonF427", "FlyingMoonH743", "FlywooF405HD-AIOv2", "FlywooF405Pro", "FlywooF405S-AIO", "FlywooF745", "FlywooF745Nano", "FlywooH743Pro", "fmuv2", "fmuv3", "fmuv5", "FoxeerF405v2", "FoxeerH743v1", "FreeflyRTK", "GEPRC_TAKER_H743", "GEPRCF745BTHD", "UltraBlue", "%BOARD%", "HEEWING-F405", "HEEWING-F405v2", "Here4AP", "Here4FC", "HolybroF4_PMU", "IFLIGHT_2RAW_H7", "JFB100", "JFB-110", "JHEM_JHEF405", "JHEMCU-GSF405A", "JHEMCU-GSF405A-RX2", "JHEMCU-H743HD", "JHEMCUF405PRO", "JHEMCUF405WING", "KakuteF4", "KakuteF4-Wing", "KakuteF4Mini", "KakuteF7", "KakuteF7Mini", "KakuteH7", "KakuteH7-Wing", "KakuteH7Mini", "KakuteH7Mini-Nand", "KakuteH7v2", "LongBowF405WING", "LumenierLUXF765-NDAA", "luminousbee4", "luminousbee5", "MambaF405-2022", "MambaF405v2", "MambaH743v4", "MatekF405", "MatekF405-CAN", "MatekF405-STD", "MatekF405-TE", "MatekF405-Wing", "MatekF765-SE", "MatekF765-Wing", "MatekH743", "MatekH7A3", "MazzyStarDrone", "MFE_POS3_CAN", "MFT-SEMA100", "MicoAir405Mini", "MicoAir405v2", "MicoAir743", "MicoAir743-AIO", "MicoAir743v2", "mindpx-v2", "mini-pix", "modalai_fc-v1", "mRoControlZeroClassic", "mRoControlZeroF7", "mRoControlZeroH7", "mRoControlZeroOEMH7", "mRoCZeroOEMH7", "mRoNexus", "mRoPixracerPro", "mRoX21", "mRoX21-777", "MUPilot", "NarinFC-H5", "NarinFC-H7", "Nucleo-L476", "Nucleo-L496", "NucleoH743", "NucleoH755", "NxtPX4v2", "omnibusf4", "omnibusf4pro", "omnibusf4pro-one", "omnibusf4v6", "OMNIBUSF7V2", "OmnibusNanoV6", "ORBITH743", "OrqaF405Pro", "OrqaH743Pro", "PH4-mini", "PixC4-Jetson", "PixFlamingo", "Pixhawk1", "Pixhawk1-1M", "Pixhawk4", "Pixhawk6X", "Pixhawk6X-PPPGW", "PixPilot-C3", "PixPilot-V3", "PixPilot-V6", "PixPilot-V6PRO", "Pixracer", "PixSurveyA1", "PixSurveyA1-IND", "PixSurveyA2-IND", "QioTekAdeptF407", "QioTekZealotF427", "QioTekZealotH743", "R9Pilot", "RadiolinkPIX6", "RADIX2HD", "ReaperF745", "revo-mini", "revo-mini-i2c", "revo-mini-sd", "rFCU", "SDMODELH7V1", "SDMODELH7V2", "SequreH743", "Sierra-F405", "Sierra-F412", "Sierra-F9P", "Sierra-PrecisionPoint", "SIYI_N7", "SkySakuraH743", "SkystarsF405v2", "SkystarsH7HD", "SkystarsH7HDv2", "skyviper-f412-rev1", "skyviper-journey", "skyviper-v2450", "sparky2", "SPEDIXF405", "SPEDIXH743", "speedybeef4", "SpeedyBeeF405AIO", "SpeedyBeeF405Mini", "SpeedyBeeF405WING", "speedybeef4v3", "speedybeef4v4", "SPRacingH7", "SPRacingH7RF", "StellarF4", "StellarF4V2", "StellarH7V2", "SuccexF4", "SULILGH7-P1-P2", "SVehicle-E2", "sw-boom-f407", "sw-nav-f405", "sw-spar-f407", "Swan-K1", "TBS-Colibri-F7", "TBS_LUCID_H7", "TBS_LUCID_H7_WING", "TBS_LUCID_PRO", "TMotorH743", "uav-dev-fc-um982", "VUAV-V7pro", "X-MAV-AP-H743v2", "YARIV6X", "YJUAV_A6", "YJUAV_A6SE", "YJUAV_A6SE_H743", "YJUAV_A6Ultra", "ZeroOneX6", "ZeroOneX6_Air"],
     (0x2DAE, 0x1011): ["CubeBlack", "CubeGreen-solo"],
     (0x2DAE, 0x1101): ["CubeBlack+"],
     (0x2DAE, 0x1016): ["CubeOrange"],
@@ -49,13 +49,14 @@ VID_PID_PRODUCT_DICT: dict[tuple[int, int], list[str]] = {
     (0x27AC, 0x1351): ["VRUBrain-v51"],
 }
 
-# Maps 16-bit APJ board ID to board name(s) for 261 supported boards
+# Maps 16-bit APJ board ID to board name(s) for 265 supported boards
 APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     1124: ["3DRControlZeroG"],
     7120: ["AcctonGodwit_GA1"],
     1115: ["ACNS-CM4Pilot"],
     1116: ["ACNS-F405AIO"],
     1198: ["AEDROXH7"],
+    4300: ["AeroCogito-H7Digital"],
     7110: ["AEROFOX-H7"],
     2024: ["AET-H743-Basic"],
     128: ["airbotf4"],
@@ -66,6 +67,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     1134: ["AR-F407SmartBat"],
     83: ["ARK_CANNODE"],
     59: ["ARK_FPV"],
+    58: ["ARK_PI6X"],
     57: ["ARKV6X"],
     1078: ["AtomRCF405NAVI"],
     1143: ["ATOMRCF405NAVI-Deluxe"],
@@ -120,6 +122,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     135: ["F35Lightning"],
     20: ["F4BY"],
     1530: ["F4BY_F427"],
+    1531: ["F4BY_H743"],
     1067: ["FlyingMoonF407"],
     1068: ["FlyingMoonF427"],
     1112: ["FlyingMoonH743"],
@@ -201,6 +204,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     133: ["OmnibusNanoV6"],
     1191: ["ORBITH743"],
     1155: ["OrqaF405Pro"],
+    1204: ["OrqaH743Pro"],
     1032: ["PixC4-Jetson"],
     1090: ["PixFlamingo"],
     1131: ["PixFlamingo-F767"],
@@ -277,13 +281,14 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     5600: ["ZeroOneX6", "ZeroOneX6_Air"],
 }
 
-# Maps 16-bit APJ board ID to board vendor for 261 supported boards
+# Maps 16-bit APJ board ID to board vendor for 265 supported boards
 APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1124: ["3DR"],  # 3DRControlZeroG
     7120: ["ArduPilot"],  # AcctonGodwit_GA1
     1115: ["ArduPilot"],  # ACNS-CM4Pilot
     1116: ["ArduPilot"],  # ACNS-F405AIO
     1198: ["ArduPilot"],  # AEDROXH7
+    4300: ["ArduPilot"],  # AeroCogito-H7Digital
     7110: ["ArduPilot"],  # AEROFOX-H7
     2024: ["AET"],  # AET-H743-Basic
     128: ["ArduPilot"],  # airbotf4
@@ -294,6 +299,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1134: ["ArduPilot"],  # AR-F407SmartBat
     83: ["ArduPilot"],  # ARK_CANNODE
     59: ["ArduPilot"],  # ARK_FPV
+    58: ["ArduPilot"],  # ARK_PI6X
     57: ["ArduPilot"],  # ARKV6X
     1078: ["ArduPilot"],  # AtomRCF405NAVI
     1143: ["ArduPilot"],  # ATOMRCF405NAVI-Deluxe
@@ -310,7 +316,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1168: ["ArduPilot"],  # BlitzWingH743
     1148: ["ArduPilot"],  # BotBloxDroneNet
     2501: ["ArduPilot"],  # BOTWINGF405
-    1184: ["DM"],  # BrahmaF4
+    1184: ["ArduPilot"],  # BrahmaF4
     5811: ["ArduPilot"],  # BROTHERHOBBYF405v3
     5810: ["ArduPilot"],  # BROTHERHOBBYH743
     1085: ["ArduPilot"],  # C-RTK2-HP
@@ -348,6 +354,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     135: ["ArduPilot"],  # F35Lightning
     20: ["Swift-Flyer"],  # F4BY
     1530: ["Swift-Flyer"],  # F4BY_F427
+    1531: ["ArduPilot"],  # F4BY_H743
     1067: ["ArduPilot"],  # FlyingMoonF407
     1068: ["ArduPilot"],  # FlyingMoonF427
     1112: ["ArduPilot"],  # FlyingMoonH743
@@ -429,6 +436,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     133: ["ArduPilot"],  # OmnibusNanoV6
     1191: ["ORBITH743"],  # ORBITH743
     1155: ["ArduPilot"],  # OrqaF405Pro
+    1204: ["ArduPilot"],  # OrqaH743Pro
     1032: ["Horizon31"],  # PixC4-Jetson
     1090: ["Dheeran labs"],  # PixFlamingo
     1131: ["Dheeran labs"],  # PixFlamingo-F767
@@ -505,13 +513,14 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     5600: ["ArduPilot"],  # ZeroOneX6, ZeroOneX6_Air
 }
 
-# Maps 16-bit APJ board ID to MCU series for 261 supported boards
+# Maps 16-bit APJ board ID to MCU series for 265 supported boards
 APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     1124: ["STM32H7xx"],  # 3DRControlZeroG
     7120: ["STM32H7xx"],  # AcctonGodwit_GA1
     1115: ["STM32F4xx"],  # ACNS-CM4Pilot
     1116: ["STM32F4xx"],  # ACNS-F405AIO
     1198: ["STM32H7xx"],  # AEDROXH7
+    4300: ["STM32H7xx"],  # AeroCogito-H7Digital
     7110: ["STM32H7xx"],  # AEROFOX-H7
     2024: ["STM32H7xx"],  # AET-H743-Basic
     128: ["STM32F4xx"],  # airbotf4
@@ -522,6 +531,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     1134: ["CKS32F4xx"],  # AR-F407SmartBat
     83: ["STM32F4xx"],  # ARK_CANNODE
     59: ["STM32H7xx"],  # ARK_FPV
+    58: ["STM32H7xx"],  # ARK_PI6X
     57: ["STM32H7xx"],  # ARKV6X
     1078: ["STM32F4xx"],  # AtomRCF405NAVI
     1143: ["STM32F4xx"],  # ATOMRCF405NAVI-Deluxe
@@ -576,6 +586,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     135: ["STM32F4xx"],  # F35Lightning
     20: ["STM32F4xx"],  # F4BY
     1530: ["STM32F4xx"],  # F4BY_F427
+    1531: ["STM32H7xx"],  # F4BY_H743
     1067: ["STM32F4xx"],  # FlyingMoonF407
     1068: ["STM32F4xx"],  # FlyingMoonF427
     1112: ["STM32H7xx"],  # FlyingMoonH743
@@ -657,6 +668,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     133: ["STM32F4xx"],  # OmnibusNanoV6
     1191: ["STM32H7xx"],  # ORBITH743
     1155: ["STM32F4xx"],  # OrqaF405Pro
+    1204: ["STM32H7xx"],  # OrqaH743Pro
     1032: ["STM32H7xx"],  # PixC4-Jetson
     1090: ["STM32L4xx"],  # PixFlamingo
     1131: ["STM32F7xx"],  # PixFlamingo-F767
@@ -733,12 +745,12 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     5600: ["STM32H7xx"],  # ZeroOneX6, ZeroOneX6_Air
 }
 
-# Maps MCU series to 16-bit APJ board ID for 261 supported boards
+# Maps MCU series to 16-bit APJ board ID for 265 supported boards
 MCU_SERIES_APJ_BOARD_ID_DICT: dict[str, list[int]] = {
     "CKS32F4xx": [1134, 1065],  # AR-F407SmartBat, QioTekAdeptF407
     "STM32F4xx": [1115, 1116, 128, 83, 1078, 1143, 1125, 1044, 2501, 1184, 5811, 1085, 1064, 1187, 1177, 12, 1158, 9, 1003, 1190, 5800, 13, 135, 20, 1530, 1067, 1068, 1180, 1137, 1099, 1157, 1119, 5401, 1081, 1059, 1412, 1169, 122, 5406, 1030, 1422, 11, 1038, 1019, 125, 1014, 1054, 127, 6101, 1161, 1150, 88, 3, 1002, 131, 137, 133, 1155, 1140, 1096, 1076, 1107, 1021, 124, 1052, 1055, 1034, 1095, 1201, 130, 1197, 134, 5271, 1135, 1106, 1082, 1136, 1500, 1504, 1011, 6001, 6002, 6000, 5251, 212, 213, 1151, 1152, 1154, 1910, 1351],  # ACNS-CM4Pilot, ACNS-F405AIO, airbotf4, ARK_CANNODE, AtomRCF405NAVI, ATOMRCF405NAVI-Deluxe, BETAFPV-F405, BirdCANdy, BOTWINGF405, BrahmaF4, BROTHERHOBBYF405v3, C-RTK2-HP, CarbonixF405, CORVON405V2_1, CrazyF405, crazyflie2, CSKY405, CUAV-Pixhack-v3, CubeBlack, CubeGreen-solo, CubePurple, CubeSolo, fmuv2, fmuv3, mRoX21, Pixhawk1, Pixhawk1-1M, skyviper-f412-rev1, skyviper-journey, skyviper-v2450, CubeBlack+, DAKEFPVF405, DroneerF405, DrotekP3Pro, F35Lightning, F4BY, F4BY_F427, FlyingMoonF407, FlyingMoonF427, FlywooF405HD-AIOv2, FlywooF405Pro, FlywooF405S-AIO, FoxeerF405v2, HEEWING-F405, HEEWING-F405v2, HolybroF4_PMU, JHEM_JHEF405, JHEMCU-GSF405A, JHEMCU-GSF405A-RX2, JHEMCUF405PRO, JHEMCUF405WING, KakuteF4, KakuteF4-Wing, KakuteF4Mini, LongBowF405WING, luminousbee4, Pixracer, MambaF405-2022, MambaF405v2, MatekF405, MatekF405-STD, MatekF405-CAN, MatekF405-TE, MatekF405-Wing, MFE_POS3_CAN, MicoAir405Mini, MicoAir405v2, mindpx-v2, mini-pix, omnibusf4, omnibusf4pro, omnibusf4pro-one, omnibusf4v6, OmnibusNanoV6, OrqaF405Pro, PixPilot-C3, PixPilot-V3, PixSurveyA1, PixSurveyA1-IND, QioTekZealotF427, revo-mini, revo-mini-i2c, revo-mini-sd, Sierra-F405, Sierra-F412, Sierra-F9P, Sierra-PrecisionPoint, SkystarsF405v2, sparky2, SPEDIXF405, speedybeef4, SpeedyBeeF405AIO, SpeedyBeeF405Mini, SpeedyBeeF405WING, speedybeef4v3, speedybeef4v4, StellarF4, StellarF4V2, SuccexF4, sw-boom-f407, sw-nav-f405, sw-spar-f407, TBS_LUCID_PRO, thepeach-k1, thepeach-r1, VRBrain-v51, VRBrain-v52, VRBrain-v54, VRCore-v10, VRUBrain-v51
     "STM32F7xx": [55, 1026, 1057, 1164, 1117, 1163, 50, 120, 1027, 1042, 1028, 1501, 1084, 123, 145, 4500, 143, 188, 41775, 141, 136, 1222, 121, 1131, 51, 1008, 1410, 1074],  # AIRLink, BeastF7, BeastF7v2, BlitzF745, BlitzF745AIO, BlitzMiniF745, CUAVv5, CUAVv5Nano, fmuv5, PH4-mini, Pix32v5, Pixhawk4, Swan-K1, TBS-Colibri-F7, CubeYellow, FlywooF745, FlywooF745Nano, FreeflyRTK, GEPRCF745BTHD, JFB100, KakuteF7, KakuteF7Mini, LumenierLUXF765-NDAA, MatekF765-SE, MatekF765-Wing, MazzyStarDrone, modalai_fc-v1, mRoControlZeroF7, mRoX21-777, MUPilot, OMNIBUSF7V2, PixFlamingo-F767, Pixhawk5X, R9Pilot, RadiolinkPIX6, ReaperF745
-    "STM32H7xx": [1124, 7120, 1198, 7110, 2024, 5200, 1146, 5210, 59, 57, 1025, 1056, 1162, 1168, 1148, 5810, 1182, 1156, 1189, 7000, 1009, 7001, 7002, 1010, 1079, 140, 1033, 1063, 1069, 1409, 1070, 1193, 1194, 1061, 139, 1112, 1181, 1089, 1502, 1071, 146, 1043, 1173, 1110, 1411, 1048, 1105, 1058, 1315, 1029, 1073, 1013, 1149, 2000, 1166, 1176, 1179, 1022, 1023, 1024, 1015, 1017, 1188, 1183, 1159, 1191, 1032, 56, 53, 1408, 1083, 1160, 6104, 1036, 1118, 1102, 1111, 1167, 1195, 1123, 2714, 1075, 1196, 1060, 1108, 1503, 2005, 6110, 5250, 5253, 1138, 5230, 7100, 1174, 1234, 1113, 1127, 1141, 1144, 5600],  # 3DRControlZeroG, AcctonGodwit_GA1, AEDROXH7, AEROFOX-H7, AET-H743-Basic, Airvolute-DCS2, AnyleafH7, Aocoda-RC-H743Dual, ARK_FPV, ARKV6X, BeastH7, BeastH7v2, BlitzH743Pro, BlitzWingH743, BotBloxDroneNet, BROTHERHOBBYH743, CBU-H7-LC-Stamp, CBU-H7-Stamp, CORVON743V1, CUAV-7-Nano, CUAV-Nora, CUAV-V6X-v2, CUAV-X25-EVO, CUAV-X7, CubeNode, CubeOrange, CubeOrange-joey, CubeOrangePlus, CubeRedPrimary, CubeRedPrimary-PPPGW, CubeRedSecondary, CubeRedSecondary-IO, DAKEFPVH743, DAKEFPVH743Pro, DevEBoxH7v2, Durandal, NucleoH743, NucleoH755, FlyingMoonH743, FlywooH743Pro, FoxeerH743v1, GEPRC_TAKER_H743, GreenSightUltraBlue, H757I_EVAL, H757I_EVAL_intf, Here4AP, Here4FC, IFLIGHT_2RAW_H7, JFB110, JHEMCU-H743HD, KakuteH7, KakuteH7v2, KakuteH7-Wing, KakuteH7Mini, KakuteH7Mini-Nand, kha_eth, luminousbee5, MambaH743v4, MatekH743, MatekH7A3, MFT-SEMA100, MicoAir743, MicoAir743-AIO, MicoAir743v2, mRoControlZeroClassic, mRoControlZeroH7, mRoControlZeroOEMH7, mRoCZeroOEMH7, mRoNexus, mRoPixracerPro, NarinFC-H5, NarinFC-H7, NxtPX4v2, ORBITH743, PixC4-Jetson, Pixhawk6C, Pixhawk6X, Pixhawk6X-PPPGW, PixPilot-V6, PixPilot-V6PRO, PixSurveyA2-IND, QioTekZealotH743, RADIX2HD, rFCU, SDMODELH7V1, SDMODELH7V2, SequreH743, SIYI_N7, SkySakuraH743, SkystarsH7HD, SkystarsH7HDv2, SPEDIXH743, SPRacingH7, SPRacingH7RF, StellarH7V2, SULILGH7-P1-P2, SVehicle-E2, TBS_LUCID_H7, TBS_LUCID_H7_WING, TMotorH743, uav-dev-fc-um982, VUAV-V7pro, X-MAV-AP-H743v2, YARIV6X, YJUAV_A6, YJUAV_A6SE, YJUAV_A6SE_H743, YJUAV_A6Ultra, ZeroOneX6, ZeroOneX6_Air
+    "STM32H7xx": [1124, 7120, 1198, 4300, 7110, 2024, 5200, 1146, 5210, 59, 58, 57, 1025, 1056, 1162, 1168, 1148, 5810, 1182, 1156, 1189, 7000, 1009, 7001, 7002, 1010, 1079, 140, 1033, 1063, 1069, 1409, 1070, 1193, 1194, 1061, 139, 1531, 1112, 1181, 1089, 1502, 1071, 146, 1043, 1173, 1110, 1411, 1048, 1105, 1058, 1315, 1029, 1073, 1013, 1149, 2000, 1166, 1176, 1179, 1022, 1023, 1024, 1015, 1017, 1188, 1183, 1159, 1191, 1204, 1032, 56, 53, 1408, 1083, 1160, 6104, 1036, 1118, 1102, 1111, 1167, 1195, 1123, 2714, 1075, 1196, 1060, 1108, 1503, 2005, 6110, 5250, 5253, 1138, 5230, 7100, 1174, 1234, 1113, 1127, 1141, 1144, 5600],  # 3DRControlZeroG, AcctonGodwit_GA1, AEDROXH7, AeroCogito-H7Digital, AEROFOX-H7, AET-H743-Basic, Airvolute-DCS2, AnyleafH7, Aocoda-RC-H743Dual, ARK_FPV, ARK_PI6X, ARKV6X, BeastH7, BeastH7v2, BlitzH743Pro, BlitzWingH743, BotBloxDroneNet, BROTHERHOBBYH743, CBU-H7-LC-Stamp, CBU-H7-Stamp, CORVON743V1, CUAV-7-Nano, CUAV-Nora, CUAV-V6X-v2, CUAV-X25-EVO, CUAV-X7, CubeNode, CubeOrange, CubeOrange-joey, CubeOrangePlus, CubeRedPrimary, CubeRedPrimary-PPPGW, CubeRedSecondary, CubeRedSecondary-IO, DAKEFPVH743, DAKEFPVH743Pro, DevEBoxH7v2, Durandal, NucleoH743, NucleoH755, F4BY_H743, FlyingMoonH743, FlywooH743Pro, FoxeerH743v1, GEPRC_TAKER_H743, GreenSightUltraBlue, H757I_EVAL, H757I_EVAL_intf, Here4AP, Here4FC, IFLIGHT_2RAW_H7, JFB110, JHEMCU-H743HD, KakuteH7, KakuteH7v2, KakuteH7-Wing, KakuteH7Mini, KakuteH7Mini-Nand, kha_eth, luminousbee5, MambaH743v4, MatekH743, MatekH7A3, MFT-SEMA100, MicoAir743, MicoAir743-AIO, MicoAir743v2, mRoControlZeroClassic, mRoControlZeroH7, mRoControlZeroOEMH7, mRoCZeroOEMH7, mRoNexus, mRoPixracerPro, NarinFC-H5, NarinFC-H7, NxtPX4v2, ORBITH743, OrqaH743Pro, PixC4-Jetson, Pixhawk6C, Pixhawk6X, Pixhawk6X-PPPGW, PixPilot-V6, PixPilot-V6PRO, PixSurveyA2-IND, QioTekZealotH743, RADIX2HD, rFCU, SDMODELH7V1, SDMODELH7V2, SequreH743, SIYI_N7, SkySakuraH743, SkystarsH7HD, SkystarsH7HDv2, SPEDIXH743, SPRacingH7, SPRacingH7RF, StellarH7V2, SULILGH7-P1-P2, SVehicle-E2, TBS_LUCID_H7, TBS_LUCID_H7_WING, TMotorH743, uav-dev-fc-um982, VUAV-V7pro, X-MAV-AP-H743v2, YARIV6X, YJUAV_A6, YJUAV_A6SE, YJUAV_A6SE_H743, YJUAV_A6Ultra, ZeroOneX6, ZeroOneX6_Air
     "STM32L476": [1051],  # Nucleo-L476
     "STM32L496": [1047],  # Nucleo-L496
     "STM32L4xx": [1090],  # PixFlamingo

ardupilot_methodic_configurator/data_model_par_dict.py

@@ -185,7 +185,7 @@ class ParDict(dict[str, Par]):
         # Compare the parts separately
         return tuple(parts)
 
-    def _format_params(self, file_format: str = "missionplanner") -> list[str]:  # pylint: disable=too-many-branches
+    def _format_params(self, file_format: str = "missionplanner") -> list[str]:
         """
         Formats the parameters in this dictionary into a list of strings.
 
@@ -208,27 +208,26 @@ class ParDict(dict[str, Par]):
             msg = f"ERROR: Unsupported file format {file_format}"
             raise SystemExit(msg)
 
-        formatted_params = []
         if file_format == "missionplanner":
-            for key, parameter in sorted_dict.items():
-                if isinstance(parameter, Par):
-                    if parameter.comment:
-                        formatted_params.append(
-                            f"{key},{format(parameter.value, '.6f').rstrip('0').rstrip('.')}  # {parameter.comment}"
-                        )
-                    else:
-                        formatted_params.append(f"{key},{format(parameter.value, '.6f').rstrip('0').rstrip('.')}")
-                else:
-                    formatted_params.append(f"{key},{format(parameter, '.6f').rstrip('0').rstrip('.')}")
+            formatted_params = [
+                (
+                    f"{key},{format(parameter.value, '.6f').rstrip('0').rstrip('.')}  # {parameter.comment}"
+                    if isinstance(parameter, Par) and parameter.comment
+                    else f"{key},{format(parameter.value if isinstance(parameter, Par) else parameter, '.6f').rstrip('0').rstrip('.')}"  # noqa: E501 # pylint: disable=line-too-long
+                )
+                for key, parameter in sorted_dict.items()
+            ]
         elif file_format == "mavproxy":
-            for key, parameter in sorted_dict.items():
-                if isinstance(parameter, Par):
-                    if parameter.comment:
-                        formatted_params.append(f"{key:<16} {parameter.value:<8.6f}  # {parameter.comment}")
-                    else:
-                        formatted_params.append(f"{key:<16} {parameter.value:<8.6f}")
-                else:
-                    formatted_params.append(f"{key:<16} {parameter:<8.6f}")
+            formatted_params = [
+                (
+                    f"{key:<16} {parameter.value:<8.6f}  # {parameter.comment}"
+                    if isinstance(parameter, Par) and parameter.comment
+                    else f"{key:<16} {parameter.value if isinstance(parameter, Par) else parameter:<8.6f}"
+                )
+                for key, parameter in sorted_dict.items()
+            ]
+        else:
+            formatted_params = []
         return formatted_params
 
     def export_to_param(
@@ -413,10 +412,7 @@ class ParDict(dict[str, Par]):
             A new ParDict with Par objects created from the float values.
 
         """
-        result = cls()
-        for param_name, param_value in param_dict.items():
-            result[param_name] = Par(float(param_value), default_comment)
-        return result
+        return cls({param_name: Par(float(param_value), default_comment) for param_name, param_value in param_dict.items()})
 
     @classmethod
     def from_fc_parameters(cls, fc_params: dict[str, float]) -> "ParDict":
@@ -447,17 +443,18 @@ class ParDict(dict[str, Par]):
             A new ParDict containing only non-default parameters.
 
         """
-        result = ParDict()
-        for param_name, param_info in self.items():
-            if param_name in default_params:
-                if tolerance_func:
-                    if not tolerance_func(param_info.value, default_params[param_name].value):
-                        result[param_name] = param_info
-                elif param_info.value != default_params[param_name].value:
-                    result[param_name] = param_info
-            else:
-                result[param_name] = param_info
-        return result
+        return ParDict(
+            {
+                param_name: param_info
+                for param_name, param_info in self.items()
+                if param_name not in default_params
+                or (
+                    not tolerance_func(param_info.value, default_params[param_name].value)
+                    if tolerance_func
+                    else param_info.value != default_params[param_name].value
+                )
+            }
+        )
 
     def _filter_by_readonly(self, doc_dict: dict) -> "ParDict":
         """
@@ -470,11 +467,13 @@ class ParDict(dict[str, Par]):
             A new ParDict containing only read-only parameters.
 
         """
-        result = ParDict()
-        for param_name, param_info in self.items():
-            if param_name in doc_dict and doc_dict[param_name].get("ReadOnly", False):
-                result[param_name] = param_info
-        return result
+        return ParDict(
+            {
+                param_name: param_info
+                for param_name, param_info in self.items()
+                if param_name in doc_dict and doc_dict[param_name].get("ReadOnly", False)
+            }
+        )
 
     def _filter_by_calibration(self, doc_dict: dict) -> "ParDict":
         """
@@ -487,11 +486,13 @@ class ParDict(dict[str, Par]):
             A new ParDict containing only calibration parameters.
 
         """
-        result = ParDict()
-        for param_name, param_info in self.items():
-            if param_name in doc_dict and doc_dict[param_name].get("Calibration", False):
-                result[param_name] = param_info
-        return result
+        return ParDict(
+            {
+                param_name: param_info
+                for param_name, param_info in self.items()
+                if param_name in doc_dict and doc_dict[param_name].get("Calibration", False)
+            }
+        )
 
     def categorize_by_documentation(
         self,
@@ -521,10 +522,13 @@ class ParDict(dict[str, Par]):
         calibration_params = non_default_params._filter_by_calibration(doc_dict)  # pylint: disable=protected-access # noqa: SLF001
 
         # Non-calibration parameters are those that are not read-only and not calibration
-        other_params = ParDict()
-        for param_name, param_info in non_default_params.items():
-            if param_name not in read_only_params and param_name not in calibration_params:
-                other_params[param_name] = param_info
+        other_params = ParDict(
+            {
+                param_name: param_info
+                for param_name, param_info in non_default_params.items()
+                if param_name not in read_only_params and param_name not in calibration_params
+            }
+        )
 
         return read_only_params, calibration_params, other_params
 
@@ -539,8 +543,9 @@ class ParDict(dict[str, Par]):
             A new ParDict with updated comments.
 
         """
-        result = ParDict()
-        for param_name, param in self.items():
-            new_comment = comment_lookup.get(param_name, param.comment or "")
-            result[param_name] = Par(param.value, new_comment)
-        return result
+        return ParDict(
+            {
+                param_name: Par(param.value, comment_lookup.get(param_name, param.comment or ""))
+                for param_name, param in self.items()
+            }
+        )

ardupilot_methodic_configurator/frontend_tkinter_base_window.py

@@ -23,7 +23,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 import io
 import os
 import tkinter as tk
-import tkinter.font as tkfont
 
 # from logging import debug as logging_debug
 # from logging import info as logging_info
@@ -35,6 +34,7 @@ from PIL import Image
 
 from ardupilot_methodic_configurator import _
 from ardupilot_methodic_configurator.backend_filesystem import LocalFilesystem
+from ardupilot_methodic_configurator.frontend_tkinter_font import get_safe_font_size
 
 
 def is_debugging() -> bool:
@@ -160,7 +160,7 @@ class BaseWindow:
         style.theme_use("alt")
 
         # Create custom styles with DPI-aware font sizes
-        self.default_font_size = tkfont.nametofont("TkDefaultFont").cget("size")
+        self.default_font_size = get_safe_font_size()
         # Warning: on linux the font size might be negative
         bold_font_size = self.calculate_scaled_font_size(self.default_font_size)
         style.configure("Bold.TLabel", font=("TkDefaultFont", bold_font_size, "bold"))

ardupilot_methodic_configurator/frontend_tkinter_connection_selection.py

@@ -14,14 +14,15 @@ import tkinter as tk
 from argparse import ArgumentParser, Namespace
 from logging import basicConfig as logging_basicConfig
 from logging import debug as logging_debug
+from logging import error as logging_error
 from logging import getLevelName as logging_getLevelName
 from logging import warning as logging_warning
 from sys import exit as sys_exit
-from tkinter import simpledialog, ttk
+from tkinter import messagebox, simpledialog, ttk
 from typing import Union
 
 from ardupilot_methodic_configurator import _
-from ardupilot_methodic_configurator.backend_flightcontroller import FlightController
+from ardupilot_methodic_configurator.backend_flightcontroller import SUPPORTED_BAUDRATES, FlightController
 from ardupilot_methodic_configurator.common_arguments import add_common_arguments
 from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 from ardupilot_methodic_configurator.frontend_tkinter_pair_tuple_combobox import PairTupleCombobox
@@ -44,11 +45,13 @@ class ConnectionSelectionWidgets:  # pylint: disable=too-many-instance-attribute
         flight_controller: FlightController,
         destroy_parent_on_connect: bool,
         download_params_on_connect: bool,
+        default_baudrate: int = 115200,
     ) -> None:
         self.parent = parent
         self.flight_controller = flight_controller
         self.destroy_parent_on_connect = destroy_parent_on_connect
         self.download_params_on_connect = download_params_on_connect
+        self.default_baudrate = default_baudrate
         self.previous_selection: Union[None, str] = (
             flight_controller.comport.device
             if flight_controller.comport and hasattr(flight_controller.comport, "device")
@@ -63,21 +66,49 @@ class ConnectionSelectionWidgets:  # pylint: disable=too-many-instance-attribute
         conn_selection_label = ttk.Label(self.container_frame, text=_("flight controller connection:"))
         conn_selection_label.pack(side=tk.TOP)  # Add the label to the top of the conn_selection_frame
 
+        # Create a frame for connection and baudrate selection
+        selection_frame = ttk.Frame(self.container_frame)
+        selection_frame.pack(side=tk.TOP, pady=(4, 0))
+
+        # Create a label for port
+        port_label = ttk.Label(selection_frame, text=_("Port:"))
+        port_label.pack(side=tk.LEFT, padx=(0, 5))
+
         # Create a read-only combobox for flight controller connection selection
         self.conn_selection_combobox = PairTupleCombobox(
-            self.container_frame,
+            selection_frame,
             self.flight_controller.get_connection_tuples(),
             self.previous_selection,
             "FC connection",
             state="readonly",
         )
         self.conn_selection_combobox.bind("<<ComboboxSelected>>", self.on_select_connection_combobox_change, "+")
-        self.conn_selection_combobox.pack(side=tk.TOP, pady=(4, 0))
+        self.conn_selection_combobox.pack(side=tk.LEFT, padx=(0, 5))
         show_tooltip(
             self.conn_selection_combobox,
             _("Select the flight controller connection\nYou can add a custom connection to the existing ones"),
         )
 
+        # Create a label for baudrate
+        baudrate_label = ttk.Label(selection_frame, text=_("Baudrate:"))
+        baudrate_label.pack(side=tk.LEFT, padx=(10, 5))
+
+        # Create a combobox for baudrate selection
+        self.baudrate_var = tk.StringVar(value=str(self.default_baudrate))
+        self.baudrate_combobox = ttk.Combobox(
+            selection_frame,
+            textvariable=self.baudrate_var,
+            values=SUPPORTED_BAUDRATES,
+            state="normal",
+            width=10,
+        )
+        self.baudrate_combobox.pack(side=tk.LEFT, padx=(0, 5))
+        self.baudrate_combobox.bind("<<ComboboxSelected>>", self.on_baudrate_combobox_change, "+")
+        show_tooltip(
+            self.baudrate_combobox,
+            _("Select the baudrate for the connection\nMost flight controllers use 115200"),
+        )
+
     def on_select_connection_combobox_change(self, _event: tk.Event) -> None:
         selected_connection = self.conn_selection_combobox.get_selected_key()
         error_msg = _("Connection combobox changed to: {selected_connection}")
@@ -95,6 +126,23 @@ class ConnectionSelectionWidgets:  # pylint: disable=too-many-instance-attribute
                 return
             self.reconnect(selected_connection)  # type: ignore[arg-type] # workaround for mypy issue
 
+    def on_baudrate_combobox_change(self, _event: tk.Event) -> None:
+        """Handle baudrate combobox selection changes."""
+        _selected_baudrate = self.baudrate_var.get()
+        error_msg = _("Baudrate combobox changed to: {_selected_baudrate}")
+        logging_debug(error_msg.format(**locals()))
+
+        # Get the current connection
+        current_connection = (
+            self.flight_controller.comport.device
+            if self.flight_controller.comport and hasattr(self.flight_controller.comport, "device")
+            else None
+        )
+
+        # If we have an active connection, reconnect with the new baudrate
+        if self.flight_controller.master is not None and current_connection:
+            self.reconnect(current_connection)
+
     def add_connection(self) -> str:
         # Open the connection selection dialog
         selected_connection = simpledialog.askstring(
@@ -126,8 +174,28 @@ class ConnectionSelectionWidgets:  # pylint: disable=too-many-instance-attribute
         self.connection_progress_window = ProgressWindow(
             self.parent.root, _("Connecting with the FC"), _("Connection step {} of {}")
         )
+        # Get the current baudrate from the combobox
+        selected_baudrate = "unknown"  # Initialize with default value for error handling
+        try:
+            selected_baudrate = self.baudrate_var.get()
+            current_baudrate = int(selected_baudrate)
+            if str(current_baudrate) not in SUPPORTED_BAUDRATES:
+                warning_msg = _("Unsupported baudrate selected: {current_baudrate}")
+                logging_warning(warning_msg.format(**locals()))
+            if current_baudrate < 1200:
+                raise ValueError
+        except (ValueError, AttributeError):
+            error_msg = _("Invalid baudrate selected: {selected_baudrate}, reverting to default: {self.default_baudrate}")
+            error_msg = error_msg.format(**locals())
+            # Display error popup
+            messagebox.showerror(_("Invalid Baudrate"), error_msg)
+            logging_error(error_msg)
+            # Reset the combobox to the default value
+            self.baudrate_var.set(str(self.default_baudrate))
+            current_baudrate = self.default_baudrate
+
         error_message = self.flight_controller.connect(
-            selected_connection, self.connection_progress_window.update_progress_bar
+            selected_connection, self.connection_progress_window.update_progress_bar, baudrate=current_baudrate
         )
         if error_message:
             show_no_connection_error(error_message)
@@ -152,10 +220,16 @@ class ConnectionSelectionWindow(BaseWindow):
     the UI elements related to connection selection.
     """
 
-    def __init__(self, flight_controller: FlightController, connection_result_string: str) -> None:
+    def __init__(
+        self,
+        flight_controller: FlightController,
+        connection_result_string: str,
+        default_baudrate: int = 115200,
+    ) -> None:
         super().__init__()
         self.root.title(_("Flight controller connection"))
-        self.root.geometry("460x462")  # Set the window size
+        self.root.geometry("520x462")  # Set the window size
+        self.default_baudrate = default_baudrate
 
         # Explain why we are here
         if flight_controller.comport is None:
@@ -209,9 +283,14 @@ class ConnectionSelectionWindow(BaseWindow):
         # pylint: enable=duplicate-code
         option2_label.pack(expand=False, fill=tk.X, padx=6)
         self.connection_selection_widgets = ConnectionSelectionWidgets(
-            self, option2_label_frame, flight_controller, destroy_parent_on_connect=True, download_params_on_connect=False
+            self,
+            option2_label_frame,
+            flight_controller,
+            destroy_parent_on_connect=True,
+            download_params_on_connect=False,
+            default_baudrate=self.default_baudrate,
         )
-        self.connection_selection_widgets.container_frame.pack(expand=False, fill=tk.X, padx=80, pady=6)
+        self.connection_selection_widgets.container_frame.pack(expand=False, fill=tk.X, padx=5, pady=6)
 
         # Option 3 - Skip FC connection, just edit the .param files on disk
         option3_label = ttk.Label(text=_("No connection"), style="Bold.TLabel")
@@ -289,7 +368,7 @@ def main() -> None:
     result = flight_controller.connect(device=args.device)
     if result:
         logging_warning(result)
-        window = ConnectionSelectionWindow(flight_controller, result)
+        window = ConnectionSelectionWindow(flight_controller, result, default_baudrate=args.baudrate)
         window.root.mainloop()
     flight_controller.disconnect()  # Disconnect from the flight controller