mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-04 16:56:53 +08:00
Merge branch 'kbdbusbaseclasses'
This commit is contained in:
@@ -3,7 +3,7 @@ QT += network dbus
|
||||
|
||||
TARGET = blackcore
|
||||
TEMPLATE = lib
|
||||
CONFIG += staticlib
|
||||
CONFIG += staticlib c++11
|
||||
|
||||
INCLUDEPATH += ..
|
||||
DEPENDPATH += . ..
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace FSD
|
||||
return m_tcp_socket->state() == QAbstractSocket::ConnectedState;
|
||||
}
|
||||
|
||||
QString CFSDClient::getErrorMessage(QAbstractSocket::SocketError error)
|
||||
QString CFSDClient::getErrorMessage(QAbstractSocket::SocketError /* error */)
|
||||
{
|
||||
return QString("Unknown");
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ CCoordinateNed CInterpolator::pushUpdate(const CCoordinateGeodetic &pos, const C
|
||||
|
||||
m_state_end->timestamp = m_time.elapsed();
|
||||
m_state_end->position = CCoordinateTransformation::toEcef(pos);
|
||||
m_state_end->orientation.heading = CHeading(normalizeRadians(heading), false);
|
||||
m_state_end->orientation.heading = CHeading(normalizeRadians(heading), CHeading::True);
|
||||
m_state_end->orientation.pitch = normalizeRadians(pitch);
|
||||
m_state_end->orientation.bank = normalizeRadians(bank);
|
||||
m_state_end->groundspeed = groundSpeed;
|
||||
@@ -131,7 +131,7 @@ bool CInterpolator::stateNow(TPlaneState *state)
|
||||
// Plane Orientation
|
||||
double vEast = state->velNED.east();
|
||||
double vNorth = state->velNED.north();
|
||||
state->orientation.heading = CHeading(atan2(vNorth, vEast), false, CAngleUnit::rad());
|
||||
state->orientation.heading = CHeading(atan2(vNorth, vEast), CHeading::True, CAngleUnit::rad());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ void CMultiPlayer::onPositionUpdate(const FSD::FSD_MSG_Plane_Position *plane_pos
|
||||
|
||||
plane->addPosition(position,
|
||||
CSpeed(plane_position->Speed(), CSpeedUnit::kts()),
|
||||
CHeading((qint32)pitchBankHeading.hdg, false, CAngleUnit::deg()),
|
||||
CHeading((qint32)pitchBankHeading.hdg, CHeading::True, CAngleUnit::deg()),
|
||||
CAngle((qint32)pitchBankHeading.pitch, CAngleUnit::deg()),
|
||||
CAngle((qint32)pitchBankHeading.bank, CAngleUnit::deg()));
|
||||
|
||||
@@ -93,9 +93,9 @@ void CMultiPlayer::addPlane(CPlane *plane)
|
||||
m_multiplayer_planes.insert(plane->callsign(), plane);
|
||||
}
|
||||
|
||||
void CMultiPlayer::removePlane(CPlane *plane)
|
||||
void CMultiPlayer::removePlane(CPlane * /** plane **/)
|
||||
{
|
||||
qint32 id;
|
||||
qint32 id = 0;
|
||||
m_simulator->removePlane(id);
|
||||
}
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ namespace BlackCore {
|
||||
|
||||
void addPlane(CPlane *plane);
|
||||
|
||||
void removePlane(CPlane *plane);
|
||||
void removePlane(CPlane *);
|
||||
|
||||
bool needsToRemoved(CPlane *plane);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user