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

Merge branch 'rel-14.01' into next

Browse Source
This commit is contained in:
Alessio Morale 2014-02-21 19:16:02 +01:00
commit b759d38f5c
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WHATSNEW.txt
View File

@ -1,3 +1,10 @@
--- RELEASE-14.01-RC4 --- Cruising Ratt ---
this issue includes the following fixes to previous RC3:
OP-1228 OP-1218
Full list of bug fixed in this release is accessible here
http://progress.openpilot.org/issues/?filter=11364
--- RELEASE-14.01-RC3 --- Cruising Ratt ---
this issue includes the following fixes to previous RC2:
OP-1088 OP-1141 OP-1166 OP-1187 OP-1191 OP-1195 OP-1211 OP-1218

1
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
View File

@ -91,6 +91,7 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) :
addWidgetBinding("ManualControlSettings", "ChannelGroups", inpForm->ui->channelGroup, index);
addWidgetBinding("ManualControlSettings", "ChannelNeutral", inpForm->ui->channelNeutral, index);
addWidgetBinding("ManualControlSettings", "ChannelNeutral", inpForm->ui->neutralValue, index);
addWidgetBinding("ManualControlSettings", "ChannelMax", inpForm->ui->channelMax, index);
addWidgetBinding("ManualControlSettings", "ChannelMin", inpForm->ui->channelMin, index);
addWidgetBinding("ManualControlSettings", "ChannelMax", inpForm->ui->channelMax, index);

2
ground/openpilotgcs/src/plugins/telemetry/monitorgadgetfactory.cpp
View File

@ -81,5 +81,5 @@ IUAVGadgetConfiguration *MonitorGadgetFactory::createConfiguration(QSettings *qS
IOptionsPage *MonitorGadgetFactory::createOptionsPage(IUAVGadgetConfiguration *config)
{
return new MonitorGadgetOptionsPage(qobject_cast<MonitorGadgetConfiguration *>(config));
return 0; //new MonitorGadgetOptionsPage(qobject_cast<MonitorGadgetConfiguration *>(config));
}