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

OP-1683 - fix limits handling and definitions

Browse Source
This commit is contained in:
Alessio Morale 2015-01-30 21:43:59 +01:00
parent 86571a804d
commit 6f3f7b9972
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
View File

@ -98,12 +98,12 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
addWidget(ui->cb_outputRate1);
addWidget(ui->spinningArmed);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode1, 0);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode2, 1);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode3, 2);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode4, 3);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode5, 4);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode6, 5);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode1, 0, 0, true);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode2, 1, 0, true);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode3, 2, 0, true);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode4, 3, 0, true);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode5, 4, 0, true);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode6, 5, 0, true);
disconnect(this, SLOT(refreshWidgetsValues(UAVObject *)));

8
shared/uavobjectdefinition/actuatorsettings.xml
View File

@ -3,8 +3,12 @@
<description>Settings for the @ref ActuatorModule that controls the channel assignments for the mixer based on AircraftType</description>
<field name="BankUpdateFreq" units="Hz" type="uint16" elements="6" defaultvalue="50"/>
<field name="BankMode" type="enum" units="" elements="6" options="PWM,OneShot,OneShot125" defaultvalue="PWM"
limits="%0401NE:OneShot:OneShot125,\
%0402NE:OneShot:OneShot125;"
limits="%0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
%0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
%0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
%0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
%0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
%0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125;"
/>
<field name="ChannelMax" units="us" type="int16" elements="12" defaultvalue="1000"/>
<field name="ChannelNeutral" units="us" type="int16" elements="12" defaultvalue="1000"/>