From 46aa8916c63562f9bf8b92a95d7321d147fea092 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Thu, 20 Oct 2011 06:43:24 -0500 Subject: [PATCH] Fix segfault when selected motors 9 or 10. Also make labels show up in output panel. --- .../src/plugins/config/configoutputwidget.cpp | 6 ++++ .../uavobjectdefinition/actuatorsettings.xml | 30 +++++++++---------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp index a4f147a1d..d30e56c57 100644 --- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp @@ -288,6 +288,12 @@ void ConfigOutputWidget::assignOutputChannel(UAVDataObject *obj, QString str) case 7: m_config->ch7Output->setText(str); break; + case 8: + m_config->ch8Output->setText(str); + break; + case 9: + m_config->ch9Output->setText(str); + break; } } diff --git a/shared/uavobjectdefinition/actuatorsettings.xml b/shared/uavobjectdefinition/actuatorsettings.xml index 15cb4f2c0..1524797b4 100644 --- a/shared/uavobjectdefinition/actuatorsettings.xml +++ b/shared/uavobjectdefinition/actuatorsettings.xml @@ -1,21 +1,21 @@ Settings for the @ref ActuatorModule that controls the channel assignments for the mixer based on AircraftType - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +