rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

uncrustification

Browse Source
This commit is contained in:
Alessio Morale 2015-09-19 12:07:45 +02:00
parent 08e0a580ed
commit 1b4ad5c2a1
4 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp
View File

@ -193,36 +193,36 @@ void ConfigCustomWidget::registerWidgets(ConfigTaskWidget &parent)
void ConfigCustomWidget::resetActuators(GUIConfigDataUnion *configData) void ConfigCustomWidget::resetActuators(GUIConfigDataUnion *configData)
{ {
configData->custom.Motor1 = 0; configData->custom.Motor1 = 0;
configData->custom.Motor2 = 0; configData->custom.Motor2 = 0;
configData->custom.Motor3 = 0; configData->custom.Motor3 = 0;
configData->custom.Motor4 = 0; configData->custom.Motor4 = 0;
configData->custom.Motor5 = 0; configData->custom.Motor5 = 0;
configData->custom.Motor6 = 0; configData->custom.Motor6 = 0;
configData->custom.Motor7 = 0; configData->custom.Motor7 = 0;
configData->custom.Motor8 = 0; configData->custom.Motor8 = 0;
configData->custom.RevMotor1 = 0; configData->custom.RevMotor1 = 0;
configData->custom.RevMotor2 = 0; configData->custom.RevMotor2 = 0;
configData->custom.RevMotor3 = 0; configData->custom.RevMotor3 = 0;
configData->custom.RevMotor4 = 0; configData->custom.RevMotor4 = 0;
configData->custom.RevMotor5 = 0; configData->custom.RevMotor5 = 0;
configData->custom.RevMotor6 = 0; configData->custom.RevMotor6 = 0;
configData->custom.RevMotor7 = 0; configData->custom.RevMotor7 = 0;
configData->custom.RevMotor8 = 0; configData->custom.RevMotor8 = 0;
configData->custom.Servo1 = 0; configData->custom.Servo1 = 0;
configData->custom.Servo2 = 0; configData->custom.Servo2 = 0;
configData->custom.Servo3 = 0; configData->custom.Servo3 = 0;
configData->custom.Servo4 = 0; configData->custom.Servo4 = 0;
configData->custom.Servo5 = 0; configData->custom.Servo5 = 0;
configData->custom.Servo6 = 0; configData->custom.Servo6 = 0;
configData->custom.Servo7 = 0; configData->custom.Servo7 = 0;
configData->custom.Servo8 = 0; configData->custom.Servo8 = 0;
configData->custom.Accessory0 = 0; configData->custom.Accessory0 = 0;
configData->custom.Accessory1 = 0; configData->custom.Accessory1 = 0;
configData->custom.Accessory2 = 0; configData->custom.Accessory2 = 0;
configData->custom.Accessory3 = 0; configData->custom.Accessory3 = 0;
configData->custom.Accessory4 = 0; configData->custom.Accessory4 = 0;
configData->custom.Accessory5 = 0; configData->custom.Accessory5 = 0;
} }
/** /**

2
ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
View File

@ -892,7 +892,7 @@ void ConfigMultiRotorWidget::setupQuadMotor(int channel, double pitch, double ro
void ConfigMultiRotorWidget::setupRcOutputs(QList<QString> rcOutputList) void ConfigMultiRotorWidget::setupRcOutputs(QList<QString> rcOutputList)
{ {
QList<QComboBox *> rcList; QList<QComboBox *> rcList;
rcList << m_aircraft->rcOutputChannelBox1 << m_aircraft->rcOutputChannelBox2 rcList << m_aircraft->rcOutputChannelBox1 << m_aircraft->rcOutputChannelBox2
<< m_aircraft->rcOutputChannelBox3 << m_aircraft->rcOutputChannelBox4; << m_aircraft->rcOutputChannelBox3 << m_aircraft->rcOutputChannelBox4;
GUIConfigDataUnion configData = getConfigData(); GUIConfigDataUnion configData = getConfigData();

62
ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.h
View File

@ -107,37 +107,37 @@ typedef struct {
} __attribute__((packed)) groundGUISettingsStruct; } __attribute__((packed)) groundGUISettingsStruct;
typedef struct { typedef struct {
uint Motor1 : 4; uint Motor1 : 4;
uint Motor2 : 4; uint Motor2 : 4;
uint Motor3 : 4; uint Motor3 : 4;
uint Motor4 : 4; uint Motor4 : 4;
uint Motor5 : 4; uint Motor5 : 4;
uint Motor6 : 4; uint Motor6 : 4;
uint Motor7 : 4; uint Motor7 : 4;
uint Motor8 : 4; // 32 bits uint Motor8 : 4; // 32 bits
uint Servo1 : 4; uint Servo1 : 4;
uint Servo2 : 4; uint Servo2 : 4;
uint Servo3 : 4; uint Servo3 : 4;
uint Servo4 : 4; uint Servo4 : 4;
uint Servo5 : 4; uint Servo5 : 4;
uint Servo6 : 4; uint Servo6 : 4;
uint Servo7 : 4; uint Servo7 : 4;
uint Servo8 : 4; // 64 bits uint Servo8 : 4; // 64 bits
uint RevMotor1 : 4; uint RevMotor1 : 4;
uint RevMotor2 : 4; uint RevMotor2 : 4;
uint RevMotor3 : 4; uint RevMotor3 : 4;
uint RevMotor4 : 4; uint RevMotor4 : 4;
uint RevMotor5 : 4; uint RevMotor5 : 4;
uint RevMotor6 : 4; uint RevMotor6 : 4;
uint RevMotor7 : 4; uint RevMotor7 : 4;
uint RevMotor8 : 4; // 96 bits uint RevMotor8 : 4; // 96 bits
uint Accessory0 : 4; uint Accessory0 : 4;
uint Accessory1 : 4; uint Accessory1 : 4;
uint Accessory2 : 4; uint Accessory2 : 4;
uint Accessory3 : 4; uint Accessory3 : 4;
uint Accessory4 : 4; uint Accessory4 : 4;
uint Accessory5 : 4; uint Accessory5 : 4;
uint padding : 8; // 128 bits uint padding : 8; // 128 bits
} __attribute__((packed)) customGUISettingsStruct; } __attribute__((packed)) customGUISettingsStruct;

2
ground/gcs/src/plugins/config/configinputwidget.h
View File

@ -62,7 +62,7 @@ public:
~ConfigInputWidget(); ~ConfigInputWidget();
enum wizardSteps { wizardWelcome, wizardChooseMode, wizardChooseType, wizardIdentifySticks, wizardIdentifyCenter, wizardIdentifyLimits, wizardIdentifyInverted, wizardFinish, wizardNone }; enum wizardSteps { wizardWelcome, wizardChooseMode, wizardChooseType, wizardIdentifySticks, wizardIdentifyCenter, wizardIdentifyLimits, wizardIdentifyInverted, wizardFinish, wizardNone };
enum txMode { mode1, mode2, mode3, mode4 }; enum txMode { mode1, mode2, mode3, mode4 };
enum txMovements { moveLeftVerticalStick, moveRightVerticalStick, moveLeftHorizontalStick, moveRightHorizontalStick, moveAccess0, moveAccess1, moveAccess2, moveAccess3,moveFlightMode, centerAll, moveAll, nothing }; enum txMovements { moveLeftVerticalStick, moveRightVerticalStick, moveLeftHorizontalStick, moveRightHorizontalStick, moveAccess0, moveAccess1, moveAccess2, moveAccess3, moveFlightMode, centerAll, moveAll, nothing };
enum txMovementType { vertical, horizontal, jump, mix }; enum txMovementType { vertical, horizontal, jump, mix };
enum txType { acro, heli, ground }; enum txType { acro, heli, ground };
void startInputWizard() void startInputWizard()