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

LP-10 Fix abs warning when floats are used

Browse Source
This commit is contained in:
Stefan Karlsson 2015-07-12 17:14:19 +02:00
parent e6f88883d0
commit a28d668758
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -787,7 +787,7 @@ QString ConfigMultiRotorWidget::updateConfigObjectsFromWidgets()
// Tricopter : Yaw mix slider value applies to servo (was fixed) // Tricopter : Yaw mix slider value applies to servo (was fixed)
// Get absolute MixerValueYaw, no servo reverse when Reverse All Motors is checked // Get absolute MixerValueYaw, no servo reverse when Reverse All Motors is checked
setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, abs(getMixerValue(mixer, "MixerValueYaw")) * 1.27); setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, abs(int(getMixerValue(mixer, "MixerValueYaw"))) * 1.27);
} }
m_aircraft->mrStatusLabel->setText(tr("Configuration OK")); m_aircraft->mrStatusLabel->setText(tr("Configuration OK"));

6
ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp
View File

@ -558,7 +558,7 @@ void DialGadgetWidget::rotateNeedles()
int dialRun = 3; int dialRun = 3;
if (n2enabled) { if (n2enabled) {
double needle2Diff; double needle2Diff;
if (abs((needle2Value - needle2Target) * 10) > 5 && beSmooth) { if (abs(int((needle2Value - needle2Target) * 10)) > 5 && beSmooth) {
needle2Diff = (needle2Target - needle2Value) / 5; needle2Diff = (needle2Target - needle2Value) / 5;
} else { } else {
needle2Diff = needle2Target - needle2Value; needle2Diff = needle2Target - needle2Value;
@ -590,7 +590,7 @@ void DialGadgetWidget::rotateNeedles()
// We assume that needle1 always exists! // We assume that needle1 always exists!
double needle1Diff; double needle1Diff;
if ((abs((needle1Value - needle1Target) * 10) > 5) && beSmooth) { if ((abs(int((needle1Value - needle1Target) * 10)) > 5) && beSmooth) {
needle1Diff = (needle1Target - needle1Value) / 5; needle1Diff = (needle1Target - needle1Value) / 5;
} else { } else {
needle1Diff = needle1Target - needle1Value; needle1Diff = needle1Target - needle1Value;
@ -614,7 +614,7 @@ void DialGadgetWidget::rotateNeedles()
if (n3enabled) { if (n3enabled) {
double needle3Diff; double needle3Diff;
if ((abs((needle3Value - needle3Target) * 10) > 5) && beSmooth) { if ((abs(int((needle3Value - needle3Target) * 10)) > 5) && beSmooth) {
needle3Diff = (needle3Target - needle3Value) / 5; needle3Diff = (needle3Target - needle3Value) / 5;
} else { } else {
needle3Diff = needle3Target - needle3Value; needle3Diff = needle3Target - needle3Value;

2
ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetwidget.cpp
View File

@ -426,7 +426,7 @@ void LineardialGadgetWidget::moveIndex()
dialTimer.stop(); dialTimer.stop();
return; return;
} }
if ((abs((indexValue - indexTarget) * 10) > 3)) { if ((abs(int((indexValue - indexTarget) * 10)) > 3)) {
indexValue += (indexTarget - indexValue) / 5; indexValue += (indexTarget - indexValue) / 5;
} else { } else {
indexValue = indexTarget; indexValue = indexTarget;