1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00

Merge branch 'rel-14.10' into next

This commit is contained in:
Fredrik Larsson 2014-11-15 04:37:22 +11:00
commit 359c42a2be
2 changed files with 22 additions and 4 deletions

View File

@ -1,7 +1,24 @@
--- RELEASE-14.10-RC6 ---
This release candidate does add the following fixes/enhancements over the previous RC5
The full list of features, improvements and bugfixes in this RC6 is accessible here:
http://progress.openpilot.org/issues/?filter=11865
** Improvement
* [OP-1556] Improve ESC calibration.
** Bug
* [OP-1605] OP-1603 Normalize fixed wing mixers and mixing slider jitter while saving
* [OP-1604] Radio wizard crashes
* [OP-1603] Fixed Wing (elevon) : Wizard and Config mixer differs
* [OP-1564] Incorrect display of Thrust mode in PFD Module
--- RELEASE-14.10-RC5 ---
This release candidate does add the following fixes/enhancements over the previous RC4
The full list of features, improvements and bugfixes in this RC4 is accessible here:
The full list of features, improvements and bugfixes in this RC5 is accessible here:
http://progress.openpilot.org/issues/?filter=11864

View File

@ -93,7 +93,8 @@ void OutputCalibrationUtil::stopOutputCalibration()
}
}
void OutputCalibrationUtil::startChannelOutput(quint16 channel, quint16 safeValue) {
void OutputCalibrationUtil::startChannelOutput(quint16 channel, quint16 safeValue)
{
QList<quint16> channels;
channels.append(channel);
startChannelOutput(channels, safeValue);
@ -125,9 +126,9 @@ void OutputCalibrationUtil::setChannelOutputValue(quint16 value)
if (c_prepared) {
ActuatorCommand *actuatorCommand = getActuatorCommandObject();
ActuatorCommand::DataFields data = actuatorCommand->getData();
foreach (quint32 channel, m_outputChannels) {
foreach(quint32 channel, m_outputChannels) {
// Set output value
if (channel <= ActuatorCommand::CHANNEL_NUMELEM){
if (channel <= ActuatorCommand::CHANNEL_NUMELEM) {
qDebug() << "OutputCalibrationUtil setting output value for channel " << channel << " to " << value << ".";
data.Channel[channel] = value;
} else {