rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

OP-510 Issue with patch in source file, sorry.

Browse Source
This commit is contained in:
elafargue 2011-05-30 07:38:37 +02:00
parent 46824dea4e
commit 887a23a3cf
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/openpilotgcs/src/plugins/config/configairframewidget.cpp
View File

@ -2056,16 +2056,8 @@ void ConfigAirframeWidget::sendAircraftUpdate()
obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("ActuatorSettings")));
Q_ASSERT(obj);
<<<<<<< HEAD
motorList << "VTOLMotorNW" << "VTOLMotorNE" << "VTOLMotorS";
setupMotors(motorList);
field = obj->getField("FixedWingYaw1");
field->setValue(m_aircraft->triYawChannel->currentText());
=======
field = obj->getField("FixedWingYaw1");
field->setValue(m_aircraft->triYawChannel->currentText());
obj->updated();
>>>>>>> eb337c6e5c4b6f6dba7c3019886c42097dd37d6c
// Motor 1 to 6, Y6 Layout:
// pitch roll yaw