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

bootcfg: Add support for selecting S.Bus receivers in inputtype

Browse Source
This commit is contained in:
Stacey Sheldon 2011-07-06 22:38:23 -04:00
parent d9aac892a9
commit a8787ee015
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1063,12 +1063,10 @@ void PIOS_Board_Init(void) {
}
#endif /* PIOS_INCLUDE_SPEKTRUM */
break;
#if THIS_IS_NOT_YET_A_VALID_INPUT_MODE
case MANUALCONTROLSETTINGS_INPUTMODE_SBUS:
#if defined(PIOS_INCLUDE_SBUS)
if (hwsettings_cc_mainport == HWSETTINGS_CC_MAINPORT_SBUS ||
hwsettings_cc_flexiport == HWSETTINGS_CC_FLEXIPORT_SBUS) {
for (uint8_t i = 0; i < PIOS_SBUS_NUM_INPUTS; i++) {
if (hwsettings_cc_mainport == HWSETTINGS_CC_MAINPORT_SBUS) {
for (uint8_t i = 0; i < SBUS_NUMBER_OF_CHANNELS && i < pios_rcvr_max_channel; i++) {
if (!PIOS_RCVR_Init(&pios_rcvr_channel_to_id_map[pios_rcvr_max_channel],
&pios_sbus_rcvr_driver,
i)) {
@ -1080,7 +1078,6 @@ void PIOS_Board_Init(void) {
}
#endif /* PIOS_INCLUDE_SBUS */
break;
#endif /* THIS_IS_NOT_YET_A_VALID_INPUT_MODE */
}
/* Remap AFIO pin */

2
shared/uavobjectdefinition/manualcontrolsettings.xml
View File

@ -1,7 +1,7 @@
<xml>
<object name="ManualControlSettings" singleinstance="true" settings="true">
<description>Settings to indicate how to decode receiver input by @ref ManualControlModule.</description>
<field name="InputMode" units="" type="enum" elements="1" options="PWM,PPM,Spektrum" defaultvalue="PWM"/>
<field name="InputMode" units="" type="enum" elements="1" options="PWM,PPM,Spektrum,S.Bus" defaultvalue="PWM"/>
<field name="Roll" units="channel" type="enum" elements="1" options="Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,Channel8,None" defaultvalue="None"/>
<field name="Pitch" units="channel" type="enum" elements="1" options="Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,Channel8,None" defaultvalue="None"/>
<field name="Yaw" units="channel" type="enum" elements="1" options="Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,Channel8,None" defaultvalue="None"/>