From 9ef31ea9d64a6997de9e5943fd3c03fd4d8eccb8 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 13 Apr 2015 22:13:21 -0700 Subject: [PATCH] Change file extension to match save param file standard --- qgroundcontrol.qrc | 3 ++- src/qgcunittest/MockLink.cc | 2 +- src/qgcunittest/{MockLink.param => MockLink.params} | 0 src/qgcunittest/MockQGCUASParamManager.cc | 2 +- src/qgcunittest/PX4RCCalibrationTest.cc | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename src/qgcunittest/{MockLink.param => MockLink.params} (100%) diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 6e41c9125..44a27225e 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -1,6 +1,6 @@ - src/qgcunittest/MockLink.param + src/qgcunittest/MockLink.params src/FactSystem/FactSystemTest.qml @@ -35,6 +35,7 @@ src/VehicleSetup/VehicleSummary.qml src/VehicleSetup/FirmwareUpgrade.qml + src/VehicleSetup/ParameterEditor.qml src/AutoPilotPlugins/PX4/SafetyComponent.qml src/AutoPilotPlugins/PX4/PowerComponent.qml src/AutoPilotPlugins/PX4/SensorsComponent.qml diff --git a/src/qgcunittest/MockLink.cc b/src/qgcunittest/MockLink.cc index 7a75b81ae..1265559a2 100644 --- a/src/qgcunittest/MockLink.cc +++ b/src/qgcunittest/MockLink.cc @@ -166,7 +166,7 @@ void MockLink::_run50HzTasks(void) void MockLink::_loadParams(void) { - QFile paramFile(":/unittest/MockLink.param"); + QFile paramFile(":/unittest/MockLink.params"); bool success = paramFile.open(QFile::ReadOnly); Q_UNUSED(success); diff --git a/src/qgcunittest/MockLink.param b/src/qgcunittest/MockLink.params similarity index 100% rename from src/qgcunittest/MockLink.param rename to src/qgcunittest/MockLink.params diff --git a/src/qgcunittest/MockQGCUASParamManager.cc b/src/qgcunittest/MockQGCUASParamManager.cc index 77b751b3d..b10fdfe96 100644 --- a/src/qgcunittest/MockQGCUASParamManager.cc +++ b/src/qgcunittest/MockQGCUASParamManager.cc @@ -58,7 +58,7 @@ void MockQGCUASParamManager::setParameter(int component, QString parameterName, void MockQGCUASParamManager::_loadParams(void) { - QFile paramFile(":/unittest/MockLink.param"); + QFile paramFile(":/unittest/MockLink.params"); bool success = paramFile.open(QFile::ReadOnly); Q_UNUSED(success); diff --git a/src/qgcunittest/PX4RCCalibrationTest.cc b/src/qgcunittest/PX4RCCalibrationTest.cc index 6a0d934d7..b74beb958 100644 --- a/src/qgcunittest/PX4RCCalibrationTest.cc +++ b/src/qgcunittest/PX4RCCalibrationTest.cc @@ -392,7 +392,7 @@ void PX4RCCalibrationTest::_switchSelectAutoStep(const char* functionStr, PX4RCC void PX4RCCalibrationTest::_fullCalibration_test(void) { // IMPORTANT NOTE: We used channels 1-5 for attitude mapping in the test below. - // MockLink.param file cannot have flight mode switches mapped to those channels. + // MockLink.params file cannot have flight mode switches mapped to those channels. // If it does it will cause errors since the stick will not be detetected where MockQGCUASParamManager* paramMgr = _mockUAS->getMockQGCUASParamManager(); -- 2.22.0