mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-24 07:55:35 +08:00
feat: new lights and number of engines increased to 6
This commit is contained in:
@@ -23,7 +23,6 @@ CSwiftDataApplication::CSwiftDataApplication()
|
||||
// this->addAudioOptions();
|
||||
}
|
||||
|
||||
// TODO TZ remove commented code after testing
|
||||
CStatusMessageList CSwiftDataApplication::startHookIn()
|
||||
{
|
||||
Q_ASSERT_X(m_parsed, Q_FUNC_INFO, "Not yet parsed cmd line arguments");
|
||||
@@ -33,59 +32,15 @@ CStatusMessageList CSwiftDataApplication::startHookIn()
|
||||
this->isParserOptionSet(m_cmdFacadeMode) ? this->getParserValue(m_cmdFacadeMode) : QString();
|
||||
CoreModes::CoreMode coreMode = CoreModes::stringToCoreMode(coreModeStr);
|
||||
|
||||
//// Valid combination?
|
||||
// if (!coreModeStr.isEmpty())
|
||||
//{
|
||||
// if (coreMode == CoreModes::Standalone && !dBusAddress.isEmpty())
|
||||
// {
|
||||
// const CStatusMessage m =
|
||||
// CStatusMessage(this, CLogCategories::validation()).error(u"Inconsistent pair DBus: '%1' and core:
|
||||
// '%2'")
|
||||
// << dBusAddress << coreModeStr;
|
||||
// return CStatusMessageList(m);
|
||||
// }
|
||||
// }
|
||||
|
||||
//// Implicit configuration
|
||||
CStatusMessageList msgs;
|
||||
// if (!dBusAddress.isEmpty() && coreModeStr.isEmpty())
|
||||
//{
|
||||
// coreMode = CoreModes::Distributed; // default
|
||||
// const CStatusMessage m =
|
||||
// CStatusMessage(this, CLogCategories::validation()).info(u"No DBus address, setting core mode: '%1'")
|
||||
// << CoreModes::coreModeToString(coreMode);
|
||||
// msgs.push_back(m);
|
||||
// }
|
||||
// else if (dBusAddress.isEmpty() && coreMode == CoreModes::Distributed)
|
||||
//{
|
||||
// dBusAddress = CDBusServer::sessionBusAddress(); // a possible default
|
||||
// const CStatusMessage m =
|
||||
// CStatusMessage(this, CLogCategories::validation()).info(u"Setting DBus address to '%1'") << dBusAddress;
|
||||
// msgs.push_back(m);
|
||||
// }
|
||||
|
||||
CCoreFacadeConfig runtimeConfig = coreModeToCoreFacadeConfig(coreMode, dBusAddress);
|
||||
const CStatusMessageList contextMsgs = this->initContextsAndStartCoreFacade(runtimeConfig);
|
||||
// const CStatusMessageList contextMsgs = { CStatusMessage(this, CLogCategories::validation()).info(u"TEST") };
|
||||
msgs.push_back(contextMsgs);
|
||||
return contextMsgs;
|
||||
}
|
||||
|
||||
bool CSwiftDataApplication::parsingHookIn()
|
||||
{
|
||||
// Parse core relevant arguments
|
||||
// const QString dBusAddress(this->getCmdDBusAddressValue());
|
||||
// if (!dBusAddress.isEmpty())
|
||||
//{
|
||||
// // check if reachable
|
||||
// if (!CDBusServer::isDBusAvailable(dBusAddress))
|
||||
// {
|
||||
// this->cmdLineErrorMessage("DBus error", "DBus server at '" + dBusAddress + "' can not be reached");
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
return CGuiApplication::parsingHookIn();
|
||||
}
|
||||
bool CSwiftDataApplication::parsingHookIn() { return CGuiApplication::parsingHookIn(); }
|
||||
|
||||
CSwiftDataApplication *CSwiftDataApplication::instance()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user