rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Merge branch 'next' into revolution_sensors

Browse Source 
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
This commit is contained in:
James Cotton 2011-12-13 20:50:10 -06:00
commit 9f50391fc5
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flight/CopterControl/System/pios_board.c
View File

@ -1365,7 +1365,7 @@ void PIOS_Board_Init(void) {
#endif /* PIOS_INCLUDE_PWM */ #endif /* PIOS_INCLUDE_PWM */
break; break;
case HWSETTINGS_CC_RCVRPORT_PPM: case HWSETTINGS_CC_RCVRPORT_PPM:
case HWSETTINGS_CC_RCVRPORT_PPMSERVO: case HWSETTINGS_CC_RCVRPORT_PPMOUTPUTS:
#if defined(PIOS_INCLUDE_PPM) #if defined(PIOS_INCLUDE_PPM)
{ {
uint32_t pios_ppm_id; uint32_t pios_ppm_id;
@ -1401,8 +1401,8 @@ void PIOS_Board_Init(void) {
case HWSETTINGS_CC_RCVRPORT_PPM: case HWSETTINGS_CC_RCVRPORT_PPM:
PIOS_Servo_Init(&pios_servo_cfg); PIOS_Servo_Init(&pios_servo_cfg);
break; break;
case HWSETTINGS_CC_RCVRPORT_PPMSERVO: case HWSETTINGS_CC_RCVRPORT_PPMOUTPUTS:
case HWSETTINGS_CC_RCVRPORT_SERVO: case HWSETTINGS_CC_RCVRPORT_OUTPUTS:
PIOS_Servo_Init(&pios_servo_rcvr_cfg); PIOS_Servo_Init(&pios_servo_rcvr_cfg);
break; break;
} }

51
ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
View File

@ -989,13 +989,36 @@
</default> </default>
</ImportExportGadget> </ImportExportGadget>
<LineardialGadget> <LineardialGadget>
<AHRS__PCT__20CPU>
<configInfo>
<locked>false</locked>
<version>0.0.0</version>
</configInfo>
<data>
<dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>0</decimalPlaces>
<factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
<greenMax>50</greenMax>
<greenMin>0</greenMin>
<maxValue>100</maxValue>
<minValue>0</minValue>
<redMax>100</redMax>
<redMin>80</redMin>
<sourceDataObject>AhrsStatus</sourceDataObject>
<sourceObjectField>CPULoad</sourceObjectField>
<useOpenGLFlag>false</useOpenGLFlag>
<yellowMax>80</yellowMax>
<yellowMin>50</yellowMin>
</data>
</AHRS__PCT__20CPU>
<Accel__PCT__20Horizontal__PCT__20X> <Accel__PCT__20Horizontal__PCT__20X>
<configInfo> <configInfo>
<locked>false</locked> <locked>false</locked>
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,8,-1,5,50,0,0,0,0,0</font> <font>Andale Mono,8,-1,5,50,0,0,0,0,0</font>
@ -1018,7 +1041,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,6,-1,5,50,0,0,0,0,0</font> <font>Andale Mono,6,-1,5,50,0,0,0,0,0</font>
@ -1041,7 +1064,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,8,-1,5,50,0,0,0,0,0</font> <font>Andale Mono,8,-1,5,50,0,0,0,0,0</font>
@ -1179,7 +1202,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>0</decimalPlaces> <decimalPlaces>0</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1202,7 +1225,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1225,7 +1248,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1248,7 +1271,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1271,7 +1294,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1294,7 +1317,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1317,7 +1340,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
<decimalPlaces>0</decimalPlaces> <decimalPlaces>0</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1340,7 +1363,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
<decimalPlaces>0</decimalPlaces> <decimalPlaces>0</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1363,7 +1386,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1386,7 +1409,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@ -1409,7 +1432,7 @@
<version>0.0.0</version> <version>0.0.0</version>
</configInfo> </configInfo>
<data> <data>
<dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile> <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
<decimalPlaces>2</decimalPlaces> <decimalPlaces>2</decimalPlaces>
<factor>1</factor> <factor>1</factor>
<font>Andale Mono,12,-1,5,75,0,0,0,0,0</font> <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>

2
shared/uavobjectdefinition/hwsettings.xml
View File

@ -1,7 +1,7 @@
<xml> <xml>
<object name="HwSettings" singleinstance="true" settings="true"> <object name="HwSettings" singleinstance="true" settings="true">
<description>Selection of optional hardware configurations.</description> <description>Selection of optional hardware configurations.</description>
<field name="CC_RcvrPort" units="function" type="enum" elements="1" options="Disabled,PWM,PPM,PPM+Servo,Servo" defaultvalue="PWM"/> <field name="CC_RcvrPort" units="function" type="enum" elements="1" options="Disabled,PWM,PPM,PPM+Outputs,Outputs" defaultvalue="PWM"/>
<field name="CC_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,S.Bus,DSM2,DSMX (10bit),DSMX (11bit),ComAux" defaultvalue="Disabled"/> <field name="CC_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,S.Bus,DSM2,DSMX (10bit),DSMX (11bit),ComAux" defaultvalue="Disabled"/>
<field name="CC_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,DSM2,DSMX (10bit),DSMX (11bit),ComAux" defaultvalue="Disabled"/> <field name="CC_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,DSM2,DSMX (10bit),DSMX (11bit),ComAux" defaultvalue="Disabled"/>