Browse Source

Plane: support 14 RC channels on PX4

master
Andrew Tridgell 11 years ago
parent
commit
ff70c87f0b
  1. 2
      ArduPlane/Attitude.pde
  2. 6
      ArduPlane/Parameters.h
  3. 8
      ArduPlane/Parameters.pde
  4. 2
      ArduPlane/radio.pde

2
ArduPlane/Attitude.pde

@ -975,6 +975,8 @@ static void set_servos(void) @@ -975,6 +975,8 @@ static void set_servos(void)
#endif
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4
g.rc_12.output_ch(CH_12);
g.rc_13.output_ch(CH_13);
g.rc_14.output_ch(CH_14);
#endif
}

6
ArduPlane/Parameters.h

@ -218,6 +218,8 @@ public: @@ -218,6 +218,8 @@ public:
k_param_fs_batt_mah,
k_param_short_fs_timeout,
k_param_long_fs_timeout,
k_param_rc_13,
k_param_rc_14,
//
// 200: Feed-forward gains
@ -442,6 +444,8 @@ public: @@ -442,6 +444,8 @@ public:
#endif
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4
RC_Channel_aux rc_12;
RC_Channel_aux rc_13;
RC_Channel_aux rc_14;
#endif
uint8_t _dummy;
@ -465,6 +469,8 @@ public: @@ -465,6 +469,8 @@ public:
#endif
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4
rc_12 (CH_12),
rc_13 (CH_13),
rc_14 (CH_14),
#endif
_dummy(0)
{}

8
ArduPlane/Parameters.pde

@ -863,6 +863,14 @@ const AP_Param::Info var_info[] PROGMEM = { @@ -863,6 +863,14 @@ const AP_Param::Info var_info[] PROGMEM = {
// @Group: RC12_
// @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp
GGROUP(rc_12, "RC12_", RC_Channel_aux),
// @Group: RC13_
// @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp
GGROUP(rc_13, "RC13_", RC_Channel_aux),
// @Group: RC14_
// @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp
GGROUP(rc_14, "RC14_", RC_Channel_aux),
#endif
// @Group: RLL2SRV_

2
ArduPlane/radio.pde

@ -65,6 +65,8 @@ static void init_rc_out() @@ -65,6 +65,8 @@ static void init_rc_out()
#endif
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4
servo_write(CH_12, g.rc_12.radio_trim);
servo_write(CH_13, g.rc_13.radio_trim);
servo_write(CH_14, g.rc_14.radio_trim);
#endif
// setup PX4 to output the min throttle when safety off if arming

Loading…
Cancel
Save