From efccabfe8f71642303af948fe6acf41cb0835a33 Mon Sep 17 00:00:00 2001 From: m_thread Date: Sun, 15 Mar 2015 23:21:43 +0100 Subject: [PATCH] OP-1777 Renamed some parameters. --- .../usagetracker/usagetrackerplugin.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp index b09b35f36..3650826a9 100644 --- a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp +++ b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp @@ -169,26 +169,26 @@ void UsageTrackerPlugin::collectUsageParameters(QMap ¶mete ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); UAVObjectManager *objManager = pm->getObject(); - parameters["settings_receiver"] = getUAVFieldValue(objManager, "ManualControlSettings", "ChannelGroups", 0); - parameters["settings_vehicle"] = getUAVFieldValue(objManager, "SystemSettings", "AirframeType"); + parameters["conf_receiver"] = getUAVFieldValue(objManager, "ManualControlSettings", "ChannelGroups", 0); + parameters["conf_vehicle"] = getUAVFieldValue(objManager, "SystemSettings", "AirframeType"); if ((boardModel & 0xff00) == 0x0400) { // CopterControl family - parameters["settings_rport"] = getUAVFieldValue(objManager, "HwSettings", "CC_RcvrPort"); - parameters["settings_mport"] = getUAVFieldValue(objManager, "HwSettings", "CC_MainPort"); - parameters["settings_fport"] = getUAVFieldValue(objManager, "HwSettings", "CC_FlexiPort"); + parameters["conf_rport"] = getUAVFieldValue(objManager, "HwSettings", "CC_RcvrPort"); + parameters["conf_mport"] = getUAVFieldValue(objManager, "HwSettings", "CC_MainPort"); + parameters["conf_fport"] = getUAVFieldValue(objManager, "HwSettings", "CC_FlexiPort"); } else if ((boardModel & 0xff00) == 0x0900) { // Revolution family - parameters["settings_rport"] = getUAVFieldValue(objManager, "HwSettings", "RM_RcvrPort"); - parameters["settings_mport"] = getUAVFieldValue(objManager, "HwSettings", "RM_MainPort"); - parameters["settings_fport"] = getUAVFieldValue(objManager, "HwSettings", "RM_FlexiPort"); - parameters["settings_fusion"] = getUAVFieldValue(objManager, "RevoSettings", "FusionAlgorithm"); + parameters["conf_rport"] = getUAVFieldValue(objManager, "HwSettings", "RM_RcvrPort"); + parameters["conf_mport"] = getUAVFieldValue(objManager, "HwSettings", "RM_MainPort"); + parameters["conf_fport"] = getUAVFieldValue(objManager, "HwSettings", "RM_FlexiPort"); + parameters["conf_fusion"] = getUAVFieldValue(objManager, "RevoSettings", "FusionAlgorithm"); } - parameters["settings_uport"] = getUAVFieldValue(objManager, "HwSettings", "USB_HIDPort"); - parameters["settings_vport"] = getUAVFieldValue(objManager, "HwSettings", "USB_VCPPort"); + parameters["conf_uport"] = getUAVFieldValue(objManager, "HwSettings", "USB_HIDPort"); + parameters["conf_vport"] = getUAVFieldValue(objManager, "HwSettings", "USB_VCPPort"); - parameters["settings_rotation"] = QString("%1:%2:%3") + parameters["conf_rotation"] = QString("%1:%2:%3") .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 0)) .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 1)) .arg(getUAVFieldValue(objManager, "AttitudeSettings", "BoardRotation", 2));