rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

disable Mixer by default

Browse Source
This commit is contained in:
Fredrik Larson 2014-08-24 09:18:49 +10:00
parent 57ef5625db
commit 8133606453
2 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ground/openpilotgcs/src/plugins/config/airframe_fixedwing.ui
View File

@ -217,6 +217,9 @@ margin:1px;</string>
</item>
<item>
<widget class="QSlider" name="elevonSlider1">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>40</width>
@ -282,6 +285,9 @@ margin:1px;</string>
</item>
<item>
<widget class="QSlider" name="elevonSlider2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>40</width>
@ -652,38 +658,5 @@ margin:1px;</string>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>elevonSlider1</sender>
<signal>valueChanged(int)</signal>
<receiver>elevonSliderLabel1</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>124</x>
<y>126</y>
</hint>
<hint type="destinationlabel">
<x>124</x>
<y>126</y>
</hint>
</hints>
</connection>
<connection>
<sender>elevonSlider2</sender>
<signal>valueChanged(int)</signal>
<receiver>elevonSliderLabel2</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>362</x>
<y>299</y>
</hint>
<hint type="destinationlabel">
<x>124</x>
<y>126</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>

2
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
View File

@ -151,6 +151,7 @@ void ConfigFixedWingWidget::setupUI(QString frameType)
m_aircraft->fwAileron2Label->setText("Aileron 2");
m_aircraft->fwElevator1Label->setText("Elevator 1");
m_aircraft->fwElevator2Label->setText("Elevator 2");
} else if (frameType == "Aileron Single Servo") {
plane->setElementId("aileron-single");
setComboCurrentIndex(m_aircraft->fixedWingType, m_aircraft->fixedWingType->findText("Aileron Single Servo"));
@ -166,6 +167,7 @@ void ConfigFixedWingWidget::setupUI(QString frameType)
m_aircraft->fwAileron2Label->setText("Aileron 2");
m_aircraft->fwElevator1Label->setText("Elevator 1");
m_aircraft->fwElevator2Label->setText("Elevator 2");
} else if (frameType == "FixedWingVtail" || frameType == "Vtail") {
// do nothing for now
} else if (frameType == "FixedWingElevon" || frameType == "Elevon") {