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

OP-1170 Got rid of all compiler warnings in HITL plugin.

Browse Source
This commit is contained in:
m_thread 2014-02-26 17:25:49 +01:00
parent 15b1304fd1
commit 929f309f61
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/hitl/fgsimulator.cpp
View File

@ -255,7 +255,7 @@ void FGSimulator::processUpdate(const QByteArray & inp)
// Get longitude (deg)
float longitude = fields[13].toFloat();
// Get heading (deg)
float heading = fields[14].toFloat();
//float heading = fields[14].toFloat();
// Get altitude (m)
float altitude_msl = fields[15].toFloat() * FT2M;
// Get altitudeAGL (m)

8
ground/openpilotgcs/src/plugins/hitl/simulator.cpp
View File

@ -410,10 +410,6 @@ void Simulator::updateUAVOs(Output2Hardware out)
homeData.Latitude = out.latitude; // Already in *10^7 integer format
homeData.Longitude = out.longitude; // Already in *10^7 integer format
homeData.Altitude = out.agl;
double LLA[3];
LLA[0] = out.latitude;
LLA[1] = out.longitude;
LLA[2] = out.altitude;
homeData.Be[0] = 0;
homeData.Be[1] = 0;
@ -498,13 +494,13 @@ void Simulator::updateUAVOs(Output2Hardware out)
AttitudeSettings::DataFields attSettData = attSettings->getData();
float accelKp = attSettData.AccelKp * 0.1666666666666667;
float accelKi = attSettData.AccelKp * 0.1666666666666667;
//float accelKi = attSettData.AccelKp * 0.1666666666666667;
float yawBiasRate = attSettData.YawBiasRate;
// calibrate sensors on arming
if (flightStatus->getData().Armed == FlightStatus::ARMED_ARMING) {
accelKp = 2.0;
accelKi = 0.9;
//accelKi = 0.9;
}
float gyro[3] = { out.rollRate, out.pitchRate, out.yawRate };