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 a1e216265ac33f1b1ec780be7ecec69243a25010..04c467b5da343b92fe2a62f11ec8f142eb4d1427 100755 (executable)
--- 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 9705798a09c8bd25056674cbe93e57009da13c82..7745a8e560abcddf71bddf50fc8281c0db75965d 100755 (executable)
--- 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