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

Added the new Multirotor shapes to the SystemSettings object, as discussed on the forums. UID has not changed, but you should recompile still (sorry).

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1972 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2010-10-17 14:15:47 +00:00 committed by edouard
parent ef83d7a8ec
commit 82b702e239
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/OpenPilot/UAVObjects/inc/systemsettings.h
View File

@ -78,7 +78,7 @@ typedef struct {
// Field information // Field information
// Field AirframeType information // Field AirframeType information
/* Enumeration options for field AirframeType */ /* Enumeration options for field AirframeType */
typedef enum { SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWING=0, SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWINGELEVON=1, SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWINGVTAIL=2, SYSTEMSETTINGS_AIRFRAMETYPE_VTOL=3, SYSTEMSETTINGS_AIRFRAMETYPE_HELICP=4, SYSTEMSETTINGS_AIRFRAMETYPE_QUADX=5, SYSTEMSETTINGS_AIRFRAMETYPE_QUADP=6, SYSTEMSETTINGS_AIRFRAMETYPE_HEXA=7, SYSTEMSETTINGS_AIRFRAMETYPE_OCTO=8, SYSTEMSETTINGS_AIRFRAMETYPE_CUSTOM=9 } SystemSettingsAirframeTypeOptions; typedef enum { SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWING=0, SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWINGELEVON=1, SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWINGVTAIL=2, SYSTEMSETTINGS_AIRFRAMETYPE_VTOL=3, SYSTEMSETTINGS_AIRFRAMETYPE_HELICP=4, SYSTEMSETTINGS_AIRFRAMETYPE_QUADX=5, SYSTEMSETTINGS_AIRFRAMETYPE_QUADP=6, SYSTEMSETTINGS_AIRFRAMETYPE_HEXA=7, SYSTEMSETTINGS_AIRFRAMETYPE_OCTO=8, SYSTEMSETTINGS_AIRFRAMETYPE_CUSTOM=9, SYSTEMSETTINGS_AIRFRAMETYPE_HEXAX=10, SYSTEMSETTINGS_AIRFRAMETYPE_OCTOV=11, SYSTEMSETTINGS_AIRFRAMETYPE_OCTOCOAXP=12, SYSTEMSETTINGS_AIRFRAMETYPE_OCTOCOAXX=13, SYSTEMSETTINGS_AIRFRAMETYPE_HEXACOAX=14, SYSTEMSETTINGS_AIRFRAMETYPE_TRI=15 } SystemSettingsAirframeTypeOptions;
// Generic interface functions // Generic interface functions

6
ground/src/plugins/uavobjects/systemsettings.cpp
View File

@ -55,6 +55,12 @@ SystemSettings::SystemSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
AirframeTypeEnumOptions.append("Hexa"); AirframeTypeEnumOptions.append("Hexa");
AirframeTypeEnumOptions.append("Octo"); AirframeTypeEnumOptions.append("Octo");
AirframeTypeEnumOptions.append("Custom"); AirframeTypeEnumOptions.append("Custom");
AirframeTypeEnumOptions.append("HexaX");
AirframeTypeEnumOptions.append("OctoV");
AirframeTypeEnumOptions.append("OctoCoaxP");
AirframeTypeEnumOptions.append("OctoCoaxX");
AirframeTypeEnumOptions.append("HexaCoax");
AirframeTypeEnumOptions.append("Tri");
fields.append( new UAVObjectField(QString("AirframeType"), QString(""), UAVObjectField::ENUM, AirframeTypeElemNames, AirframeTypeEnumOptions) ); fields.append( new UAVObjectField(QString("AirframeType"), QString(""), UAVObjectField::ENUM, AirframeTypeElemNames, AirframeTypeEnumOptions) );
// Initialize object // Initialize object

2
ground/src/plugins/uavobjects/systemsettings.h
View File

@ -50,7 +50,7 @@ public:
// Field information // Field information
// Field AirframeType information // Field AirframeType information
/* Enumeration options for field AirframeType */ /* Enumeration options for field AirframeType */
typedef enum { AIRFRAMETYPE_FIXEDWING=0, AIRFRAMETYPE_FIXEDWINGELEVON=1, AIRFRAMETYPE_FIXEDWINGVTAIL=2, AIRFRAMETYPE_VTOL=3, AIRFRAMETYPE_HELICP=4, AIRFRAMETYPE_QUADX=5, AIRFRAMETYPE_QUADP=6, AIRFRAMETYPE_HEXA=7, AIRFRAMETYPE_OCTO=8, AIRFRAMETYPE_CUSTOM=9 } AirframeTypeOptions; typedef enum { AIRFRAMETYPE_FIXEDWING=0, AIRFRAMETYPE_FIXEDWINGELEVON=1, AIRFRAMETYPE_FIXEDWINGVTAIL=2, AIRFRAMETYPE_VTOL=3, AIRFRAMETYPE_HELICP=4, AIRFRAMETYPE_QUADX=5, AIRFRAMETYPE_QUADP=6, AIRFRAMETYPE_HEXA=7, AIRFRAMETYPE_OCTO=8, AIRFRAMETYPE_CUSTOM=9, AIRFRAMETYPE_HEXAX=10, AIRFRAMETYPE_OCTOV=11, AIRFRAMETYPE_OCTOCOAXP=12, AIRFRAMETYPE_OCTOCOAXX=13, AIRFRAMETYPE_HEXACOAX=14, AIRFRAMETYPE_TRI=15 } AirframeTypeOptions;
// Constants // Constants

6
ground/src/plugins/uavobjects/systemsettings.py
View File

@ -55,6 +55,12 @@ _fields = [ \
'7' : 'Hexa', '7' : 'Hexa',
'8' : 'Octo', '8' : 'Octo',
'9' : 'Custom', '9' : 'Custom',
'10' : 'HexaX',
'11' : 'OctoV',
'12' : 'OctoCoaxP',
'13' : 'OctoCoaxX',
'14' : 'HexaCoax',
'15' : 'Tri',
} }
), ),
] ]

2
ground/src/shared/uavobjectdefinition/systemsettings.xml
View File

@ -1,7 +1,7 @@
<xml> <xml>
<object name="SystemSettings" singleinstance="true" settings="true"> <object name="SystemSettings" singleinstance="true" settings="true">
<description>Select airframe type. Currently used by @ref ActuatorModule to choose mixing from @ref ActuatorDesired to @ref ActuatorCommand</description> <description>Select airframe type. Currently used by @ref ActuatorModule to choose mixing from @ref ActuatorDesired to @ref ActuatorCommand</description>
<field name="AirframeType" units="" type="enum" elements="1" options="FixedWing,FixedWingElevon,FixedWingVtail,VTOL,HeliCP,QuadX,QuadP,Hexa,Octo,Custom" defaultvalue="FixedWing"/> <field name="AirframeType" units="" type="enum" elements="1" options="FixedWing,FixedWingElevon,FixedWingVtail,VTOL,HeliCP,QuadX,QuadP,Hexa,Octo,Custom,HexaX,OctoV,OctoCoaxP,OctoCoaxX,HexaCoax,Tri" defaultvalue="FixedWing"/>
<access gcs="readwrite" flight="readwrite"/> <access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="true" updatemode="onchange" period="0"/> <telemetrygcs acked="true" updatemode="onchange" period="0"/>
<telemetryflight acked="true" updatemode="onchange" period="0"/> <telemetryflight acked="true" updatemode="onchange" period="0"/>