X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdrivers%2Fao_gps_skytraq.c;h=050573e877282012acf1776668396f980822bfdf;hb=7f9e76e0d3492dcc8bf4b5b1f07c3c727cfdc0ef;hp=1d457a1fbf60dabb835fd3ed0f216a10e391dc55;hpb=713bd503902526c17a7657c18be947ef8fa6a47a;p=fw%2Faltos

diff --git a/src/drivers/ao_gps_skytraq.c b/src/drivers/ao_gps_skytraq.c
index 1d457a1f..050573e8 100644
--- a/src/drivers/ao_gps_skytraq.c
+++ b/src/drivers/ao_gps_skytraq.c
@@ -19,10 +19,6 @@
 #include "ao.h"
 #endif
 
-#define AO_GPS_LEADER          2
-
-static __code char ao_gps_header[] = "GP";
-
 __xdata uint8_t ao_gps_mutex;
 static __data char ao_gps_char;
 static __data uint8_t ao_gps_cksum;
@@ -50,7 +46,7 @@ static __pdata struct ao_telemetry_satellite	ao_gps_tracking_next;
     (id^a^b^c^d^e^f^g^h^i^j^k^l^m^n), STQ_E
 
 static __code uint8_t ao_gps_config[] = {
-	SKYTRAQ_MSG_8(0x08, 1, 1, 1, 1, 1, 1, 1, 0), /* configure nmea */
+	SKYTRAQ_MSG_8(0x08, 1, 0, 1, 0, 1, 0, 0, 0), /* configure nmea */
 	/* gga interval */
 	/* gsa interval */
 	/* gsv interval */
@@ -285,7 +281,7 @@ ao_nmea_gga(void)
 	if (!ao_gps_error) {
 		ao_mutex_get(&ao_gps_mutex);
 		ao_gps_tick = ao_gps_next_tick;
-		ao_xmemcpy(&ao_gps_data, &ao_gps_next, sizeof (ao_gps_data));
+		ao_xmemcpy(&ao_gps_data, PDATA_TO_XDATA(&ao_gps_next), sizeof (ao_gps_data));
 		ao_mutex_put(&ao_gps_mutex);
 		ao_wakeup(&ao_gps_data);
 	}
@@ -343,8 +339,7 @@ ao_nmea_gsv(void)
 		ao_gps_tracking_next.channels = 0;
 	else if (done) {
 		ao_mutex_get(&ao_gps_mutex);
-		ao_xmemcpy(&ao_gps_tracking_data, &ao_gps_tracking_next,
-		       sizeof(ao_gps_tracking_data));
+		ao_xmemcpy(&ao_gps_tracking_data, PDATA_TO_XDATA(&ao_gps_tracking_next), sizeof(ao_gps_tracking_data));
 		ao_mutex_put(&ao_gps_mutex);
 		ao_wakeup(&ao_gps_tracking_data);
 	}
@@ -419,11 +414,12 @@ ao_gps_nmea_parse(void)
 	ao_gps_cksum = 0;
 	ao_gps_error = 0;
 
-	for (a = 0; a < AO_GPS_LEADER; a++) {
-		ao_gps_lexchar();
-		if (ao_gps_char != ao_gps_header[a])
-			return;
-	}
+	ao_gps_lexchar();
+	if (ao_gps_char != 'G')
+		return;
+	ao_gps_lexchar();
+	if (ao_gps_char != 'P')
+		return;
 
 	ao_gps_lexchar();
 	a = ao_gps_char;
@@ -460,7 +456,6 @@ ao_gps(void) __reentrant
 		if (ao_serial_getchar() == '$') {
 			ao_gps_nmea_parse();
 		}
-
 	}
 }