From 4ed23dd891e5b09a9550f76bb863d68f08a1b391 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Mon, 24 Oct 2011 00:34:01 +0300 Subject: [PATCH] Output Remapping: renamed PPM_SERVO option to PPM+Servo --- flight/CopterControl/System/pios_board.c | 4 ++-- shared/uavobjectdefinition/hwsettings.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flight/CopterControl/System/pios_board.c b/flight/CopterControl/System/pios_board.c index 89422fa11..eec563c24 100644 --- a/flight/CopterControl/System/pios_board.c +++ b/flight/CopterControl/System/pios_board.c @@ -1333,7 +1333,7 @@ void PIOS_Board_Init(void) { #endif /* PIOS_INCLUDE_PWM */ break; case HWSETTINGS_CC_RCVRPORT_PPM: - case HWSETTINGS_CC_RCVRPORT_PPM_SERVO: + case HWSETTINGS_CC_RCVRPORT_PPMSERVO: #if defined(PIOS_INCLUDE_PPM) { uint32_t pios_ppm_id; @@ -1369,7 +1369,7 @@ void PIOS_Board_Init(void) { case HWSETTINGS_CC_RCVRPORT_PPM: PIOS_Servo_Init(&pios_servo_cfg); break; - case HWSETTINGS_CC_RCVRPORT_PPM_SERVO: + case HWSETTINGS_CC_RCVRPORT_PPMSERVO: case HWSETTINGS_CC_RCVRPORT_SERVO: PIOS_Servo_Init(&pios_servo_rcvr_cfg); break; diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml index 0f5769098..714cc9d4f 100644 --- a/shared/uavobjectdefinition/hwsettings.xml +++ b/shared/uavobjectdefinition/hwsettings.xml @@ -3,7 +3,7 @@ Selection of optional hardware configurations. - +