X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fao_gps_test_skytraq.c;h=89cbd7677beebe4e140dc1d26eddfb60ef71852d;hb=224a1e01bacb7db0076129906ed58e1c785e1b14;hp=846daa9443825b02fc322b9ca1d6f9fe5b806d36;hpb=cf44ea354c2d1780cee343132c6058e11e9eefa3;p=fw%2Faltos

diff --git a/src/test/ao_gps_test_skytraq.c b/src/test/ao_gps_test_skytraq.c
index 846daa94..89cbd767 100644
--- a/src/test/ao_gps_test_skytraq.c
+++ b/src/test/ao_gps_test_skytraq.c
@@ -75,6 +75,11 @@ struct ao_gps_tracking_orig {
 #define ao_telemetry_satellite ao_gps_tracking_orig
 #define ao_telemetry_satellite_info ao_gps_sat_orig
 
+extern __xdata struct ao_telemetry_location	ao_gps_data;
+extern __xdata struct ao_telemetry_satellite	ao_gps_tracking_data;
+
+uint8_t ao_gps_mutex;
+
 void
 ao_mutex_get(uint8_t *mutex)
 {
@@ -397,6 +402,7 @@ ao_serial1_putchar(char c)
 #define AO_SERIAL_SPEED_4800	0
 #define AO_SERIAL_SPEED_9600	1
 #define AO_SERIAL_SPEED_57600	2
+#define AO_SERIAL_SPEED_115200	3
 
 static void
 ao_serial1_set_speed(uint8_t speed)
@@ -411,11 +417,14 @@ ao_serial1_set_speed(uint8_t speed)
 		cfsetspeed(&termios, B4800);
 		break;
 	case AO_SERIAL_SPEED_9600:
-		cfsetspeed(&termios, B38400);
+		cfsetspeed(&termios, B9600);
 		break;
 	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);
@@ -423,18 +432,19 @@ ao_serial1_set_speed(uint8_t speed)
 
 #define ao_time() 0
 
+uint8_t	ao_task_minimize_latency;
+
+#define ao_usb_getchar()	0
+
 #include "ao_gps_print.c"
+#include "ao_gps_show.c"
 #include "ao_gps_skytraq.c"
 
 void
 ao_dump_state(void *wchan)
 {
 	if (wchan == &ao_gps_data)
-		ao_gps_print(&ao_gps_data);
-	else
-		ao_gps_tracking_print(&ao_gps_tracking_data);
-	putchar('\n');
-	return;
+		ao_gps_show();
 }
 
 int