Browse Source

Fix up MockLink and unit tests for correct component id

QGC4.4
DonLakeFlyer 8 years ago
parent
commit
7485b7a7b3
  1. 2
      src/FactSystem/FactSystemTest.qml
  2. 4
      src/FactSystem/FactSystemTestBase.cc
  3. 2
      src/comm/MockLink.cc

2
src/FactSystem/FactSystemTest.qml

@ -32,7 +32,7 @@ FactPanel { @@ -32,7 +32,7 @@ FactPanel {
TextInput {
text: fact2.value
property Fact fact2: controller.getParameterFact(200, "RC_MAP_THROTTLE")
property Fact fact2: controller.getParameterFact(1, "RC_MAP_THROTTLE")
onAccepted: fact2.value = text
}

4
src/FactSystem/FactSystemTestBase.cc

@ -58,8 +58,8 @@ void FactSystemTestBase::_parameter_default_component_id_test(void) @@ -58,8 +58,8 @@ void FactSystemTestBase::_parameter_default_component_id_test(void)
void FactSystemTestBase::_parameter_specific_component_id_test(void)
{
QVERIFY(_vehicle->parameterManager()->parameterExists(200, "RC_MAP_THROTTLE"));
Fact* fact = _vehicle->parameterManager()->getParameter(200, "RC_MAP_THROTTLE");
QVERIFY(_vehicle->parameterManager()->parameterExists(MAV_COMP_ID_AUTOPILOT1, "RC_MAP_THROTTLE"));
Fact* fact = _vehicle->parameterManager()->getParameter(MAV_COMP_ID_AUTOPILOT1, "RC_MAP_THROTTLE");
QVERIFY(fact != NULL);
QVariant factValue = fact->rawValue();
QCOMPARE(factValue.isValid(), true);

2
src/comm/MockLink.cc

@ -51,7 +51,7 @@ MockLink::MockLink(SharedLinkConfigurationPointer& config) @@ -51,7 +51,7 @@ MockLink::MockLink(SharedLinkConfigurationPointer& config)
, _connected(false)
, _mavlinkChannel(0)
, _vehicleSystemId(_nextVehicleSystemId++)
, _vehicleComponentId(200)
, _vehicleComponentId(MAV_COMP_ID_AUTOPILOT1)
, _inNSH(false)
, _mavlinkStarted(true)
, _mavBaseMode(MAV_MODE_FLAG_MANUAL_INPUT_ENABLED | MAV_MODE_FLAG_CUSTOM_MODE_ENABLED)

Loading…
Cancel
Save