Browse Source

Rover: fixed RC input

master
Andrew Tridgell 12 years ago
parent
commit
509e801e21
  1. 12
      APMrover2/radio.pde
  2. 4
      APMrover2/test.pde

12
APMrover2/radio.pde

@ -68,12 +68,12 @@ static void read_radio() @@ -68,12 +68,12 @@ static void read_radio()
g.channel_roll.set_pwm(hal.rcin->read(CH_ROLL));
g.channel_pitch.set_pwm(hal.rcin->read(CH_PITCH));
g.channel_throttle.set_pwm(hal.rcout->read(CH_3));
g.channel_rudder.set_pwm(hal.rcout->read(CH_4));
g.rc_5.set_pwm(hal.rcout->read(CH_5));
g.rc_6.set_pwm(hal.rcout->read(CH_6));
g.rc_7.set_pwm(hal.rcout->read(CH_7));
g.rc_8.set_pwm(hal.rcout->read(CH_8));
g.channel_throttle.set_pwm(hal.rcin->read(CH_3));
g.channel_rudder.set_pwm(hal.rcin->read(CH_4));
g.rc_5.set_pwm(hal.rcin->read(CH_5));
g.rc_6.set_pwm(hal.rcin->read(CH_6));
g.rc_7.set_pwm(hal.rcin->read(CH_7));
g.rc_8.set_pwm(hal.rcin->read(CH_8));
control_failsafe(g.channel_throttle.radio_in);

4
APMrover2/test.pde

@ -119,9 +119,9 @@ test_passthru(uint8_t argc, const Menu::arg *argv) @@ -119,9 +119,9 @@ test_passthru(uint8_t argc, const Menu::arg *argv)
if (hal.rcin->valid() > 0) {
cliSerial->print("CH:");
for(int i = 0; i < 8; i++){
cliSerial->print(hal.rcout->read(i)); // Print channel values
cliSerial->print(hal.rcin->read(i)); // Print channel values
cliSerial->print(",");
hal.rcout->write(i, hal.rcout->read(i)); // Copy input to Servos
hal.rcout->write(i, hal.rcin->read(i)); // Copy input to Servos
}
cliSerial->println();
}

Loading…
Cancel
Save