rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-22 12:54:14 +01:00
Code Issues Releases Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flight/pios/stm32f4xx/pios_usart.c
View File

@ -47,12 +47,12 @@ static void PIOS_USART_TxStart(uint32_t usart_id, uint16_t tx_bytes_avail);
static void PIOS_USART_RxStart(uint32_t usart_id, uint16_t rx_bytes_avail); static void PIOS_USART_RxStart(uint32_t usart_id, uint16_t rx_bytes_avail);
const struct pios_com_driver pios_usart_com_driver = { const struct pios_com_driver pios_usart_com_driver = {
.set_baud = PIOS_USART_ChangeBaud, .set_baud = PIOS_USART_ChangeBaud,
.set_ctrl_line = PIOS_USART_SetCtrlLine, .set_ctrl_line = PIOS_USART_SetCtrlLine,
.tx_start = PIOS_USART_TxStart, .tx_start = PIOS_USART_TxStart,
.rx_start = PIOS_USART_RxStart, .rx_start = PIOS_USART_RxStart,
.bind_tx_cb = PIOS_USART_RegisterTxCallback, .bind_tx_cb = PIOS_USART_RegisterTxCallback,
.bind_rx_cb = PIOS_USART_RegisterRxCallback, .bind_rx_cb = PIOS_USART_RegisterRxCallback,
}; };
enum pios_usart_dev_magic { enum pios_usart_dev_magic {

15
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -100,8 +100,8 @@ bool VehicleConfigurationHelper::setupHardwareSettings(bool save)
bool VehicleConfigurationHelper::isApplicable(UAVObject *dataObj) bool VehicleConfigurationHelper::isApplicable(UAVObject *dataObj)
{ {
return true; return true;
} }
void VehicleConfigurationHelper::addModifiedObject(UAVDataObject *object, QString description) void VehicleConfigurationHelper::addModifiedObject(UAVDataObject *object, QString description)
{ {
@ -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;