From a8787ee0158e21164f124d21fcc45d7b051d2afc Mon Sep 17 00:00:00 2001 From: Stacey Sheldon Date: Wed, 6 Jul 2011 22:38:23 -0400 Subject: [PATCH] bootcfg: Add support for selecting S.Bus receivers in inputtype --- flight/CopterControl/System/pios_board.c | 7 ++----- shared/uavobjectdefinition/manualcontrolsettings.xml | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/flight/CopterControl/System/pios_board.c b/flight/CopterControl/System/pios_board.c index cec30ae93..ceaf044bc 100644 --- a/flight/CopterControl/System/pios_board.c +++ b/flight/CopterControl/System/pios_board.c @@ -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 */ diff --git a/shared/uavobjectdefinition/manualcontrolsettings.xml b/shared/uavobjectdefinition/manualcontrolsettings.xml index 95423a3f5..d806f806f 100644 --- a/shared/uavobjectdefinition/manualcontrolsettings.xml +++ b/shared/uavobjectdefinition/manualcontrolsettings.xml @@ -1,7 +1,7 @@ Settings to indicate how to decode receiver input by @ref ManualControlModule. - +