Browse Source

Rover: fixes for AP_Relay API change

mission-4.1.18
Andrew Tridgell 11 years ago
parent
commit
a595272e38
  1. 6
      APMrover2/commands_logic.pde
  2. 2
      APMrover2/events.pde
  3. 4
      APMrover2/test.pde

6
APMrover2/commands_logic.pde

@ -375,11 +375,11 @@ static void do_set_servo() @@ -375,11 +375,11 @@ static void do_set_servo()
static void do_set_relay()
{
if (next_nonnav_command.p1 == 1) {
relay.on();
relay.on(0);
} else if (next_nonnav_command.p1 == 0) {
relay.off();
relay.off(0);
}else{
relay.toggle();
relay.toggle(0);
}
}

2
APMrover2/events.pde

@ -22,7 +22,7 @@ static void update_events(void) // Used for MAV_CMD_DO_REPEAT_SERVO and MAV_CMD_ @@ -22,7 +22,7 @@ static void update_events(void) // Used for MAV_CMD_DO_REPEAT_SERVO and MAV_CMD_
}
if (event_id == RELAY_TOGGLE) {
relay.toggle();
relay.toggle(0);
}
}
}

4
APMrover2/test.pde

@ -217,14 +217,14 @@ test_relay(uint8_t argc, const Menu::arg *argv) @@ -217,14 +217,14 @@ test_relay(uint8_t argc, const Menu::arg *argv)
while(1){
cliSerial->printf_P(PSTR("Relay on\n"));
relay.on();
relay.on(0);
delay(3000);
if(cliSerial->available() > 0){
return (0);
}
cliSerial->printf_P(PSTR("Relay off\n"));
relay.off();
relay.off(0);
delay(3000);
if(cliSerial->available() > 0){
return (0);

Loading…
Cancel
Save