rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Uncrustify

Browse Source
This commit is contained in:
a*morale 2015-09-05 11:49:43 +02:00
parent 1f09d36638
commit 792835c009
6 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flight/modules/Actuator/actuator.c
View File

@ -551,7 +551,6 @@ static void actuatorTask(__attribute__((unused)) void *parameters)
float ProcessMixer(const int index, const float curve1, const float curve2, float ProcessMixer(const int index, const float curve1, const float curve2,
ActuatorDesiredData *desired, bool multirotor, bool fixedwing) ActuatorDesiredData *desired, bool multirotor, bool fixedwing)
{ {
const Mixer_t *mixers = (Mixer_t *)&mixerSettings.Mixer1Type; // pointer to array of mixers in UAVObjects const Mixer_t *mixers = (Mixer_t *)&mixerSettings.Mixer1Type; // pointer to array of mixers in UAVObjects
const Mixer_t *mixer = &mixers[index]; const Mixer_t *mixer = &mixers[index];
float differential = 1.0f; float differential = 1.0f;

2
flight/modules/Telemetry/telemetry.c
View File

@ -195,7 +195,7 @@ int32_t TelemetryStart(void)
localChannel.rxTaskHandle); localChannel.rxTaskHandle);
} }
#endif /* ifdef HAS_RADIO */ #endif /* ifdef HAS_RADIO */
// Start the telemetry tasks associated with Radio/USB // Start the telemetry tasks associated with Radio/USB
UAVObjIterate(&registerRadioObject); UAVObjIterate(&registerRadioObject);
// Listen to objects of interest // Listen to objects of interest

66
flight/targets/boards/coptercontrol/board_hw_defs.c
View File

