X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fao_gps_test.c;h=3844a3265452f623d5065f48e31b6061cdabe002;hb=d54156caf856ab5570f050692b333a2c5d991265;hp=93d7a9abc6ee5e3371cf72f33fda50d19dd9ad50;hpb=f6f54d70b768dca1715ddddea64a4df00d82b09e;p=fw%2Faltos

diff --git a/src/test/ao_gps_test.c b/src/test/ao_gps_test.c
index 93d7a9ab..3844a326 100644
--- a/src/test/ao_gps_test.c
+++ b/src/test/ao_gps_test.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include <fcntl.h>
 #define AO_GPS_NUM_SAT_MASK	(0xf << 0)
 #define AO_GPS_NUM_SAT_SHIFT	(0)
@@ -87,6 +88,7 @@ ao_mutex_put(uint8_t *mutex)
 static int
 ao_gps_fd;
 
+#if 0
 static void
 ao_dbg_char(char c)
 {
@@ -102,6 +104,7 @@ ao_dbg_char(char c)
 	}
 	write(1, line, strlen(line));
 }
+#endif
 
 #define QUEUE_LEN	4096
 
@@ -220,6 +223,8 @@ check_sirf_message(char *from, uint8_t *msg, int len)
 		get_u16(h_v_error);
 
 
+		(void) mag_var;
+		(void) id;
 		printf ("Geodetic Navigation Data (41):\n");
 		printf ("\tNav valid %04x\n", nav_valid);
 		printf ("\tNav type %04x\n", nav_type);
@@ -257,6 +262,7 @@ check_sirf_message(char *from, uint8_t *msg, int len)
 		get_u32(gps_tow);
 		get_u8(channels);
 
+		(void) id;
 		printf ("Measured Tracker Data (4):\n");
 		printf ("GPS week: %d\n", gps_week);
 		printf ("GPS time of week: %d\n", gps_tow);
@@ -317,7 +323,7 @@ static uint8_t	sirf_in_message[4096];
 static int	sirf_in_len;
 
 char
-ao_serial_getchar(void)
+ao_serial1_getchar(void)
 {
 	char	c;
 	uint8_t	uc;
@@ -351,7 +357,7 @@ ao_serial_getchar(void)
 
 
 void
-ao_serial_putchar(char c)
+ao_serial1_putchar(char c)
 {
 	int	i;
 	uint8_t	uc = (uint8_t) c;
@@ -368,10 +374,11 @@ ao_serial_putchar(char c)
 		i = write(ao_gps_fd, &c, 1);
 		if (i == 1) {
 			if ((uint8_t) c == 0xb3 || c == '\r') {
-				static const struct timespec delay = {
+/*				static const struct timespec delay = {
 					.tv_sec = 0,
 					.tv_nsec = 100 * 1000 * 1000
 				};
+*/
 				tcdrain(ao_gps_fd);
 //				nanosleep(&delay, NULL);
 			}
@@ -386,9 +393,10 @@ ao_serial_putchar(char c)
 
 #define AO_SERIAL_SPEED_4800	0
 #define AO_SERIAL_SPEED_57600	1
+#define AO_SERIAL_SPEED_115200	2
 
 static void
-ao_serial_set_speed(uint8_t speed)
+ao_serial1_set_speed(uint8_t speed)
 {
 	int	fd = ao_gps_fd;
 	struct termios	termios;
@@ -402,6 +410,9 @@ ao_serial_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);
@@ -415,7 +426,6 @@ ao_serial_set_speed(uint8_t speed)
 void
 ao_dump_state(void *wchan)
 {
-	double	lat, lon;
 	int	i;
 	if (wchan == &ao_gps_data)
 		ao_gps_print(&ao_gps_data);
@@ -505,4 +515,5 @@ main (int argc, char **argv)
 	}
 	ao_gps_setup();
 	ao_gps();
+	return 0;
 }