From: Bdale Garbee <bdale@gag.com>
Date: Sat, 6 Sep 2014 19:41:36 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.4.9.3~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=8c212cd5bfa03f71a31d84bd0051314e77d88461;hp=dd26ec2e706bdd29090759deeb90090a0e3b74f0

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	ao-bringup/turnon_telemega
---

diff --git a/ao-bringup/test-gps b/ao-bringup/test-gps
index a1e21626..04c467b5 100755
--- a/ao-bringup/test-gps
+++ b/ao-bringup/test-gps
@@ -70,6 +70,7 @@ do_gps(file f) {
 	string[*] sats = find_gps(i, "Sats:");
 
 	int actual_flags = string_to_integer(flags[1]);
+	int actual_sats = string_to_integer(sats[1]);
 
 	while ((actual_flags & (1 << 4)) == 0) {
 		printf("Flags: %s\n", flags[1]);
diff --git a/ao-bringup/turnon_telemega b/ao-bringup/turnon_telemega
index 9705798a..7745a8e5 100755
--- a/ao-bringup/turnon_telemega
+++ b/ao-bringup/turnon_telemega
@@ -55,3 +55,5 @@ echo 'E 0' > $dev
 SERIAL=$SERIAL ./cal-freq $dev
 
 ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+
+echo 'E 1' > $dev