@ -1028,39 +1028,39 @@ static const struct pios_dsm_cfg pios_dsm_flexi_cfg = {
#include <pios_srxl_priv.h> #include <pios_srxl_priv.h>
static const struct pios_usart_cfg pios_usart_srxl_flexi_cfg = { static const struct pios_usart_cfg pios_usart_srxl_flexi_cfg = {
.regs = USART3, .regs = USART3,
.init = { .init = {
.USART_BaudRate = 115200, .USART_BaudRate = 115200,
.USART_WordLength = USART_WordLength_8b, .USART_WordLength = USART_WordLength_8b,
.USART_Parity = USART_Parity_No, .USART_Parity = USART_Parity_No,
.USART_StopBits = USART_StopBits_1, .USART_StopBits = USART_StopBits_1,
.USART_HardwareFlowControl = USART_HardwareFlowControl_None, .USART_HardwareFlowControl = USART_HardwareFlowControl_None,
.USART_Mode = USART_Mode_Rx, .USART_Mode = USART_Mode_Rx,
}, },
.irq = { .irq = {
.init = { .init = {
.NVIC_IRQChannel = USART3_IRQn, .NVIC_IRQChannel = USART3_IRQn,
.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_HIGH, .NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_HIGH,
.NVIC_IRQChannelSubPriority = 0, .NVIC_IRQChannelSubPriority = 0,
.NVIC_IRQChannelCmd = ENABLE, .NVIC_IRQChannelCmd = ENABLE,
}, },
}, },
.rx = { .rx = {
.gpio = GPIOB, .gpio = GPIOB,
.init = { .init = {
.GPIO_Pin = GPIO_Pin_11, .GPIO_Pin = GPIO_Pin_11,
.GPIO_Speed = GPIO_Speed_2MHz, .GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_IPU, .GPIO_Mode = GPIO_Mode_IPU,
}, },
}, },
.tx = { .tx = {
.gpio = GPIOB, .gpio = GPIOB,
.init = { .init = {
.GPIO_Pin = GPIO_Pin_10, .GPIO_Pin = GPIO_Pin_10,
.GPIO_Speed = GPIO_Speed_2MHz, .GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_IN_FLOATING, .GPIO_Mode = GPIO_Mode_IN_FLOATING,
}, },
}, },
}; };
#endif /* PIOS_INCLUDE_SRXL */ #endif /* PIOS_INCLUDE_SRXL */

44
ground/gcs/src/plugins/coreplugin/generalsettings.cpp
View File

@ -162,16 +162,16 @@ void GeneralSettings::finish()
void GeneralSettings::readSettings(QSettings *qs) void GeneralSettings::readSettings(QSettings *qs)
{ {
qs->beginGroup(QLatin1String("General")); 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_saveSettingsOnExit = qs->value(QLatin1String("SaveSettingsOnExit"), m_saveSettingsOnExit).toBool();
m_autoConnect = qs->value(QLatin1String("AutoConnect"), m_autoConnect).toBool(); m_autoConnect = qs->value(QLatin1String("AutoConnect"), m_autoConnect).toBool();
m_autoSelect = qs->value(QLatin1String("AutoSelect"), m_autoSelect).toBool(); m_autoSelect = qs->value(QLatin1String("AutoSelect"), m_autoSelect).toBool();
m_useUDPMirror = qs->value(QLatin1String("UDPMirror"), m_useUDPMirror).toBool(); m_useUDPMirror = qs->value(QLatin1String("UDPMirror"), m_useUDPMirror).toBool();
m_useExpertMode = qs->value(QLatin1String("ExpertMode"), m_useExpertMode).toBool(); m_useExpertMode = qs->value(QLatin1String("ExpertMode"), m_useExpertMode).toBool();
// Usage data collection temporarily disabled // Usage data collection temporarily disabled
// m_collectUsageData = qs->value(QLatin1String("CollectUsageData"), m_collectUsageData).toBool(); // m_collectUsageData = qs->value(QLatin1String("CollectUsageData"), m_collectUsageData).toBool();
// m_showUsageDataDisclaimer = qs->value(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer).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(); qs->endGroup();
} }
@ -191,8 +191,8 @@ void GeneralSettings::saveSettings(QSettings *qs)
qs->setValue(QLatin1String("UDPMirror"), m_useUDPMirror); qs->setValue(QLatin1String("UDPMirror"), m_useUDPMirror);
qs->setValue(QLatin1String("ExpertMode"), m_useExpertMode); qs->setValue(QLatin1String("ExpertMode"), m_useExpertMode);
// Usage data collection temporarily disabled // Usage data collection temporarily disabled
//qs->setValue(QLatin1String("CollectUsageData"), m_collectUsageData); // qs->setValue(QLatin1String("CollectUsageData"), m_collectUsageData);
//qs->setValue(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer); // qs->setValue(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer);
qs->setValue(QLatin1String("LastUsageHash"), m_lastUsageHash); qs->setValue(QLatin1String("LastUsageHash"), m_lastUsageHash);
qs->endGroup(); qs->endGroup();
} }
@ -265,17 +265,17 @@ bool GeneralSettings::useUDPMirror() const
} }
/** Usage data collection temporarily disabled /** Usage data collection temporarily disabled
bool GeneralSettings::collectUsageData() const bool GeneralSettings::collectUsageData() const
{ {
return m_collectUsageData; return m_collectUsageData;
} }
bool GeneralSettings::showUsageDataDisclaimer() const bool GeneralSettings::showUsageDataDisclaimer() const
{ {
return m_showUsageDataDisclaimer; return m_showUsageDataDisclaimer;
} }
********************/ ********************/
QString GeneralSettings::lastUsageHash() const QString GeneralSettings::lastUsageHash() const
{ {
return m_lastUsageHash; return m_lastUsageHash;
@ -287,19 +287,19 @@ bool GeneralSettings::useExpertMode() const
} }
/** Usage data collection temporarily disabled /** Usage data collection temporarily disabled
void GeneralSettings::setCollectUsageData(bool collect) void GeneralSettings::setCollectUsageData(bool collect)
{ {
if (collect && collect != m_collectUsageData) { if (collect && collect != m_collectUsageData) {
setShowUsageDataDisclaimer(true); setShowUsageDataDisclaimer(true);
} }
m_collectUsageData = collect; m_collectUsageData = collect;
} }
void GeneralSettings::setShowUsageDataDisclaimer(bool show) void GeneralSettings::setShowUsageDataDisclaimer(bool show)
{ {
m_showUsageDataDisclaimer = show; m_showUsageDataDisclaimer = show;
} }
********************/ ********************/
void GeneralSettings::setLastUsageHash(QString hash) void GeneralSettings::setLastUsageHash(QString hash)
{ {

2
ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp
View File

@ -201,7 +201,7 @@ void ControllerPage::connectionStatusChanged()
SetupWizard::CONTROLLER_TYPE type = getControllerType(); SetupWizard::CONTROLLER_TYPE type = getControllerType();
setControllerType(type); setControllerType(type);
QPixmap boardPic; QPixmap boardPic;
QSize picSize = QSize(250,250); QSize picSize = QSize(250, 250);
switch (type) { switch (type) {
case SetupWizard::CONTROLLER_CC: case SetupWizard::CONTROLLER_CC:

3
ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -1015,7 +1015,8 @@ void VehicleConfigurationHelper::resetVehicleConfig()
MixerSettings *mSettings = MixerSettings::GetInstance(m_uavoManager); MixerSettings *mSettings = MixerSettings::GetInstance(m_uavoManager);
// Reset throttle curves // Reset throttle curves
QString throttlePattern = "ThrottleCurve%1"; QString throttlePattern = "ThrottleCurve%1";
for (int i = 1; i <= 2; i++) { for (int i = 1; i <= 2; i++) {
UAVObjectField *field = mSettings->getField(throttlePattern.arg(i)); UAVObjectField *field = mSettings->getField(throttlePattern.arg(i));
Q_ASSERT(field); Q_ASSERT(field);