Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://code.google.com/p/ardupilot-mega

This commit is contained in:
Michael Oborne 2012-08-07 19:27:16 +08:00
parent 4b27564833 ff32fed176
commit abd937a590
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduCopter/ArduCopter.pde
View File

@ -1327,7 +1327,7 @@ static void slow_loop()
read_control_switch(); read_control_switch();
#if MOUNT == ENABLED #if MOUNT == ENABLED
update_aux_servo_function(&g.rc_camera_roll, &g.rc_camera_pitch, &g.rc_camera_yaw); update_aux_servo_function(&g.rc_9, &g.rc_10, &g.rc_11);
#endif #endif
enable_aux_servos(); enable_aux_servos();

25
ArduCopter/Parameters.h
View File

@ -139,8 +139,8 @@ public:
k_param_rc_6, k_param_rc_6,
k_param_rc_7, k_param_rc_7,
k_param_rc_8, k_param_rc_8,
k_param_rc_camera_pitch, k_param_rc_9,
k_param_rc_camera_roll, k_param_rc_10,
k_param_throttle_min, k_param_throttle_min,
k_param_throttle_max, k_param_throttle_max,
k_param_throttle_fs_enabled, k_param_throttle_fs_enabled,
@ -152,7 +152,7 @@ public:
k_param_radio_tuning_high, k_param_radio_tuning_high,
k_param_radio_tuning_low, k_param_radio_tuning_low,
k_param_rc_speed = 192, k_param_rc_speed = 192,
k_param_rc_camera_yaw = 193, k_param_rc_11 = 193,
// //
// 200: flight modes // 200: flight modes
@ -301,9 +301,9 @@ public:
RC_Channel rc_8; RC_Channel rc_8;
#if MOUNT == ENABLED #if MOUNT == ENABLED
RC_Channel_aux rc_camera_roll; RC_Channel_aux rc_9;
RC_Channel_aux rc_camera_pitch; RC_Channel_aux rc_10;
RC_Channel_aux rc_camera_yaw; RC_Channel_aux rc_11;
#endif #endif
AP_Int16 rc_speed; // speed of fast RC Channels in Hz AP_Int16 rc_speed; // speed of fast RC Channels in Hz
@ -399,6 +399,13 @@ public:
ch7_option (CH7_OPTION), ch7_option (CH7_OPTION),
auto_slew_rate (AUTO_SLEW_RATE), auto_slew_rate (AUTO_SLEW_RATE),
#if FRAME_CONFIG == HELI_FRAME
heli_servo_1 (CH_1),
heli_servo_2 (CH_2),
heli_servo_3 (CH_3),
heli_servo_4 (CH_4),
#endif
rc_1 (CH_1), rc_1 (CH_1),
rc_2 (CH_2), rc_2 (CH_2),
rc_3 (CH_3), rc_3 (CH_3),
@ -408,9 +415,9 @@ public:
rc_7 (CH_7), rc_7 (CH_7),
rc_8 (CH_8), rc_8 (CH_8),
#if MOUNT == ENABLED #if MOUNT == ENABLED
rc_camera_roll (CH_9), rc_9 (CH_9),
rc_camera_pitch (CH_10), rc_10 (CH_10),
rc_camera_yaw (CH_11), rc_11 (CH_11),
#endif #endif
rc_speed(RC_FAST_SPEED), rc_speed(RC_FAST_SPEED),

12
ArduCopter/Parameters.pde
View File

@ -236,17 +236,17 @@ static const AP_Param::Info var_info[] PROGMEM = {
GGROUP(rc_8, "RC8_", RC_Channel), GGROUP(rc_8, "RC8_", RC_Channel),
#if MOUNT == ENABLED #if MOUNT == ENABLED
// @Group: CAM_R_ // @Group: RC9_
// @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp // @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp
GGROUP(rc_camera_roll, "CAM_R_", RC_Channel_aux), GGROUP(rc_9, "RC9_", RC_Channel_aux),
// @Group: CAM_P_ // @Group: RC10_
// @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp // @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp
GGROUP(rc_camera_pitch, "CAM_P_", RC_Channel_aux), GGROUP(rc_10, "RC10_", RC_Channel_aux),
// @Group: CAM_Y_ // @Group: RC11_
// @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp // @Path: ../libraries/RC_Channel/RC_Channel_aux.cpp
GGROUP(rc_camera_yaw, "CAM_Y_", RC_Channel_aux), GGROUP(rc_11, "RC11_", RC_Channel_aux),
#endif #endif
// @Param: RC_SPEED // @Param: RC_SPEED

2
ArduCopter/radio.pde
View File

@ -56,7 +56,7 @@ static void init_rc_in()
g.rc_8.set_range(0,1000); g.rc_8.set_range(0,1000);
#if MOUNT == ENABLED #if MOUNT == ENABLED
update_aux_servo_function(&g.rc_camera_roll, &g.rc_camera_pitch, &g.rc_camera_yaw); update_aux_servo_function(&g.rc_9, &g.rc_10, &g.rc_11);
#endif #endif
} }