mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-15 07:29:15 +01:00
Merge next conflict resolution
This commit is contained in:
parent
0a4101c915
commit
0e3236553b
@ -120,8 +120,8 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
|
||||
airframeTypes << "Fixed Wing" << "Multirotor" << "Helicopter" << "Ground" << "Custom";
|
||||
m_aircraft->aircraftType->addItems(airframeTypes);
|
||||
|
||||
m_aircraft->aircraftType->setCurrentIndex(0); //Set default vehicle to Fixedwing
|
||||
m_aircraft->airframesWidget->setCurrentIndex(0); // Force the tab index to match
|
||||
m_aircraft->aircraftType->setCurrentIndex(1); //Set default vehicle to MultiRotor
|
||||
m_aircraft->airframesWidget->setCurrentIndex(1); // Force the tab index to match
|
||||
|
||||
QStringList fixedWingTypes;
|
||||
fixedWingTypes << "Elevator aileron rudder" << "Elevon" << "Vtail";
|
||||
|
Loading…
x
Reference in New Issue
Block a user