Browse Source

Rover: use new channel output API

master
Andrew Tridgell 11 years ago
parent
commit
c6f9627782
  1. 22
      APMrover2/Steering.pde
  2. 24
      APMrover2/radio.pde

22
APMrover2/Steering.pde

@ -260,27 +260,7 @@ static void set_servos(void) @@ -260,27 +260,7 @@ static void set_servos(void)
// ----------------------------------------
channel_steer->output();
channel_throttle->output();
// Route configurable aux. functions to their respective servos
g.rc_2.output_ch(CH_2);
g.rc_4.output_ch(CH_4);
g.rc_5.output_ch(CH_5);
g.rc_6.output_ch(CH_6);
g.rc_7.output_ch(CH_7);
g.rc_8.output_ch(CH_8);
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4
g.rc_9.output_ch(CH_9);
#endif
#if CONFIG_HAL_BOARD == HAL_BOARD_APM2 || CONFIG_HAL_BOARD == HAL_BOARD_PX4
g.rc_10.output_ch(CH_10);
g.rc_11.output_ch(CH_11);
#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
RC_Channel_aux::output_ch_all();
#endif
}

24
APMrover2/radio.pde

@ -26,23 +26,9 @@ static void init_rc_in() @@ -26,23 +26,9 @@ static void init_rc_in()
static void init_rc_out()
{
for (uint8_t i=0; i<8; i++) {
RC_Channel::rc_channel(i)->enable_out();
RC_Channel::rc_channel(i)->output_trim();
}
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4
servo_write(CH_9, g.rc_9.radio_trim);
#endif
#if CONFIG_HAL_BOARD == HAL_BOARD_APM2 || CONFIG_HAL_BOARD == HAL_BOARD_PX4
servo_write(CH_10, g.rc_10.radio_trim);
servo_write(CH_11, g.rc_11.radio_trim);
#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
RC_Channel::rc_channel(CH_1)->enable_out();
RC_Channel::rc_channel(CH_3)->enable_out();
RC_Channel::output_trim_all();
}
static void read_radio()
@ -54,9 +40,7 @@ static void read_radio() @@ -54,9 +40,7 @@ static void read_radio()
failsafe.last_valid_rc_ms = hal.scheduler->millis();
for (uint8_t i=0; i<8; i++) {
RC_Channel::rc_channel(i)->set_pwm(RC_Channel::rc_channel(i)->read());
}
RC_Channel::set_pwm_all();
control_failsafe(channel_throttle->radio_in);

Loading…
Cancel
Save