Skip to content

Q
qgroundcontrol
Commit c66569be authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Merge branch 'master' into thread_test_integration

parents 7e990557 de90f69e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
src/ui/px4_configuration/QGCPX4AirframeConfig.cc
View file @ c66569be
...@@ -25,9 +25,8 @@ QGCPX4AirframeConfig::QGCPX4AirframeConfig(QWidget *parent) : ...@@ -25,9 +25,8 @@ QGCPX4AirframeConfig::QGCPX4AirframeConfig(QWidget *parent) :
// Fill the lists here manually in accordance with the list from: // Fill the lists here manually in accordance with the list from:
// https://github.com/PX4/Firmware/blob/master/ROMFS/px4fmu_common/init.d/rcS // https://github.com/PX4/Firmware/blob/master/ROMFS/px4fmu_common/init.d/rcS
ui->simComboBox->addItem(tr("Plane Sensor (HilStar, X-Plane)"), 1000); ui->simComboBox->addItem(tr("Plane (HilStar, X-Plane)"), 1000);
ui->simComboBox->addItem(tr("Plane Sensor (Rascal, FlightGear)"), 1004); ui->simComboBox->addItem(tr("Plane (Rascal, FlightGear)"), 1004);
//ui->simComboBox->addItem(tr("Plane State (HilStar, X-Plane)"), 1002);
ui->simComboBox->addItem(tr("Quad X HIL"), 1001); ui->simComboBox->addItem(tr("Quad X HIL"), 1001);
ui->simComboBox->addItem(tr("Quad + HIL"), 1003); ui->simComboBox->addItem(tr("Quad + HIL"), 1003);
...@@ -57,8 +56,7 @@ QGCPX4AirframeConfig::QGCPX4AirframeConfig(QWidget *parent) : ...@@ -57,8 +56,7 @@ QGCPX4AirframeConfig::QGCPX4AirframeConfig(QWidget *parent) :
ui->quadXComboBox->addItem(tr("DJI F330 8\" Quad"), 4010); ui->quadXComboBox->addItem(tr("DJI F330 8\" Quad"), 4010);
ui->quadXComboBox->addItem(tr("DJI F450 10\" Quad"), 4011); ui->quadXComboBox->addItem(tr("DJI F450 10\" Quad"), 4011);
ui->quadXComboBox->addItem(tr("Turnigy Talon v2 X550 Quad"), 4012); ui->quadXComboBox->addItem(tr("Turnigy Talon v2 X550 Quad"), 4012);
//ui->quadXComboBox->addItem(tr("AR.Drone Frame Quad"), 4008); ui->quadXComboBox->addItem(tr("AR.Drone Frame Quad"), 4008);
//ui->quadXComboBox->addItem(tr("AR.Drone Quad (w. PX4FLOW)"), 4009);
ui->quadXComboBox->addItem(tr("DJI F330 with MK BLCTRL"), 4017); ui->quadXComboBox->addItem(tr("DJI F330 with MK BLCTRL"), 4017);
ui->quadXComboBox->addItem(tr("Mikrokopter X frame"), 4019); ui->quadXComboBox->addItem(tr("Mikrokopter X frame"), 4019);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment