refactor: Fix spelling mistakes

This commit is contained in:
Lars Toenning
2024-01-25 23:28:52 +01:00
parent 6a0e93a3bd
commit 4eea539c19
2 changed files with 69 additions and 69 deletions

View File

@@ -118,7 +118,7 @@ namespace BlackCore::Fsd
connect(&m_scheduledConfigUpdate, &QTimer::timeout, this, &CFSDClient::sendIncrementalAircraftConfig); connect(&m_scheduledConfigUpdate, &QTimer::timeout, this, &CFSDClient::sendIncrementalAircraftConfig);
m_fsdSendMessageTimer.setObjectName(this->objectName().append(":m_fsdSendMessageTimer")); m_fsdSendMessageTimer.setObjectName(this->objectName().append(":m_fsdSendMessageTimer"));
connect(&m_fsdSendMessageTimer, &QTimer::timeout, this, &CFSDClient::sendQueuedMessage); connect(&m_fsdSendMessageTimer, &QTimer::timeout, this, [this]() { this->sendQueuedMessage(); });
fsdMessageSettingsChanged(); fsdMessageSettingsChanged();
@@ -301,13 +301,13 @@ namespace BlackCore::Fsd
if (m.isPilot()) if (m.isPilot())
{ {
const AddPilot pilotLogin(callsign, cid, password, m_pilotRating, m_protocolRevision, m_simType, name); const AddPilot pilotLogin(callsign, cid, password, m_pilotRating, m_protocolRevision, m_simType, name);
sendQueudedMessage(pilotLogin); sendQueuedMessage(pilotLogin);
CStatusMessage(this).info(u"Sending login as '%1' '%2' '%3' '%4' '%5' '%6'") << callsign << cid << toQString(m_pilotRating) << m_protocolRevision << toQString(m_simType) << name; CStatusMessage(this).info(u"Sending login as '%1' '%2' '%3' '%4' '%5' '%6'") << callsign << cid << toQString(m_pilotRating) << m_protocolRevision << toQString(m_simType) << name;
} }
else if (m.isObserver()) else if (m.isObserver())
{ {
const AddAtc addAtc(callsign, name, cid, password, m_atcRating, m_protocolRevision); const AddAtc addAtc(callsign, name, cid, password, m_atcRating, m_protocolRevision);
sendQueudedMessage(addAtc); sendQueuedMessage(addAtc);
CStatusMessage(this).info(u"Sending OBS login as '%1' '%2' '%3' '%4' '%5'") << callsign << cid << toQString(m_atcRating) << m_protocolRevision << name; CStatusMessage(this).info(u"Sending OBS login as '%1' '%2' '%3' '%4' '%5'") << callsign << cid << toQString(m_atcRating) << m_protocolRevision << name;
} }
@@ -321,14 +321,14 @@ namespace BlackCore::Fsd
{ {
const QString cid = this->getServer().getUser().getId(); const QString cid = this->getServer().getUser().getId();
const DeletePilot deletePilot(m_ownCallsign.getFsdCallsignString(), cid); const DeletePilot deletePilot(m_ownCallsign.getFsdCallsignString(), cid);
sendQueudedMessage(deletePilot); sendQueuedMessage(deletePilot);
} }
void CFSDClient::sendDeleteAtc() void CFSDClient::sendDeleteAtc()
{ {
const QString cid = this->getServer().getUser().getId(); const QString cid = this->getServer().getUser().getId();
const DeleteAtc deleteAtc(getOwnCallsignAsString(), cid); const DeleteAtc deleteAtc(getOwnCallsignAsString(), cid);
sendQueudedMessage(deleteAtc); sendQueuedMessage(deleteAtc);
} }
void CFSDClient::sendPilotDataUpdate() void CFSDClient::sendPilotDataUpdate()
@@ -363,7 +363,7 @@ namespace BlackCore::Fsd
myAircraft.getBank().value(CAngleUnit::deg()), myAircraft.getBank().value(CAngleUnit::deg()),
myAircraft.getHeading().normalizedTo360Degrees().value(CAngleUnit::deg()), myAircraft.getHeading().normalizedTo360Degrees().value(CAngleUnit::deg()),
myAircraft.getParts().isOnGround()); myAircraft.getParts().isOnGround());
sendQueudedMessage(pilotDataUpdate); sendQueuedMessage(pilotDataUpdate);
} }
} }
@@ -385,7 +385,7 @@ namespace BlackCore::Fsd
for (const auto &receiver : std::as_const(m_interimPositionReceivers)) for (const auto &receiver : std::as_const(m_interimPositionReceivers))
{ {
interimPilotDataUpdate.setReceiver(receiver.asString()); interimPilotDataUpdate.setReceiver(receiver.asString());
sendQueudedMessage(interimPilotDataUpdate); sendQueuedMessage(interimPilotDataUpdate);
// statistics // statistics
} }
} }
@@ -437,22 +437,22 @@ namespace BlackCore::Fsd
if (m_stoppedSendingVisualPositions) if (m_stoppedSendingVisualPositions)
{ {
sendQueudedMessage(visualPilotDataUpdate.toStopped()); sendQueuedMessage(visualPilotDataUpdate.toStopped());
} }
else if (m_visualPositionUpdateSentCount++ % 25 == 0) else if (m_visualPositionUpdateSentCount++ % 25 == 0)
{ {
sendQueudedMessage(visualPilotDataUpdate.toPeriodic()); sendQueuedMessage(visualPilotDataUpdate.toPeriodic());
} }
else else
{ {
sendQueudedMessage(visualPilotDataUpdate); sendQueuedMessage(visualPilotDataUpdate);
} }
} }
void CFSDClient::sendAtcDataUpdate(double latitude, double longitude) void CFSDClient::sendAtcDataUpdate(double latitude, double longitude)
{ {
const AtcDataUpdate atcDataUpdate(getOwnCallsignAsString(), 199998, CFacilityType::OBS, 300, AtcRating::Observer, latitude, longitude, 0); const AtcDataUpdate atcDataUpdate(getOwnCallsignAsString(), 199998, CFacilityType::OBS, 300, AtcRating::Observer, latitude, longitude, 0);
sendQueudedMessage(atcDataUpdate); sendQueuedMessage(atcDataUpdate);
} }
void CFSDClient::sendPing(const QString &receiver) void CFSDClient::sendPing(const QString &receiver)
@@ -461,7 +461,7 @@ namespace BlackCore::Fsd
const QString timeString = QString::number(msecSinceEpoch); const QString timeString = QString::number(msecSinceEpoch);
const Ping ping(getOwnCallsignAsString(), receiver, timeString); const Ping ping(getOwnCallsignAsString(), receiver, timeString);
sendQueudedMessage(ping); sendQueuedMessage(ping);
// statistics // statistics
increaseStatisticsValue(QStringLiteral("sendPing")); increaseStatisticsValue(QStringLiteral("sendPing"));
@@ -520,36 +520,36 @@ namespace BlackCore::Fsd
return; return;
} }
const QString reveiverCallsign = receiver.getFsdCallsignString(); const QString receiverCallsign = receiver.getFsdCallsignString();
if (queryType == ClientQueryType::IsValidATC) if (queryType == ClientQueryType::IsValidATC)
{ {
const ClientQuery clientQuery(getOwnCallsignAsString(), "SERVER", ClientQueryType::IsValidATC, queryData); const ClientQuery clientQuery(getOwnCallsignAsString(), "SERVER", ClientQueryType::IsValidATC, queryData);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
else if (queryType == ClientQueryType::Capabilities) else if (queryType == ClientQueryType::Capabilities)
{ {
const ClientQuery clientQuery(getOwnCallsignAsString(), reveiverCallsign, ClientQueryType::Capabilities); const ClientQuery clientQuery(getOwnCallsignAsString(), receiverCallsign, ClientQueryType::Capabilities);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
else if (queryType == ClientQueryType::Com1Freq) else if (queryType == ClientQueryType::Com1Freq)
{ {
const ClientQuery clientQuery(getOwnCallsignAsString(), reveiverCallsign, ClientQueryType::Com1Freq); const ClientQuery clientQuery(getOwnCallsignAsString(), receiverCallsign, ClientQueryType::Com1Freq);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
else if (queryType == ClientQueryType::RealName) else if (queryType == ClientQueryType::RealName)
{ {
const ClientQuery clientQuery(getOwnCallsignAsString(), reveiverCallsign, ClientQueryType::RealName); const ClientQuery clientQuery(getOwnCallsignAsString(), receiverCallsign, ClientQueryType::RealName);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
else if (queryType == ClientQueryType::Server) else if (queryType == ClientQueryType::Server)
{ {
ClientQuery clientQuery(getOwnCallsignAsString(), reveiverCallsign, ClientQueryType::Server); ClientQuery clientQuery(getOwnCallsignAsString(), receiverCallsign, ClientQueryType::Server);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
else if (queryType == ClientQueryType::ATIS) else if (queryType == ClientQueryType::ATIS)
{ {
const ClientQuery clientQuery(getOwnCallsignAsString(), reveiverCallsign, ClientQueryType::ATIS); const ClientQuery clientQuery(getOwnCallsignAsString(), receiverCallsign, ClientQueryType::ATIS);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
if (m_serverType != ServerType::Vatsim) if (m_serverType != ServerType::Vatsim)
{ {
m_pendingAtisQueries.insert(receiver, {}); m_pendingAtisQueries.insert(receiver, {});
@@ -557,30 +557,30 @@ namespace BlackCore::Fsd
} }
else if (queryType == ClientQueryType::PublicIP) else if (queryType == ClientQueryType::PublicIP)
{ {
const ClientQuery clientQuery(getOwnCallsignAsString(), reveiverCallsign, ClientQueryType::PublicIP); const ClientQuery clientQuery(getOwnCallsignAsString(), receiverCallsign, ClientQueryType::PublicIP);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
else if (queryType == ClientQueryType::INF) else if (queryType == ClientQueryType::INF)
{ {
const ClientQuery clientQuery(getOwnCallsignAsString(), reveiverCallsign, ClientQueryType::INF); const ClientQuery clientQuery(getOwnCallsignAsString(), receiverCallsign, ClientQueryType::INF);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
else if (queryType == ClientQueryType::FP) else if (queryType == ClientQueryType::FP)
{ {
if (queryData.isEmpty()) { return; } if (queryData.isEmpty()) { return; }
const ClientQuery clientQuery(getOwnCallsignAsString(), "SERVER", ClientQueryType::FP, queryData); const ClientQuery clientQuery(getOwnCallsignAsString(), "SERVER", ClientQueryType::FP, queryData);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
else if (queryType == ClientQueryType::AircraftConfig) else if (queryType == ClientQueryType::AircraftConfig)
{ {
if (queryData.isEmpty()) { return; } if (queryData.isEmpty()) { return; }
const ClientQuery clientQuery(getOwnCallsignAsString(), reveiverCallsign, ClientQueryType::AircraftConfig, queryData); const ClientQuery clientQuery(getOwnCallsignAsString(), receiverCallsign, ClientQueryType::AircraftConfig, queryData);
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
else if (queryType == ClientQueryType::EuroscopeSimData) else if (queryType == ClientQueryType::EuroscopeSimData)
{ {
const ClientQuery clientQuery(getOwnCallsignAsString(), "@94835", ClientQueryType::EuroscopeSimData, { "1" }); const ClientQuery clientQuery(getOwnCallsignAsString(), "@94835", ClientQueryType::EuroscopeSimData, { "1" });
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
increaseStatisticsValue(QStringLiteral("sendClientQuery"), toQString(queryType)); increaseStatisticsValue(QStringLiteral("sendClientQuery"), toQString(queryType));
@@ -604,7 +604,7 @@ namespace BlackCore::Fsd
{ {
if (message.getRecipientCallsign().isEmpty()) { continue; } if (message.getRecipientCallsign().isEmpty()) { continue; }
const TextMessage textMessage(ownCallsign, message.getRecipientCallsign().getFsdCallsignString(), message.getMessage()); const TextMessage textMessage(ownCallsign, message.getRecipientCallsign().getFsdCallsignString(), message.getMessage());
sendQueudedMessage(textMessage); sendQueuedMessage(textMessage);
increaseStatisticsValue(QStringLiteral("sendTextMessages.PM")); increaseStatisticsValue(QStringLiteral("sendTextMessages.PM"));
emit textMessageSent(message); emit textMessageSent(message);
} }
@@ -653,7 +653,7 @@ namespace BlackCore::Fsd
else if (receiverGroup == TextMessageGroups::AllSups) { receiver = QStringLiteral("*S"); } else if (receiverGroup == TextMessageGroups::AllSups) { receiver = QStringLiteral("*S"); }
else { return; } else { return; }
const TextMessage textMessage(getOwnCallsignAsString(), receiver, message); const TextMessage textMessage(getOwnCallsignAsString(), receiver, message);
sendQueudedMessage(textMessage); sendQueuedMessage(textMessage);
if (receiver == QStringLiteral("*S")) if (receiver == QStringLiteral("*S"))
{ {
const CCallsign sender(getOwnCallsignAsString()); const CCallsign sender(getOwnCallsignAsString());
@@ -680,7 +680,7 @@ namespace BlackCore::Fsd
} }
const TextMessage radioMessage(getOwnCallsignAsString(), receivers.join('&'), message); const TextMessage radioMessage(getOwnCallsignAsString(), receivers.join('&'), message);
sendQueudedMessage(radioMessage); sendQueuedMessage(radioMessage);
increaseStatisticsValue(QStringLiteral("sendTextMessages")); increaseStatisticsValue(QStringLiteral("sendTextMessages"));
} }
@@ -738,7 +738,7 @@ namespace BlackCore::Fsd
remarks, remarks,
route); route);
sendQueudedMessage(fp); sendQueuedMessage(fp);
increaseStatisticsValue(QStringLiteral("sendFlightPlan")); increaseStatisticsValue(QStringLiteral("sendFlightPlan"));
} }
@@ -753,7 +753,7 @@ namespace BlackCore::Fsd
} }
const PlaneInfoRequest planeInfoRequest(getOwnCallsignAsString(), receiver.toQString()); const PlaneInfoRequest planeInfoRequest(getOwnCallsignAsString(), receiver.toQString());
sendQueudedMessage(planeInfoRequest); sendQueuedMessage(planeInfoRequest);
increaseStatisticsValue(QStringLiteral("sendPlaneInfoRequest")); increaseStatisticsValue(QStringLiteral("sendPlaneInfoRequest"));
} }
@@ -778,14 +778,14 @@ namespace BlackCore::Fsd
myAircraft.getAircraftIcaoCodeDesignator(), myAircraft.getAircraftIcaoCodeDesignator(),
myAircraft.getAircraftIcaoCombinedType(), myAircraft.getAircraftIcaoCombinedType(),
modelString); modelString);
sendQueudedMessage(planeInfoRequestFsinn); sendQueuedMessage(planeInfoRequestFsinn);
increaseStatisticsValue(QStringLiteral("sendPlaneInfoRequestFsinn")); increaseStatisticsValue(QStringLiteral("sendPlaneInfoRequestFsinn"));
} }
void CFSDClient::sendPlaneInformation(const QString &receiver, const QString &aircraft, const QString &airline, const QString &livery) void CFSDClient::sendPlaneInformation(const QString &receiver, const QString &aircraft, const QString &airline, const QString &livery)
{ {
const PlaneInformation planeInformation(getOwnCallsignAsString(), receiver, aircraft, airline, livery); const PlaneInformation planeInformation(getOwnCallsignAsString(), receiver, aircraft, airline, livery);
sendQueudedMessage(planeInformation); sendQueuedMessage(planeInformation);
increaseStatisticsValue(QStringLiteral("sendPlaneInformation")); increaseStatisticsValue(QStringLiteral("sendPlaneInformation"));
} }
@@ -799,7 +799,7 @@ namespace BlackCore::Fsd
myAircraft.getAircraftIcaoCodeDesignator(), myAircraft.getAircraftIcaoCodeDesignator(),
myAircraft.getAircraftIcaoCombinedType(), myAircraft.getAircraftIcaoCombinedType(),
modelString); modelString);
sendQueudedMessage(planeInformationFsinn); sendQueuedMessage(planeInformationFsinn);
increaseStatisticsValue(QStringLiteral("sendPlaneInformationFsinn")); increaseStatisticsValue(QStringLiteral("sendPlaneInformationFsinn"));
} }
@@ -807,7 +807,7 @@ namespace BlackCore::Fsd
{ {
if (aircraftConfigJson.size() == 0) { return; } if (aircraftConfigJson.size() == 0) { return; }
const ClientQuery clientQuery(getOwnCallsignAsString(), receiver, ClientQueryType::AircraftConfig, { aircraftConfigJson }); const ClientQuery clientQuery(getOwnCallsignAsString(), receiver, ClientQueryType::AircraftConfig, { aircraftConfigJson });
sendQueudedMessage(clientQuery); sendQueuedMessage(clientQuery);
} }
void CFSDClient::sendMessageString(const QString &message) void CFSDClient::sendMessageString(const QString &message)
@@ -889,7 +889,7 @@ namespace BlackCore::Fsd
void CFSDClient::sendPong(const QString &receiver, const QString &timestamp) void CFSDClient::sendPong(const QString &receiver, const QString &timestamp)
{ {
const Pong pong(getOwnCallsignAsString(), receiver, timestamp); const Pong pong(getOwnCallsignAsString(), receiver, timestamp);
sendQueudedMessage(pong); sendQueuedMessage(pong);
increaseStatisticsValue(QStringLiteral("sendPong")); increaseStatisticsValue(QStringLiteral("sendPong"));
} }
@@ -921,14 +921,14 @@ namespace BlackCore::Fsd
if (m_capabilities & Capabilities::AircraftConfig) responseData.push_back(toQString(Capabilities::AircraftConfig) % "=1"); if (m_capabilities & Capabilities::AircraftConfig) responseData.push_back(toQString(Capabilities::AircraftConfig) % "=1");
if (m_capabilities & Capabilities::IcaoEquipment) responseData.push_back(toQString(Capabilities::IcaoEquipment) % "=1"); if (m_capabilities & Capabilities::IcaoEquipment) responseData.push_back(toQString(Capabilities::IcaoEquipment) % "=1");
const ClientResponse clientResponse(ownCallsign, receiver, ClientQueryType::Capabilities, responseData); const ClientResponse clientResponse(ownCallsign, receiver, ClientQueryType::Capabilities, responseData);
sendQueudedMessage(clientResponse); sendQueuedMessage(clientResponse);
} }
else if (queryType == ClientQueryType::Com1Freq) else if (queryType == ClientQueryType::Com1Freq)
{ {
const QString com1Frequency = QString::number(getOwnAircraft().getCom1System().getFrequencyActive().value(CFrequencyUnit::MHz()), 'f', 3); const QString com1Frequency = QString::number(getOwnAircraft().getCom1System().getFrequencyActive().value(CFrequencyUnit::MHz()), 'f', 3);
responseData.push_back(com1Frequency); responseData.push_back(com1Frequency);
const ClientResponse pduClientResponse(ownCallsign, receiver, ClientQueryType::Com1Freq, responseData); const ClientResponse pduClientResponse(ownCallsign, receiver, ClientQueryType::Com1Freq, responseData);
sendQueudedMessage(pduClientResponse); sendQueuedMessage(pduClientResponse);
} }
else if (queryType == ClientQueryType::RealName) else if (queryType == ClientQueryType::RealName)
{ {
@@ -942,13 +942,13 @@ namespace BlackCore::Fsd
else { responseData.push_back(toQString(m_pilotRating)); } else { responseData.push_back(toQString(m_pilotRating)); }
const ClientResponse pduClientQueryResponse(ownCallsign, receiver, ClientQueryType::RealName, responseData); const ClientResponse pduClientQueryResponse(ownCallsign, receiver, ClientQueryType::RealName, responseData);
sendQueudedMessage(pduClientQueryResponse); sendQueuedMessage(pduClientQueryResponse);
} }
else if (queryType == ClientQueryType::Server) else if (queryType == ClientQueryType::Server)
{ {
responseData.push_back(m_server.getAddress()); responseData.push_back(m_server.getAddress());
const ClientResponse pduClientQueryResponse(ownCallsign, receiver, ClientQueryType::Server, responseData); const ClientResponse pduClientQueryResponse(ownCallsign, receiver, ClientQueryType::Server, responseData);
sendQueudedMessage(pduClientQueryResponse); sendQueuedMessage(pduClientQueryResponse);
} }
else if (queryType == ClientQueryType::ATIS) else if (queryType == ClientQueryType::ATIS)
{ {
@@ -977,7 +977,7 @@ namespace BlackCore::Fsd
" " % realName; " " % realName;
const TextMessage textMessage(ownCallsign, receiver, userInfo); const TextMessage textMessage(ownCallsign, receiver, userInfo);
sendQueudedMessage(textMessage); sendQueuedMessage(textMessage);
} }
else if (queryType == ClientQueryType::FP) else if (queryType == ClientQueryType::FP)
{ {
@@ -995,7 +995,7 @@ namespace BlackCore::Fsd
vatsim_get_system_unique_id(sysuid.data()); vatsim_get_system_unique_id(sysuid.data());
const QString cid = m_server.getUser().getId(); const QString cid = m_server.getUser().getId();
const ClientIdentification clientIdentification(getOwnCallsignAsString(), vatsim_auth_get_client_id(m_clientAuth), m_clientName, m_versionMajor, m_versionMinor, cid, sysuid.data(), fsdChallenge); const ClientIdentification clientIdentification(getOwnCallsignAsString(), vatsim_auth_get_client_id(m_clientAuth), m_clientName, m_versionMajor, m_versionMinor, cid, sysuid.data(), fsdChallenge);
this->sendQueudedMessage(clientIdentification); this->sendQueuedMessage(clientIdentification);
if (getServer().getEcosystem().isSystem(CEcosystem::VATSIM)) if (getServer().getEcosystem().isSystem(CEcosystem::VATSIM))
{ {
@@ -1482,7 +1482,7 @@ namespace BlackCore::Fsd
} }
const bool inRange = isAircraftInRange(callsign); const bool inRange = isAircraftInRange(callsign);
if (!inRange) { return; } // sort out all broadcasted we DO NOT NEED if (!inRange) { return; } // sort out all broadcasts we DO NOT NEED
if (!getSetupForServer().receiveAircraftParts()) { return; } if (!getSetupForServer().receiveAircraftParts()) { return; }
const QJsonObject config = doc.object().value("config").toObject(); const QJsonObject config = doc.object().value("config").toObject();
if (config.isEmpty()) { return; } if (config.isEmpty()) { return; }
@@ -1492,7 +1492,7 @@ namespace BlackCore::Fsd
} }
} }
void CFSDClient::handleClientReponse(const QStringList &tokens) void CFSDClient::handleClientResponse(const QStringList &tokens)
{ {
const ClientResponse clientResponse = ClientResponse::fromTokens(tokens); const ClientResponse clientResponse = ClientResponse::fromTokens(tokens);
if (clientResponse.isUnknownQuery()) { return; } if (clientResponse.isUnknownQuery()) { return; }
@@ -1563,7 +1563,7 @@ namespace BlackCore::Fsd
{ {
if (responseData1.isEmpty()) if (responseData1.isEmpty())
{ {
// networkLog(vatSeverityDebug, "VatFsdClient::handleClientQueryReponse", "ATIS line type cannot be empty!"); // networkLog(vatSeverityDebug, "VatFsdClient::handleClientQueryResponse", "ATIS line type cannot be empty!");
} }
updateAtisMap(clientResponse.sender(), fromQString<AtisLineType>(responseData1), responseData2); updateAtisMap(clientResponse.sender(), fromQString<AtisLineType>(responseData1), responseData2);
} }
@@ -1601,7 +1601,7 @@ namespace BlackCore::Fsd
case ServerErrorCode::RequestedLevelTooHigh: CLogMessage(this).error(u"You are not authorized to use the requested pilot rating"); break; case ServerErrorCode::RequestedLevelTooHigh: CLogMessage(this).error(u"You are not authorized to use the requested pilot rating"); break;
case ServerErrorCode::NoError: CLogMessage(this).info(u"OK"); break; case ServerErrorCode::NoError: CLogMessage(this).info(u"OK"); break;
case ServerErrorCode::SyntaxError: CLogMessage(this).error(u"Malformed packe, syntax error: '%1'. This can also occur if an OBS sends frequency text messages.") << serverError.getCausingParameter(); break; case ServerErrorCode::SyntaxError: CLogMessage(this).error(u"Malformed packet, syntax error: '%1'. This can also occur if an OBS sends frequency text messages.") << serverError.getCausingParameter(); break;
case ServerErrorCode::InvalidSrcCallsign: CLogMessage(this).info(u"FSD message was using an invalid callsign: %1 (%2)") << serverError.getCausingParameter() << serverError.getDescription(); break; case ServerErrorCode::InvalidSrcCallsign: CLogMessage(this).info(u"FSD message was using an invalid callsign: %1 (%2)") << serverError.getCausingParameter() << serverError.getDescription(); break;
case ServerErrorCode::NoSuchCallsign: CLogMessage(this).info(u"FSD Server: no such callsign: %1 %2") << serverError.getCausingParameter() << serverError.getDescription(); break; case ServerErrorCode::NoSuchCallsign: CLogMessage(this).info(u"FSD Server: no such callsign: %1 %2") << serverError.getCausingParameter() << serverError.getDescription(); break;
case ServerErrorCode::NoFlightPlan: CLogMessage(this).info(u"FSD Server: no flight plan"); break; case ServerErrorCode::NoFlightPlan: CLogMessage(this).info(u"FSD Server: no flight plan"); break;
@@ -1625,7 +1625,7 @@ namespace BlackCore::Fsd
const bool inRange = isAircraftInRange(callsign); const bool inRange = isAircraftInRange(callsign);
if (!inRange) { return; } // sort out all broadcasted we DO NOT NEED if (!inRange) { return; } // sort out all broadcasts we DO NOT NEED
if (!getSetupForServer().receiveAircraftParts()) { return; } if (!getSetupForServer().receiveAircraftParts()) { return; }
const qint64 offsetTimeMs = currentOffsetTime(callsign); const qint64 offsetTimeMs = currentOffsetTime(callsign);
@@ -1732,7 +1732,7 @@ namespace BlackCore::Fsd
} }
else if (subType == "I") else if (subType == "I")
{ {
// SquawkBox' interim pilot position. This one is producing too many precision errors. Therefore ignore it. // SquawkBox interim pilot position. This one is producing too many precision errors. Therefore ignore it.
} }
else if (subType == "VI") else if (subType == "VI")
{ {
@@ -1984,7 +1984,7 @@ namespace BlackCore::Fsd
{ {
QList<qint64> &offsets = m_lastOffsetTimes[callsign]; QList<qint64> &offsets = m_lastOffsetTimes[callsign];
offsets.push_front(offsetMs); offsets.push_front(offsetMs);
if (offsets.size() > MaxOffseTimes) { offsets.removeLast(); } if (offsets.size() > c_maxOffsetTimes) { offsets.removeLast(); }
} }
qint64 CFSDClient::averageOffsetTimeMs(const CCallsign &callsign, int &count, int maxLastValues) const qint64 CFSDClient::averageOffsetTimeMs(const CCallsign &callsign, int &count, int maxLastValues) const
@@ -2192,7 +2192,7 @@ namespace BlackCore::Fsd
void CFSDClient::gracefulShutdown() void CFSDClient::gracefulShutdown()
{ {
disconnectFromServer(); // aysnc, runs in background thread disconnectFromServer(); // async, runs in background thread
quitAndWait(); quitAndWait();
} }
@@ -2298,7 +2298,7 @@ namespace BlackCore::Fsd
case MessageType::AuthChallenge: handleAuthChallenge(tokens); break; case MessageType::AuthChallenge: handleAuthChallenge(tokens); break;
case MessageType::AuthResponse: handleAuthResponse(tokens); break; case MessageType::AuthResponse: handleAuthResponse(tokens); break;
case MessageType::ClientQuery: handleClientQuery(tokens); break; case MessageType::ClientQuery: handleClientQuery(tokens); break;
case MessageType::ClientResponse: handleClientReponse(tokens); break; case MessageType::ClientResponse: handleClientResponse(tokens); break;
case MessageType::DeleteATC: handleDeleteATC(tokens); break; case MessageType::DeleteATC: handleDeleteATC(tokens); break;
case MessageType::DeletePilot: handleDeletePilot(tokens); break; case MessageType::DeletePilot: handleDeletePilot(tokens); break;
case MessageType::FlightPlan: handleFlightPlan(tokens); break; case MessageType::FlightPlan: handleFlightPlan(tokens); break;
@@ -2369,13 +2369,13 @@ namespace BlackCore::Fsd
void CFSDClient::startPositionTimers() void CFSDClient::startPositionTimers()
{ {
m_positionUpdateTimer.start(c_updatePostionIntervalMsec); m_positionUpdateTimer.start(c_updatePositionIntervalMsec);
m_scheduledConfigUpdate.start(c_processingIntervalMsec); m_scheduledConfigUpdate.start(c_processingIntervalMsec);
m_fsdSendMessageTimer.start(c_sendFsdMsgIntervalMsec); m_fsdSendMessageTimer.start(c_sendFsdMsgIntervalMsec);
m_queuedFsdMessages.clear(); // clear everything before the timer is started m_queuedFsdMessages.clear(); // clear everything before the timer is started
// interim positions // interim positions
if (this->isInterimPositionSendingEnabledForServer()) { m_interimPositionUpdateTimer.start(c_updateInterimPostionIntervalMsec); } if (this->isInterimPositionSendingEnabledForServer()) { m_interimPositionUpdateTimer.start(c_updateInterimPositionIntervalMsec); }
else { m_interimPositionUpdateTimer.stop(); } else { m_interimPositionUpdateTimer.stop(); }
if (this->isVisualPositionSendingEnabledForServer()) { m_visualPositionUpdateTimer.start(c_updateVisualPositionIntervalMsec); } if (this->isVisualPositionSendingEnabledForServer()) { m_visualPositionUpdateTimer.start(c_updateVisualPositionIntervalMsec); }
else { m_visualPositionUpdateTimer.stop(); } else { m_visualPositionUpdateTimer.stop(); }

View File

@@ -195,7 +195,7 @@ namespace BlackCore::Fsd
} }
//! @{ //! @{
//! Connenct/disconnect //! Connect/disconnect
void connectToServer(); void connectToServer();
void disconnectFromServer(); void disconnectFromServer();
//! @} //! @}
@@ -348,7 +348,7 @@ namespace BlackCore::Fsd
//! Message send to FSD //! Message send to FSD
template <class T> template <class T>
void sendQueudedMessage(const T &message) void sendQueuedMessage(const T &message)
{ {
if (!message.isValid()) { return; } if (!message.isValid()) { return; }
if (m_unitTestMode) if (m_unitTestMode)
@@ -436,7 +436,7 @@ namespace BlackCore::Fsd
void handleKillRequest(const QStringList &tokens); void handleKillRequest(const QStringList &tokens);
void handleFlightPlan(const QStringList &tokens); void handleFlightPlan(const QStringList &tokens);
void handleClientQuery(const QStringList &tokens); void handleClientQuery(const QStringList &tokens);
void handleClientReponse(const QStringList &tokens); void handleClientResponse(const QStringList &tokens);
void handleServerError(const QStringList &tokens); void handleServerError(const QStringList &tokens);
void handleCustomPilotPacket(const QStringList &tokens); void handleCustomPilotPacket(const QStringList &tokens);
void handleFsdIdentification(const QStringList &tokens); void handleFsdIdentification(const QStringList &tokens);
@@ -477,10 +477,10 @@ namespace BlackCore::Fsd
void insertLatestOffsetTime(const BlackMisc::Aviation::CCallsign &callsign, qint64 offsetMs); void insertLatestOffsetTime(const BlackMisc::Aviation::CCallsign &callsign, qint64 offsetMs);
//! Average offset time in ms //! Average offset time in ms
qint64 averageOffsetTimeMs(const BlackMisc::Aviation::CCallsign &callsign, int &count, int maxLastValues = MaxOffseTimes) const; qint64 averageOffsetTimeMs(const BlackMisc::Aviation::CCallsign &callsign, int &count, int maxLastValues = c_maxOffsetTimes) const;
//! Average offset time in ms //! Average offset time in ms
qint64 averageOffsetTimeMs(const BlackMisc::Aviation::CCallsign &callsign, int maxLastValues = MaxOffseTimes) const; qint64 averageOffsetTimeMs(const BlackMisc::Aviation::CCallsign &callsign, int maxLastValues = c_maxOffsetTimes) const;
bool isInterimPositionSendingEnabledForServer() const; bool isInterimPositionSendingEnabledForServer() const;
bool isInterimPositionReceivingEnabledForServer() const; bool isInterimPositionReceivingEnabledForServer() const;
@@ -518,7 +518,7 @@ namespace BlackCore::Fsd
//! Max or 1st non-null value //! Max or 1st non-null value
static const BlackMisc::PhysicalQuantities::CLength &maxOrNotNull(const BlackMisc::PhysicalQuantities::CLength &l1, const BlackMisc::PhysicalQuantities::CLength &l2); static const BlackMisc::PhysicalQuantities::CLength &maxOrNotNull(const BlackMisc::PhysicalQuantities::CLength &l1, const BlackMisc::PhysicalQuantities::CLength &l2);
//! String withou colons //! String without colons
static QString noColons(const QString &input); static QString noColons(const QString &input);
//! Get a short-lived, one-time-use token from Vatsim web service, to avoid sending plaintext password to FSD //! Get a short-lived, one-time-use token from Vatsim web service, to avoid sending plaintext password to FSD
@@ -639,10 +639,10 @@ namespace BlackCore::Fsd
//! An illegal FSD state has been detected //! An illegal FSD state has been detected
void handleIllegalFsdState(const QString &message); void handleIllegalFsdState(const QString &message);
static const int MaxOffseTimes = 6; //!< Max offset times kept static int constexpr c_maxOffsetTimes = 6; //!< Max offset times kept
static int constexpr c_processingIntervalMsec = 100; //!< interval for the processing timer static int constexpr c_processingIntervalMsec = 100; //!< interval for the processing timer
static int constexpr c_updatePostionIntervalMsec = 5000; //!< interval for the position update timer (send our position to network) static int constexpr c_updatePositionIntervalMsec = 5000; //!< interval for the position update timer (send our position to network)
static int constexpr c_updateInterimPostionIntervalMsec = 1000; //!< interval for iterim position updates (send our position as interim position) static int constexpr c_updateInterimPositionIntervalMsec = 1000; //!< interval for interim position updates (send our position as interim position)
static int constexpr c_updateVisualPositionIntervalMsec = 200; //!< interval for the VATSIM visual position updates (send our position and 6DOF velocity) static int constexpr c_updateVisualPositionIntervalMsec = 200; //!< interval for the VATSIM visual position updates (send our position and 6DOF velocity)
static int constexpr c_sendFsdMsgIntervalMsec = 10; //!< interval for FSD send messages static int constexpr c_sendFsdMsgIntervalMsec = 10; //!< interval for FSD send messages
bool m_stoppedSendingVisualPositions = false; //!< for when velocity drops to zero bool m_stoppedSendingVisualPositions = false; //!< for when velocity drops to zero