From 10287e3e2966a4ef84fdbb757ec112ae25e5c05c Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Sun, 11 Dec 2011 22:52:51 +0200 Subject: [PATCH] CC: rename ReceiverPort PPM+Servo (Servo) options to PPM+Outputs (Outputs) --- flight/CopterControl/System/pios_board.c | 6 +++--- shared/uavobjectdefinition/hwsettings.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flight/CopterControl/System/pios_board.c b/flight/CopterControl/System/pios_board.c index e80d4e51a..d89342787 100644 --- a/flight/CopterControl/System/pios_board.c +++ b/flight/CopterControl/System/pios_board.c @@ -1365,7 +1365,7 @@ void PIOS_Board_Init(void) { #endif /* PIOS_INCLUDE_PWM */ break; case HWSETTINGS_CC_RCVRPORT_PPM: - case HWSETTINGS_CC_RCVRPORT_PPMSERVO: + case HWSETTINGS_CC_RCVRPORT_PPMOUTPUTS: #if defined(PIOS_INCLUDE_PPM) { uint32_t pios_ppm_id; @@ -1401,8 +1401,8 @@ void PIOS_Board_Init(void) { case HWSETTINGS_CC_RCVRPORT_PPM: PIOS_Servo_Init(&pios_servo_cfg); break; - case HWSETTINGS_CC_RCVRPORT_PPMSERVO: - case HWSETTINGS_CC_RCVRPORT_SERVO: + case HWSETTINGS_CC_RCVRPORT_PPMOUTPUTS: + case HWSETTINGS_CC_RCVRPORT_OUTPUTS: PIOS_Servo_Init(&pios_servo_rcvr_cfg); break; } diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml index 63e346fc5..9ec859fa3 100644 --- a/shared/uavobjectdefinition/hwsettings.xml +++ b/shared/uavobjectdefinition/hwsettings.xml @@ -1,7 +1,7 @@ Selection of optional hardware configurations. - +