From: Bdale Garbee <bdale@gag.com>
Date: Sun, 7 Sep 2014 05:42:47 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.4.9.3~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=f0d2d34f84980ab45ecedae17546f4d71e020c5e;hp=6c812f10761ec4ebf13e29ccef1d6c2c864f1158

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

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