altos: Fix GPS test frameworks to handle shared ao_gps_new variable

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/drivers/ao_gps_ublox.c b/src/drivers/ao_gps_ublox.c
index 3582d6e0a0fdaa457f5d652f926faa73f9f57c58..4fb907462c43691807e355a21549b63a6dd1658b 100644 (file)
--- a/src/drivers/ao_gps_ublox.c
+++ b/src/drivers/ao_gps_ublox.c
@@ -21,7 +21,7 @@
 
 #include "ao_gps_ublox.h"
 
 
 #include "ao_gps_ublox.h"
 

-#define AO_UBLOX_DEBUG 1
+#define AO_UBLOX_DEBUG 0

 
 #include <stdarg.h>
 
 
 #include <stdarg.h>
 

diff --git a/src/test/ao_gps_test.c b/src/test/ao_gps_test.c
index b6cc9ba73614c31698a0c797d8a582ca0d8a9f1d..e799ab0fc8f0a70e612c72bcbbe6c8c724842a31 100644 (file)
--- a/src/test/ao_gps_test.c
+++ b/src/test/ao_gps_test.c
@@ -26,6 +26,9 @@
 #define AO_GPS_NUM_SAT_MASK    (0xf << 0)
 #define AO_GPS_NUM_SAT_SHIFT   (0)
 
 #define AO_GPS_NUM_SAT_MASK    (0xf << 0)
 #define AO_GPS_NUM_SAT_SHIFT   (0)
 

+#define AO_GPS_NEW_DATA                1
+#define AO_GPS_NEW_TRACKING    2
+

 #define AO_GPS_VALID           (1 << 4)
 #define AO_GPS_RUNNING         (1 << 5)
 #define AO_GPS_DATE_VALID      (1 << 6)
 #define AO_GPS_VALID           (1 << 4)
 #define AO_GPS_RUNNING         (1 << 5)
 #define AO_GPS_DATE_VALID      (1 << 6)

diff --git a/src/test/ao_gps_test_skytraq.c b/src/test/ao_gps_test_skytraq.c
index bf2ab5b83274fbf645a47305282a63c0bd78e3b8..1b590d5e972a5fff6bce45cf37f069c7f9a492ad 100644 (file)
--- a/src/test/ao_gps_test_skytraq.c
+++ b/src/test/ao_gps_test_skytraq.c
@@ -26,6 +26,9 @@
 #define AO_GPS_NUM_SAT_MASK    (0xf << 0)
 #define AO_GPS_NUM_SAT_SHIFT   (0)
 
 #define AO_GPS_NUM_SAT_MASK    (0xf << 0)
 #define AO_GPS_NUM_SAT_SHIFT   (0)
 

+#define AO_GPS_NEW_DATA                1
+#define AO_GPS_NEW_TRACKING    2
+

 #define AO_GPS_VALID           (1 << 4)
 #define AO_GPS_RUNNING         (1 << 5)
 #define AO_GPS_DATE_VALID      (1 << 6)
 #define AO_GPS_VALID           (1 << 4)
 #define AO_GPS_RUNNING         (1 << 5)
 #define AO_GPS_DATE_VALID      (1 << 6)

diff --git a/src/test/ao_gps_test_ublox.c b/src/test/ao_gps_test_ublox.c
index 31c7af60159867f1274d2f07b0b9c0bf3675921a..4eb4b837d6db7951b947041720f2cba742c62a7f 100644 (file)
--- a/src/test/ao_gps_test_ublox.c
+++ b/src/test/ao_gps_test_ublox.c
@@ -26,6 +26,9 @@
 #define AO_GPS_NUM_SAT_MASK    (0xf << 0)
 #define AO_GPS_NUM_SAT_SHIFT   (0)
 
 #define AO_GPS_NUM_SAT_MASK    (0xf << 0)
 #define AO_GPS_NUM_SAT_SHIFT   (0)
 

+#define AO_GPS_NEW_DATA                1
+#define AO_GPS_NEW_TRACKING    2
+

 #define AO_GPS_VALID           (1 << 4)
 #define AO_GPS_RUNNING         (1 << 5)
 #define AO_GPS_DATE_VALID      (1 << 6)
 #define AO_GPS_VALID           (1 << 4)
 #define AO_GPS_RUNNING         (1 << 5)
 #define AO_GPS_DATE_VALID      (1 << 6)