Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 01:33:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://code.google.com/p/ardupilot-mega

Browse Source
This commit is contained in:
Jason Short 2011-11-10 10:02:08 -08:00
commit dd96b146b5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/navigation.pde
View File

@ -214,9 +214,9 @@ static void update_crosstrack(void)
} }
} }
static long cross_track_test() static int32_t cross_track_test()
{ {
long temp = target_bearing - original_target_bearing; int32_t temp = target_bearing - original_target_bearing;
temp = wrap_180(temp); temp = wrap_180(temp);
return abs(temp); return abs(temp);
} }

3
Tools/autotest/arducopter.py
View File

@ -64,6 +64,9 @@ def get_bearing(loc1, loc2):
def current_location(mav): def current_location(mav):
'''return current location''' '''return current location'''
# ensure we have a position
mav.recv_match(type='VFR_HUD', blocking=True)
mav.recv_match(type='GPS_RAW', blocking=True)
return location(mav.messages['GPS_RAW'].lat, return location(mav.messages['GPS_RAW'].lat,
mav.messages['GPS_RAW'].lon, mav.messages['GPS_RAW'].lon,
mav.messages['VFR_HUD'].alt) mav.messages['VFR_HUD'].alt)

2
Tools/autotest/autotest.py
View File

@ -42,7 +42,7 @@ def dump_logs(atype):
mavproxy.expect("Log]") mavproxy.expect("Log]")
for i in range(numlogs): for i in range(numlogs):
mavproxy.send("dump %u\n" % (i+1)) mavproxy.send("dump %u\n" % (i+1))
mavproxy.expect("logs enabled:") mavproxy.expect("logs enabled:", timeout=120)
mavproxy.expect("Log]") mavproxy.expect("Log]")
util.pexpect_close(mavproxy) util.pexpect_close(mavproxy)
util.pexpect_close(sil) util.pexpect_close(sil)

3
libraries/Desktop/support/main.cpp
View File

@ -51,9 +51,6 @@ int main(int argc, char * const argv[])
} }
signal(SIGALRM, sig_alarm); signal(SIGALRM, sig_alarm);
if (!desktop_state.slider) {
alarm(5);
}
// run main setup() function from sketch // run main setup() function from sketch
setup(); setup();