|
|
@ -447,7 +447,9 @@ void RadioConfigTest::_validateParameters(void) |
|
|
|
QString minTpl("RC%1_MIN"); |
|
|
|
QString minTpl("RC%1_MIN"); |
|
|
|
QString maxTpl("RC%1_MAX"); |
|
|
|
QString maxTpl("RC%1_MAX"); |
|
|
|
QString trimTpl("RC%1_TRIM"); |
|
|
|
QString trimTpl("RC%1_TRIM"); |
|
|
|
QString revTpl("RC%1_REV"); |
|
|
|
|
|
|
|
|
|
|
|
QString revTplPX4("RC%1_REV"); |
|
|
|
|
|
|
|
QString revTplAPM("RC%1_REVERSED"); |
|
|
|
|
|
|
|
|
|
|
|
// Check mapping for all fuctions
|
|
|
|
// Check mapping for all fuctions
|
|
|
|
for (int chanFunction=0; chanFunction<RadioComponentController::rcCalFunctionMax; chanFunction++) { |
|
|
|
for (int chanFunction=0; chanFunction<RadioComponentController::rcCalFunctionMax; chanFunction++) { |
|
|
@ -484,9 +486,15 @@ void RadioConfigTest::_validateParameters(void) |
|
|
|
QCOMPARE(convertOk, true); |
|
|
|
QCOMPARE(convertOk, true); |
|
|
|
int rcTrimActual = _vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, trimTpl.arg(oneBasedChannel))->rawValue().toInt(&convertOk); |
|
|
|
int rcTrimActual = _vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, trimTpl.arg(oneBasedChannel))->rawValue().toInt(&convertOk); |
|
|
|
QCOMPARE(convertOk, true); |
|
|
|
QCOMPARE(convertOk, true); |
|
|
|
float rcReversedFloat = _vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, revTpl.arg(oneBasedChannel))->rawValue().toFloat(&convertOk); |
|
|
|
|
|
|
|
|
|
|
|
bool rcReversedActual; |
|
|
|
|
|
|
|
if (_vehicle->px4Firmware()) { |
|
|
|
|
|
|
|
float rcReversedFloat = _vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, revTplPX4.arg(oneBasedChannel))->rawValue().toFloat(&convertOk); |
|
|
|
QCOMPARE(convertOk, true); |
|
|
|
QCOMPARE(convertOk, true); |
|
|
|
bool rcReversedActual = (rcReversedFloat == -1.0f); |
|
|
|
rcReversedActual = (rcReversedFloat == -1.0f); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
rcReversedActual = _vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, revTplAPM.arg(oneBasedChannel))->rawValue().toBool(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
qCDebug(RadioConfigTestLog) << "_validateParameters expected channel:min:max:trim:rev" << chan << rcMinExpected << rcMaxExpected << rcTrimExpected << rcReversedExpected; |
|
|
|
qCDebug(RadioConfigTestLog) << "_validateParameters expected channel:min:max:trim:rev" << chan << rcMinExpected << rcMaxExpected << rcTrimExpected << rcReversedExpected; |
|
|
|
qCDebug(RadioConfigTestLog) << "_validateParameters actual channel:min:max:trim:rev" << chan << rcMinActual << rcMaxActual << rcTrimActual << rcReversedActual; |
|
|
|
qCDebug(RadioConfigTestLog) << "_validateParameters actual channel:min:max:trim:rev" << chan << rcMinActual << rcMaxActual << rcTrimActual << rcReversedActual; |
|
|
|