Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: fixes for AP_Relay API change

Browse Source
This commit is contained in:
Andrew Tridgell 2014-01-20 14:54:21 +11:00
parent a595272e38
commit e3804e2846
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/ArduCopter.pde
View File

@ -2205,8 +2205,8 @@ static void tuning(){
break;
case CH6_RELAY:
if (g.rc_6.control_in > 525) relay.on();
if (g.rc_6.control_in < 475) relay.off();
if (g.rc_6.control_in > 525) relay.on(0);
if (g.rc_6.control_in < 475) relay.off(0);
break;
#if FRAME_CONFIG == HELI_FRAME

6
ArduCopter/commands_logic.pde
View File

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

2
ArduCopter/events.pde
View File

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

4
ArduCopter/test.pde
View File

@ -495,14 +495,14 @@ static int8_t 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);