From a595272e38e1e0fc4b7d5cba2ab1436178995112 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 20 Jan 2014 14:54:08 +1100
Subject: [PATCH] Rover: fixes for AP_Relay API change
---
APMrover2/commands_logic.pde | 6 +++---
APMrover2/events.pde | 2 +-
APMrover2/test.pde | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/APMrover2/commands_logic.pde b/APMrover2/commands_logic.pde
index 541de62fb..7eae5e67a 100644
--- a/APMrover2/commands_logic.pde
+++ b/APMrover2/commands_logic.pde
@@ -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);
}
}
diff --git a/APMrover2/events.pde b/APMrover2/events.pde
index 4b0819590..da008c2cb 100644
--- a/APMrover2/events.pde
+++ b/APMrover2/events.pde
@@ -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);
}
}
}
diff --git a/APMrover2/test.pde b/APMrover2/test.pde
index 1ed84bf56..61a5d0bb7 100644
--- a/APMrover2/test.pde
+++ b/APMrover2/test.pde
@@ -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);
--
GitLab