diff --git a/flight/modules/Actuator/actuator.c b/flight/modules/Actuator/actuator.c index 7722408a3..8a7bd3266 100644 --- a/flight/modules/Actuator/actuator.c +++ b/flight/modules/Actuator/actuator.c @@ -551,7 +551,6 @@ static void actuatorTask(__attribute__((unused)) void *parameters) float ProcessMixer(const int index, const float curve1, const float curve2, ActuatorDesiredData *desired, bool multirotor, bool fixedwing) { - const Mixer_t *mixers = (Mixer_t *)&mixerSettings.Mixer1Type; // pointer to array of mixers in UAVObjects const Mixer_t *mixer = &mixers[index]; float differential = 1.0f; diff --git a/flight/modules/Telemetry/telemetry.c b/flight/modules/Telemetry/telemetry.c index 17bf78b07..f7839427f 100644 --- a/flight/modules/Telemetry/telemetry.c +++ b/flight/modules/Telemetry/telemetry.c @@ -195,7 +195,7 @@ int32_t TelemetryStart(void) localChannel.rxTaskHandle); } #endif /* ifdef HAS_RADIO */ - // Start the telemetry tasks associated with Radio/USB + // Start the telemetry tasks associated with Radio/USB UAVObjIterate(®isterRadioObject); // Listen to objects of interest diff --git a/flight/targets/boards/coptercontrol/board_hw_defs.c b/flight/targets/boards/coptercontrol/board_hw_defs.c index ab7181119..1e464899d 100644 --- a/flight/targets/boards/coptercontrol/board_hw_defs.c +++ b/flight/targets/boards/coptercontrol/board_hw_defs.c @@ -1028,39 +1028,39 @@ static const struct pios_dsm_cfg pios_dsm_flexi_cfg = { #include static const struct pios_usart_cfg pios_usart_srxl_flexi_cfg = { - .regs = USART3, - .init = { - .USART_BaudRate = 115200, - .USART_WordLength = USART_WordLength_8b, - .USART_Parity = USART_Parity_No, - .USART_StopBits = USART_StopBits_1, - .USART_HardwareFlowControl = USART_HardwareFlowControl_None, - .USART_Mode = USART_Mode_Rx, - }, - .irq = { - .init = { - .NVIC_IRQChannel = USART3_IRQn, - .NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_HIGH, - .NVIC_IRQChannelSubPriority = 0, - .NVIC_IRQChannelCmd = ENABLE, - }, - }, - .rx = { - .gpio = GPIOB, - .init = { - .GPIO_Pin = GPIO_Pin_11, - .GPIO_Speed = GPIO_Speed_2MHz, - .GPIO_Mode = GPIO_Mode_IPU, - }, - }, - .tx = { - .gpio = GPIOB, - .init = { - .GPIO_Pin = GPIO_Pin_10, - .GPIO_Speed = GPIO_Speed_2MHz, - .GPIO_Mode = GPIO_Mode_IN_FLOATING, - }, - }, + .regs = USART3, + .init = { + .USART_BaudRate = 115200, + .USART_WordLength = USART_WordLength_8b, + .USART_Parity = USART_Parity_No, + .USART_StopBits = USART_StopBits_1, + .USART_HardwareFlowControl = USART_HardwareFlowControl_None, + .USART_Mode = USART_Mode_Rx, + }, + .irq = { + .init = { + .NVIC_IRQChannel = USART3_IRQn, + .NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_HIGH, + .NVIC_IRQChannelSubPriority = 0, + .NVIC_IRQChannelCmd = ENABLE, + }, + }, + .rx = { + .gpio = GPIOB, + .init = { + .GPIO_Pin = GPIO_Pin_11, + .GPIO_Speed = GPIO_Speed_2MHz, + .GPIO_Mode = GPIO_Mode_IPU, + }, + }, + .tx = { + .gpio = GPIOB, + .init = { + .GPIO_Pin = GPIO_Pin_10, + .GPIO_Speed = GPIO_Speed_2MHz, + .GPIO_Mode = GPIO_Mode_IN_FLOATING, + }, + }, }; #endif /* PIOS_INCLUDE_SRXL */ diff --git a/ground/gcs/src/plugins/coreplugin/generalsettings.cpp b/ground/gcs/src/plugins/coreplugin/generalsettings.cpp index f7483b968..290536fcb 100644 --- a/ground/gcs/src/plugins/coreplugin/generalsettings.cpp +++ b/ground/gcs/src/plugins/coreplugin/generalsettings.cpp @@ -162,16 +162,16 @@ void GeneralSettings::finish() void GeneralSettings::readSettings(QSettings *qs) { qs->beginGroup(QLatin1String("General")); - m_language = qs->value(QLatin1String("OverrideLanguage"), QLocale::system().name()).toString(); + m_language = qs->value(QLatin1String("OverrideLanguage"), QLocale::system().name()).toString(); m_saveSettingsOnExit = qs->value(QLatin1String("SaveSettingsOnExit"), m_saveSettingsOnExit).toBool(); - m_autoConnect = qs->value(QLatin1String("AutoConnect"), m_autoConnect).toBool(); - m_autoSelect = qs->value(QLatin1String("AutoSelect"), m_autoSelect).toBool(); - m_useUDPMirror = qs->value(QLatin1String("UDPMirror"), m_useUDPMirror).toBool(); - m_useExpertMode = qs->value(QLatin1String("ExpertMode"), m_useExpertMode).toBool(); + m_autoConnect = qs->value(QLatin1String("AutoConnect"), m_autoConnect).toBool(); + m_autoSelect = qs->value(QLatin1String("AutoSelect"), m_autoSelect).toBool(); + m_useUDPMirror = qs->value(QLatin1String("UDPMirror"), m_useUDPMirror).toBool(); + m_useExpertMode = qs->value(QLatin1String("ExpertMode"), m_useExpertMode).toBool(); // Usage data collection temporarily disabled // m_collectUsageData = qs->value(QLatin1String("CollectUsageData"), m_collectUsageData).toBool(); // m_showUsageDataDisclaimer = qs->value(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer).toBool(); - m_lastUsageHash = qs->value(QLatin1String("LastUsageHash"), m_lastUsageHash).toString(); + m_lastUsageHash = qs->value(QLatin1String("LastUsageHash"), m_lastUsageHash).toString(); qs->endGroup(); } @@ -191,8 +191,8 @@ void GeneralSettings::saveSettings(QSettings *qs) qs->setValue(QLatin1String("UDPMirror"), m_useUDPMirror); qs->setValue(QLatin1String("ExpertMode"), m_useExpertMode); // Usage data collection temporarily disabled - //qs->setValue(QLatin1String("CollectUsageData"), m_collectUsageData); - //qs->setValue(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer); + // qs->setValue(QLatin1String("CollectUsageData"), m_collectUsageData); + // qs->setValue(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer); qs->setValue(QLatin1String("LastUsageHash"), m_lastUsageHash); qs->endGroup(); } @@ -264,18 +264,18 @@ bool GeneralSettings::useUDPMirror() const return m_useUDPMirror; } -/** Usage data collection temporarily disabled -bool GeneralSettings::collectUsageData() const -{ +/** Usage data collection temporarily disabled + bool GeneralSettings::collectUsageData() const + { return m_collectUsageData; -} + } -bool GeneralSettings::showUsageDataDisclaimer() const -{ + bool GeneralSettings::showUsageDataDisclaimer() const + { return m_showUsageDataDisclaimer; -} -********************/ + } + ********************/ QString GeneralSettings::lastUsageHash() const { return m_lastUsageHash; @@ -287,19 +287,19 @@ bool GeneralSettings::useExpertMode() const } /** Usage data collection temporarily disabled -void GeneralSettings::setCollectUsageData(bool collect) -{ + void GeneralSettings::setCollectUsageData(bool collect) + { if (collect && collect != m_collectUsageData) { setShowUsageDataDisclaimer(true); } m_collectUsageData = collect; -} + } -void GeneralSettings::setShowUsageDataDisclaimer(bool show) -{ + void GeneralSettings::setShowUsageDataDisclaimer(bool show) + { m_showUsageDataDisclaimer = show; -} -********************/ + } + ********************/ void GeneralSettings::setLastUsageHash(QString hash) { diff --git a/ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp b/ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp index 6ed9a5a33..41f2f5022 100644 --- a/ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp +++ b/ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp @@ -201,7 +201,7 @@ void ControllerPage::connectionStatusChanged() SetupWizard::CONTROLLER_TYPE type = getControllerType(); setControllerType(type); QPixmap boardPic; - QSize picSize = QSize(250,250); + QSize picSize = QSize(250, 250); switch (type) { case SetupWizard::CONTROLLER_CC: diff --git a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index a836b72b3..3f0142bab 100644 --- a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -1015,7 +1015,8 @@ void VehicleConfigurationHelper::resetVehicleConfig() MixerSettings *mSettings = MixerSettings::GetInstance(m_uavoManager); // Reset throttle curves - QString throttlePattern = "ThrottleCurve%1"; + QString throttlePattern = "ThrottleCurve%1"; + for (int i = 1; i <= 2; i++) { UAVObjectField *field = mSettings->getField(throttlePattern.arg(i)); Q_ASSERT(field);