1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-22 12:54:14 +01:00

Merge branch 'abeck/nanorc2_fixes' into rel-nano-15.05

This commit is contained in:
abeck70 2015-05-21 22:24:56 +10:00
commit d19beff712
2 changed files with 18 additions and 7 deletions

View File

@ -410,6 +410,13 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) { if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) {
data.BankUpdateFreq[2] = escFrequence; data.BankUpdateFreq[2] = escFrequence;
data.BankMode[2] = bankMode; data.BankMode[2] = bankMode;
} else if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_NANO) {
data.BankUpdateFreq[1] = escFrequence;
data.BankMode[1] = bankMode;
data.BankUpdateFreq[2] = escFrequence;
data.BankMode[2] = bankMode;
data.BankUpdateFreq[3] = escFrequence;
data.BankMode[3] = bankMode;
} }
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_HEXA: case VehicleConfigurationSource::MULTI_ROTOR_HEXA:
@ -429,6 +436,10 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
data.BankMode[2] = bankMode; data.BankMode[2] = bankMode;
data.BankUpdateFreq[3] = escFrequence; data.BankUpdateFreq[3] = escFrequence;
data.BankMode[3] = bankMode; data.BankMode[3] = bankMode;
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_NANO) {
data.BankUpdateFreq[4] = escFrequence;
data.BankMode[4] = bankMode;
}
break; break;
default: default:
break; break;