diff --git a/Core/modulesmanager.cpp b/Core/modulesmanager.cpp index c6bcf08d2741f722db2424b1ea7206c2bc8d1c75..21632ab532835da01f1fee993cb59b4b58baa506 100644 --- a/Core/modulesmanager.cpp +++ b/Core/modulesmanager.cpp @@ -14,22 +14,26 @@ ModulesList ModulesManager::modulesListHandler; ModulesManager::ModulesManager() {} -ModulesManager::~ModulesManager() { +ModulesManager::~ModulesManager() +{ clearPages(); - for (int i = 0; i < menuActions.count(); i++) { + for (int i = 0; i < menuActions.count(); i++) + { delete menuActions[i]; } menuActions.clear(); } -QString ModulesManager::getModuleName(ModuleId id) { +QString ModulesManager::getModuleName(ModuleId id) +{ if (ModulesManager::modulesListHandler.containsId(id)) return ModulesManager::modulesListHandler.getModuleName(id); return ""; } -Module* ModulesManager::instantiateModuleById(ModuleId id) { +Module* ModulesManager::instantiateModuleById(ModuleId id) +{ if (ModulesManager::modulesListHandler.containsId(id)) return ModulesManager::modulesListHandler.getFactory(id)(); @@ -37,34 +41,42 @@ Module* ModulesManager::instantiateModuleById(ModuleId id) { } Module* ModulesManager::instantiateModuleById(ModuleId id, - const XmlObject& params) { + const XmlObject& params) +{ Module* m = instantiateModuleById(id); - if (m != nullptr) m->initialize(params); + if (m != nullptr) + m->initialize(params); return m; } -Module* ModulesManager::instantiateModuleByName(const QString& moduleName) { +Module* ModulesManager::instantiateModuleByName(const QString& moduleName) +{ return ModulesManager::modulesListHandler.findFactoryByModuleName( moduleName)(); } Module* ModulesManager::instantiateModuleByName(const QString& moduleName, - const XmlObject& params) { + const XmlObject& params) +{ Module* m = instantiateModuleByName(moduleName); - if (m != nullptr) m->initialize(params); + if (m != nullptr) + m->initialize(params); return m; } -QList<Module*> ModulesManager::loadModuleFromXml(XmlObject& xml) { +QList<Module*> ModulesManager::loadModuleFromXml(XmlObject& xml) +{ QList<Module*> windows; - for (int i = 0; i < xml.childCount(); i++) { - XmlObject* child = xml.getChild(i); + for (int i = 0; i < xml.childCount(); i++) + { + XmlObject* child = xml.getChild(i); QString moduleName = child->getObjectName(); Module* module = ModulesManager::instantiateModuleByName(moduleName); - if (module != nullptr) { + if (module != nullptr) + { module->fromXmlObject(*child); windows.append(module); } @@ -73,48 +85,60 @@ QList<Module*> ModulesManager::loadModuleFromXml(XmlObject& xml) { return windows; } -void ModulesManager::setModules(QList<Module*> modules) { +void ModulesManager::setModules(QList<Module*> modules) +{ int i; - for (i = 0; i < pages.count() && i < modules.count(); i++) { + for (i = 0; i < pages.count() && i < modules.count(); i++) + { Module* old = pages[i]; emit pages[i]->getModuleEventsHandler()->replaceMeWith(old, modules[i]); delete old; } - if (i < pages.count()) { - for (int c = pages.count() - 1; c > i; c--) { + if (i < pages.count()) + { + for (int c = pages.count() - 1; c > i; c--) + { delete pages[c]; } } - for (; i < modules.count(); i++) { + for (; i < modules.count(); i++) + { addPage(modules[i]); } } -void ModulesManager::addModules(QList<Module*> modules) { - for (int i = 0; i < modules.count(); i++) { +void ModulesManager::addModules(QList<Module*> modules) +{ + for (int i = 0; i < modules.count(); i++) + { addPage(modules[i]); } } -void ModulesManager::addPage(Module* module) { +void ModulesManager::addPage(Module* module) +{ pages.append(module); connectModule(module); emit pageAdded(pages.indexOf(module)); } -void ModulesManager::removePage(Module* module) { +void ModulesManager::removePage(Module* module) +{ int index = pages.indexOf(module); - if (index >= 0) { + if (index >= 0) + { pages.removeAt(index); disconnectModule(module); } } -Module* ModulesManager::instantiateDefaultModule() { +Module* ModulesManager::instantiateDefaultModule() +{ return ModulesManager::instantiateModuleById(ModuleId::EMPTY); } -Module* ModulesManager::invokeModulesPickerService() { +Module* ModulesManager::invokeModulesPickerService() +{ #ifdef MODULESPICKER_H ModulesPicker* p = new ModulesPicker(); @@ -124,12 +148,15 @@ Module* ModulesManager::invokeModulesPickerService() { return nullptr; } -QList<QString> ModulesManager::getModulesNamesList() { +QList<QString> ModulesManager::getModulesNamesList() +{ return ModulesManager::modulesListHandler.getModulesNamesList(); } -void ModulesManager::connectModule(Module* module) { - if (module) { +void ModulesManager::connectModule(Module* module) +{ + if (module) + { connect(module->getModuleEventsHandler(), &ModuleEventsHandler::contextMenuRequest, this, &ModulesManager::onContextMenuRequest); @@ -144,8 +171,10 @@ void ModulesManager::connectModule(Module* module) { // connect(module->getModuleEventsHandler(),&ModuleEventsHandler::replaceMeWithModules,this,&ModulesManager::openWindows); } -void ModulesManager::disconnectModule(Module* module) { - if (module) { +void ModulesManager::disconnectModule(Module* module) +{ + if (module) + { disconnect(module->getModuleEventsHandler(), &ModuleEventsHandler::contextMenuRequest, this, &ModulesManager::onContextMenuRequest); @@ -158,22 +187,21 @@ void ModulesManager::disconnectModule(Module* module) { } } -void ModulesManager::onModuleDeleted(Module* deletedModule) { - int index = pages.indexOf(deletedModule); - - if (index == 0) { - onFirstPageDeleted(); - } else { - removePage(deletedModule); - } +void ModulesManager::onModuleDeleted(Module* deletedModule) +{ + emit deletedModule->getModuleEventsHandler()->replaceMeWith( + deletedModule, instantiateDefaultModule()); } -void ModulesManager::openNewEmptyWindow() { +void ModulesManager::openNewEmptyWindow() +{ addPage(ModulesManager::instantiateDefaultModule()); } -Module* ModulesManager::getModuleAt(int index) { - if (index >= 0 && index < pages.count()) { +Module* ModulesManager::getModuleAt(int index) +{ + if (index >= 0 && index < pages.count()) + { return pages.at(index); } return nullptr; @@ -181,17 +209,22 @@ Module* ModulesManager::getModuleAt(int index) { int ModulesManager::getModuleCount() { return pages.count(); } -void ModulesManager::clearPages() { - for (int i = pages.count() - 1; i >= 0; i--) { +void ModulesManager::clearPages() +{ + for (int i = pages.count() - 1; i >= 0; i--) + { delete pages[i]; } pages.clear(); } -void ModulesManager::onReplaceMeWith(Module* sender, Module* newModule) { - if (sender != nullptr && newModule != nullptr) { +void ModulesManager::onReplaceMeWith(Module* sender, Module* newModule) +{ + if (sender != nullptr && newModule != nullptr) + { int index = pages.indexOf(sender); - if (index >= 0) { + if (index >= 0) + { pages[index] = newModule; connectModule(newModule); disconnectModule(sender); @@ -203,15 +236,18 @@ bool ModulesManager::getRebuild() const { return rebuild; } void ModulesManager::setRebuild(bool value) { rebuild = value; } -void ModulesManager::onContextMenuRequest(QMenu& menu, const QPoint& p) { +void ModulesManager::onContextMenuRequest(QMenu& menu, const QPoint& p) +{ QMenu hubMenu("Hub Menu"); hubMenu.addActions(getHubMenuActions()); menu.addMenu(&hubMenu); emit contextMenuRequest(menu, p); } -QList<QAction*> ModulesManager::getHubMenuActions() { - if (menuActions.count() == 0) { +QList<QAction*> ModulesManager::getHubMenuActions() +{ + if (menuActions.count() == 0) + { QAction* save = new QAction("Save"); menuActions.append(save); connect(save, &QAction::triggered, this, @@ -226,12 +262,15 @@ QList<QAction*> ModulesManager::getHubMenuActions() { return menuActions; } -QList<ModuleInfo> ModulesManager::getModulesInfo() { +QList<ModuleInfo> ModulesManager::getModulesInfo() +{ return modulesListHandler.getModulesInfo(); } -void ModulesManager::saveConfigurationService() { - if (pages.isEmpty()) { +void ModulesManager::saveConfigurationService() +{ + if (pages.isEmpty()) + { QMessageBox errorMsg; errorMsg.setText("No module to be saved found"); errorMsg.exec(); @@ -259,25 +298,30 @@ void ModulesManager::saveConfigurationService() { xml.addAttribute(SkywardHubStrings::configurationDescriptionAttribute, description); - if (ok && !configName.isEmpty()) { + if (ok && !configName.isEmpty()) + { configName = configName.replace(".xml", ""); xml.addAttribute(SkywardHubStrings::configurationNameAttribute, configName); - if (configName.indexOf(".xml") < 0) { + if (configName.indexOf(".xml") < 0) + { configName.append(".xml"); } - if (!QDir(SkywardHubStrings::defaultPrefabsFolder).exists()) { + if (!QDir(SkywardHubStrings::defaultPrefabsFolder).exists()) + { QDir().mkpath(SkywardHubStrings::defaultPrefabsFolder); } - for (Module* module : pages) { + for (Module* module : pages) + { xml.addChild(module->toXmlObject()); } QString resultTxt = "Impossible to save"; if (xml.writeToFile(SkywardHubStrings::defaultPrefabsFolder + - configName)) { + configName)) + { resultTxt = "The configuration has been saved in " + configName; } QMessageBox resultMsg; @@ -286,18 +330,24 @@ void ModulesManager::saveConfigurationService() { } } -void ModulesManager::onFirstPageDeleted() { - if (!rebuild) return; +void ModulesManager::onFirstPageDeleted() +{ + if (!rebuild) + return; QMessageBox msgBox; msgBox.setWindowTitle("title"); msgBox.setText("Do you want to close the App?"); msgBox.setStandardButtons(QMessageBox::Yes); msgBox.addButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No); - if (msgBox.exec() == QMessageBox::No) { + + if (msgBox.exec() == QMessageBox::No) + { emit pages[0]->getModuleEventsHandler()->replaceMeWith( pages[0], instantiateDefaultModule()); - } else { + } + else + { emit appQuitRequested(); } } diff --git a/Modules/CommandPad/MessageFormElement.cpp b/Modules/CommandPad/MessageFormElement.cpp index b0feed91cf32e1ae82f6f13785ef53af601ac59b..2e53416dbd3a7dad7c47935188f2ab07d7d378ad 100644 --- a/Modules/CommandPad/MessageFormElement.cpp +++ b/Modules/CommandPad/MessageFormElement.cpp @@ -298,13 +298,13 @@ ModuleMessage MessageFormElement::prepareMessage(const QString& messageId) for (auto key : floatMap.keys()) { auto floatField = std::get<1>(floatMap[key]); - message.setField(key, floatField->text()); + message.setField(key, floatField->text().toDouble()); } for (auto key : integerMap.keys()) { auto integerField = std::get<1>(integerMap[key]); - message.setField(key, integerField->text()); + message.setField(key, (uint64_t)integerField->text().toInt()); } return message; diff --git a/Modules/CommandPad/commandpad.cpp b/Modules/CommandPad/commandpad.cpp index 411d82bf656926ab6b537a71f289c051d8ef1830..6c352b0b9d8103d5d3757cffeb11412327b04294 100644 --- a/Modules/CommandPad/commandpad.cpp +++ b/Modules/CommandPad/commandpad.cpp @@ -212,7 +212,7 @@ void CommandPad::setupUi() formElements["RAW_EVENT_TC"] = element; element = new MessageFormElement(); - element->addFloat("ref_altitude", "Altitude:", 0, 9999, 2); + element->addFloat("dpl_altitude", "Altitude:", 0, 9999, 2); formElements["SET_DEPLOYMENT_ALTITUDE_TC"] = element; element = new MessageFormElement(); diff --git a/Modules/DefaultModule/defaultmodule.cpp b/Modules/DefaultModule/defaultmodule.cpp index 9cde78717924cdc401629dfe774409727c586b4c..98a098befd8b94294f54d20347b2908a21b459d7 100644 --- a/Modules/DefaultModule/defaultmodule.cpp +++ b/Modules/DefaultModule/defaultmodule.cpp @@ -1,60 +1,72 @@ #include "defaultmodule.h" + #include <QCloseEvent> #include "Components/ContextMenuSeparator/contextmenuseparator.h" #include "Core/modulesmanager.h" - -int DefaultModule::LONG_ERROR_DURATION = 15000; +int DefaultModule::LONG_ERROR_DURATION = 15000; int DefaultModule::MEDIUM_ERROR_DURATION = 10000; -int DefaultModule::SHORT_ERROR_DURATION = 5000; +int DefaultModule::SHORT_ERROR_DURATION = 5000; -DefaultModule::DefaultModule(QWidget* parent) : QWidget(parent) { +DefaultModule::DefaultModule(QWidget* parent) : QWidget(parent) {} -} - -DefaultModule::~DefaultModule() { - for(int i = 0; i < menuActions.count(); i++) { +DefaultModule::~DefaultModule() +{ + for (int i = 0; i < menuActions.count(); i++) + { delete menuActions[i]; } menuActions.clear(); } -void DefaultModule::closeEvent(QCloseEvent* event) { - if (event->spontaneous()) { +void DefaultModule::closeEvent(QCloseEvent* event) +{ + if (event->spontaneous()) + { emit getModuleEventsHandler()->beforeDelete(this); QWidget::closeEvent(event); - } else { + } + else + { QWidget::closeEvent(event); } } -void DefaultModule::defaultContextMenuSetup() { - if(areDefaultSettingsDone) +void DefaultModule::defaultContextMenuSetup() +{ + if (areDefaultSettingsDone) return; areDefaultSettingsDone = true; setContextMenuPolicy(Qt::CustomContextMenu); - connect(this, &DefaultModule::customContextMenuRequested, this, &DefaultModule::onCustomContextMenuRequested); + connect(this, &DefaultModule::customContextMenuRequested, this, + &DefaultModule::onCustomContextMenuRequested); addDefaultActionsToMenu(); addCustomActionsToMenu(); } -void DefaultModule::onCustomContextMenuRequested(const QPoint& p) { +void DefaultModule::onCustomContextMenuRequested(const QPoint& p) +{ QMenu menu; onSkywardHubContextMenuRequested(menu, mapToGlobal(p)); } -QString DefaultModule::getName(const ModuleId id) { - return getCore()->getModulesManager()->getModuleName(id); +QString DefaultModule::getName(const ModuleId id) +{ + return getCore()->getModulesManager()->getModuleName(id); } -void DefaultModule::onSkywardHubContextMenuRequested(QMenu& menu, const QPoint& p) { +void DefaultModule::onSkywardHubContextMenuRequested(QMenu& menu, + const QPoint& p) +{ QMenu newMenu(menuName); - if(!menuName.isEmpty()) { + if (!menuName.isEmpty()) + { newMenu.addActions(menuActions); menu.addMenu(&newMenu); - } else + } + else menu.addActions(menuActions); ContextMenuSeparator separator; @@ -62,61 +74,71 @@ void DefaultModule::onSkywardHubContextMenuRequested(QMenu& menu, const QPoint& emit getModuleEventsHandler()->contextMenuRequest(menu, p); } -void DefaultModule::addDefaultActionsToMenu() { +void DefaultModule::addDefaultActionsToMenu() +{ QAction* close = new QAction("Close"); connect(close, &QAction::triggered, this, &DefaultModule::onCloseClicked); QAction* replace = new QAction("Replace"); - connect(replace, &QAction::triggered, this, &DefaultModule::onReplaceClicked); + connect(replace, &QAction::triggered, this, + &DefaultModule::onReplaceClicked); addActionToMenu(close); addActionToMenu(replace); } -void DefaultModule::onCloseClicked() { - delete this; -} +void DefaultModule::onCloseClicked() { delete this; } -void DefaultModule::onReplaceClicked() { - Module* newModule = getCore()->getModulesManager()->invokeModulesPickerService(); - if(newModule != nullptr) { +void DefaultModule::onReplaceClicked() +{ + Module* newModule = + getCore()->getModulesManager()->invokeModulesPickerService(); + if (newModule != nullptr) + { emit getModuleEventsHandler()->replaceMeWith(this, newModule); delete this; } } -void DefaultModule::addActionToMenu(QAction* action) { +void DefaultModule::addActionToMenu(QAction* action) +{ menuActions.append(action); } -void DefaultModule::showMenuActionsInSeparatedMenu(const QString& menuName) { +void DefaultModule::showMenuActionsInSeparatedMenu(const QString& menuName) +{ this->menuName = menuName; } -void DefaultModule::addCustomActionsToMenu() { +void DefaultModule::addCustomActionsToMenu() {} -} - -SkywardHubCoreProxy& DefaultModule::getCore() { - return proxyCore; -} +SkywardHubCoreProxy& DefaultModule::getCore() { return proxyCore; } -Window* DefaultModule::getWindow() { +Window* DefaultModule::getWindow() +{ QObject* parent = this; - while (dynamic_cast<Window*>(parent) == NULL) { + while (dynamic_cast<Window*>(parent) == NULL) + { parent = parent->parent(); } return dynamic_cast<Window*>(parent); } -void DefaultModule::error(QString title, QString description, int msecDuration) { - getWindow()->errorDisplayer->createError(title, description, ErrorType::ET_ERROR, msecDuration); +void DefaultModule::error(QString title, QString description, int msecDuration) +{ + getWindow()->errorDisplayer->createError(title, description, + ErrorType::ET_ERROR, msecDuration); } -void DefaultModule::warning(QString title, QString description, int msecDuration) { - getWindow()->errorDisplayer->createError(title, description, ErrorType::ET_WARNING, msecDuration); +void DefaultModule::warning(QString title, QString description, + int msecDuration) +{ + getWindow()->errorDisplayer->createError( + title, description, ErrorType::ET_WARNING, msecDuration); } -void DefaultModule::info(QString title, QString description, int msecDuration) { - getWindow()->errorDisplayer->createError(title, description, ErrorType::ET_INFO, msecDuration); +void DefaultModule::info(QString title, QString description, int msecDuration) +{ + getWindow()->errorDisplayer->createError(title, description, + ErrorType::ET_INFO, msecDuration); } diff --git a/Modules/Mavlink/mavlinkcommandadapter.cpp b/Modules/Mavlink/mavlinkcommandadapter.cpp index f41dd5ad1765b6be2d155c1d41508215ef1184c5..58c4909d7d575e31471fbd4341472104cd922953 100644 --- a/Modules/Mavlink/mavlinkcommandadapter.cpp +++ b/Modules/Mavlink/mavlinkcommandadapter.cpp @@ -8,89 +8,117 @@ MavlinkCommandAdapter::MavlinkCommandAdapter() {} -void MavlinkCommandAdapter::setSerialPort(QSerialPort *value) { +void MavlinkCommandAdapter::setSerialPort(QSerialPort *value) +{ serial = value; } bool MavlinkCommandAdapter::encodeCommand(const ModuleMessage &msg, - mavlink_message_t &output) { + mavlink_message_t &output) +{ QString messageName = msg.getTopic().toString().replace( SkywardHubStrings::commandsTopic + "/", ""); - if (messageName == "PING_TC") { + if (messageName == "PING_TC") + { mavlink_msg_ping_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("timestamp").getUInteger(0)); return true; - } else if (messageName == "COMMAND_TC") { + } + else if (messageName == "COMMAND_TC") + { mavlink_msg_command_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("command_id").getUInteger(0)); return true; - } else if (messageName == "SYSTEM_TM_REQUEST_TC") { + } + else if (messageName == "SYSTEM_TM_REQUEST_TC") + { mavlink_msg_system_tm_request_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("tm_id").getUInteger(0)); return true; - } else if (messageName == "SENSOR_TM_REQUEST_TC") { + } + else if (messageName == "SENSOR_TM_REQUEST_TC") + { mavlink_msg_sensor_tm_request_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("sensor_id").getUInteger(0)); return true; - } else if (messageName == "SERVO_TM_REQUEST_TC") { + } + else if (messageName == "SERVO_TM_REQUEST_TC") + { mavlink_msg_servo_tm_request_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("servo_id").getUInteger(0)); return true; - } else if (messageName == "SET_SERVO_ANGLE_TC") { - mavlink_msg_set_servo_angle_tc_pack( - MAV_SYS, MAV_CMP, &output, msg.getField("servo_id").getUInteger(0), - msg.getField("angle").getDouble(0.0)); - return true; - } else if (messageName == "SET_SERVO_ANGLE_TC") { + } + else if (messageName == "SET_SERVO_ANGLE_TC") + { mavlink_msg_set_servo_angle_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("servo_id").getUInteger(0), msg.getField("angle").getDouble(0.0)); return true; - } else if (messageName == "WIGGLE_SERVO_TC") { + } + else if (messageName == "WIGGLE_SERVO_TC") + { mavlink_msg_wiggle_servo_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("servo_id").getUInteger(0)); return true; - } else if (messageName == "RESET_SERVO_TC") { + } + else if (messageName == "RESET_SERVO_TC") + { mavlink_msg_reset_servo_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("servo_id").getUInteger(0)); return true; - } else if (messageName == "SET_REFERENCE_ALTITUDE_TC") { + } + else if (messageName == "SET_REFERENCE_ALTITUDE_TC") + { mavlink_msg_set_reference_altitude_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("ref_altitude").getDouble(0.0)); return true; - } else if (messageName == "SET_REFERENCE_TEMPERATURE_TC") { + } + else if (messageName == "SET_REFERENCE_TEMPERATURE_TC") + { mavlink_msg_set_reference_temperature_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("ref_temp").getDouble(0.0)); return true; - } else if (messageName == "SET_DEPLOYMENT_ALTITUDE_TC") { + } + else if (messageName == "SET_DEPLOYMENT_ALTITUDE_TC") + { mavlink_msg_set_deployment_altitude_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("dpl_altitude").getDouble(0.0)); return true; - } else if (messageName == "SET_ORIENTATION_TC") { + } + else if (messageName == "SET_ORIENTATION_TC") + { mavlink_msg_set_orientation_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("yaw").getDouble(0.0), msg.getField("pitch").getDouble(0.0), msg.getField("roll").getDouble(0.0)); return true; - } else if (messageName == "SET_COORDINATES_TC") { + } + else if (messageName == "SET_COORDINATES_TC") + { mavlink_msg_set_coordinates_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("latitude").getDouble(0.0), msg.getField("longitude").getDouble(0.0)); return true; - } else if (messageName == "RAW_EVENT_TC") { + } + else if (messageName == "RAW_EVENT_TC") + { mavlink_msg_raw_event_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("topic_id").getUInteger(0), msg.getField("event_id").getUInteger(0)); return true; - } else if (messageName == "SET_TARGET_COORDINATES_TC") { + } + else if (messageName == "SET_TARGET_COORDINATES_TC") + { mavlink_msg_set_target_coordinates_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("latitude").getDouble(0.0), msg.getField("longitude").getDouble(0.0)); return true; - } else if (messageName == "SET_ALGORITHM_TC") { + } + else if (messageName == "SET_ALGORITHM_TC") + { mavlink_msg_set_algorithm_tc_pack( MAV_SYS, MAV_CMP, &output, msg.getField("algorithm_number").getUInteger(0)); @@ -99,23 +127,27 @@ bool MavlinkCommandAdapter::encodeCommand(const ModuleMessage &msg, return false; } -void MavlinkCommandAdapter::send(mavlink_message_t msg) { +void MavlinkCommandAdapter::send(mavlink_message_t msg) +{ mavlinkWriter.setSerialPort(serial); mavlinkWriter.write(msg); } bool MavlinkCommandAdapter::produceMsgFromXml(const XmlObject &xml, - mavlink_message_t *msg) { + mavlink_message_t *msg) +{ bool result = false; - if (xml.getObjectName() == "ACK_TM") { + if (xml.getObjectName() == "ACK_TM") + { QString recv_string = xml.getAttribute("recv_msgid"); - QString seq_string = xml.getAttribute("seq_ack"); + QString seq_string = xml.getAttribute("seq_ack"); bool ok1, ok2; uint8_t recvId = recv_string.toUInt(&ok1); - uint8_t seq = seq_string.toUInt(&ok2); + uint8_t seq = seq_string.toUInt(&ok2); - if (ok1 && ok2) { + if (ok1 && ok2) + { mavlink_msg_ack_tm_pack(MAV_SYS, MAV_CMP, msg, recvId, seq); } result = true;