rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Code style fixes

Browse Source 
Had forgotten about the code style standards.
I hope it's more correct now.
This commit is contained in:
Nuno Guedes 2013-04-20 18:31:35 +01:00
parent 8fef89d55c
commit 7bfc0f7962
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadget.cpp
View File

@ -101,8 +101,12 @@ void GCSControlGadget::manualControlCommandUpdated(UAVObject * obj) {
double yaw = obj->getField("Yaw")->getDouble();
double throttle = obj->getField("Throttle")->getDouble();
if (throttle >= -1.0 && throttle <= 1.0) // necessary against incorect values from not configured joysticks
throttle = -1.0 + (throttle * 2.0); // convert ManualControlCommand.Throttle range (0..1) to the widget's throttle stick range (-1..+1)
// necessary against incorect values from not configured joysticks
if (throttle >= -1.0 && throttle <= 1.0)
{
// convert ManualControlCommand.Throttle range (0..1) to the widget's throttle stick range (-1..+1)
throttle = -1.0 + (throttle * 2.0);
}
// Remap RPYT to left X/Y and right X/Y depending on mode
switch (controlsMode) {
@ -190,7 +194,11 @@ void GCSControlGadget::sticksChangedLocally(double leftX, double leftY, double r
return;
if (newThrottle != oldThrottle)
newThrottle = (newThrottle+1.0)/2.0; // convert widget's throttle stick range (-1..+1) to ManualControlCommand.Throttle range (0..1)
{
// convert widget's throttle stick range (-1..+1) to ManualControlCommand.Throttle range (0..1)
newThrottle = (newThrottle + 1.0) / 2.0;
}
if((newThrottle != oldThrottle) || (newPitch != oldPitch) || (newYaw != oldYaw) || (newRoll != oldRoll)) {
if (buttonRollControl==0)obj->getField("Roll")->setDouble(newRoll);