X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fao_gps_test.c;h=543bbcc304b032ab69c6442dbf380ca62d596473;hb=013e9ccfbe76dc46e8c69ea314950bed83d9a39f;hp=d75a12ecbfad77bf5a4f75d65a02a4200fd217f0;hpb=cf44ea354c2d1780cee343132c6058e11e9eefa3;p=fw%2Faltos

diff --git a/src/test/ao_gps_test.c b/src/test/ao_gps_test.c
index d75a12ec..543bbcc3 100644
--- 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_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)
@@ -50,6 +53,9 @@ struct ao_gps_orig {
 	uint16_t		v_error;	/* m */
 };
 
+#define AO_TELEMETRY_LOCATION_ALTITUDE(l) 	((l)->altitude)
+#define AO_TELEMETRY_LOCATION_SET_ALTITUDE(l,a) ((l)->altitude = (a))
+
 #define SIRF_SAT_STATE_ACQUIRED			(1 << 0)
 #define SIRF_SAT_STATE_CARRIER_PHASE_VALID	(1 << 1)
 #define SIRF_SAT_BIT_SYNC_COMPLETE		(1 << 2)
@@ -88,6 +94,7 @@ ao_mutex_put(uint8_t *mutex)
 static int
 ao_gps_fd;
 
+#if 0
 static void
 ao_dbg_char(char c)
 {
@@ -103,6 +110,7 @@ ao_dbg_char(char c)
 	}
 	write(1, line, strlen(line));
 }
+#endif
 
 #define QUEUE_LEN	4096
 
@@ -391,6 +399,7 @@ ao_serial1_putchar(char c)
 
 #define AO_SERIAL_SPEED_4800	0
 #define AO_SERIAL_SPEED_57600	1
+#define AO_SERIAL_SPEED_115200	2
 
 static void
 ao_serial1_set_speed(uint8_t speed)
@@ -407,6 +416,9 @@ ao_serial1_set_speed(uint8_t speed)
 	case AO_SERIAL_SPEED_57600:
 		cfsetspeed(&termios, B57600);
 		break;
+	case AO_SERIAL_SPEED_115200:
+		cfsetspeed(&termios, B115200);
+		break;
 	}
 	tcsetattr(fd, TCSAFLUSH, &termios);
 	tcflush(fd, TCIFLUSH);
@@ -420,13 +432,19 @@ ao_serial1_set_speed(uint8_t speed)
 void
 ao_dump_state(void *wchan)
 {
-	double	lat, lon;
 	int	i;
-	if (wchan == &ao_gps_data)
+
+	if (wchan != &ao_gps_new)
+		return;
+
+	if (ao_gps_new & AO_GPS_NEW_DATA) {
 		ao_gps_print(&ao_gps_data);
-	else
+		putchar('\n');
+	}
+	if (ao_gps_new & AO_GPS_NEW_TRACKING) {
 		ao_gps_tracking_print(&ao_gps_tracking_data);
-	putchar('\n');
+		putchar('\n');
+	}
 	return;
 	printf ("%02d:%02d:%02d",
 		ao_gps_data.hour, ao_gps_data.minute,
@@ -510,4 +528,5 @@ main (int argc, char **argv)
 	}
 	ao_gps_setup();
 	ao_gps();
+	return 0;
 }