X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_gps.c;h=c06c635fd9fc3d67bf560671cca0572fbde8e974;hp=4d278832162a444441473bf3559b4b42aa482bc1;hb=08f37056deec25d77062bc411a04033401b033a5;hpb=2deca0c52cd6cfb4baceb59c8a5458344bada338

diff --git a/src/ao_gps.c b/src/ao_gps.c
index 4d278832..c06c635f 100644
--- a/src/ao_gps.c
+++ b/src/ao_gps.c
@@ -22,25 +22,27 @@
 __xdata uint8_t ao_gps_mutex;
 __xdata struct ao_gps_data	ao_gps_data;
 
-static const char ao_gps_set_nmea[] = {
+#undef AO_GPS_4800
 
-	'$', 'P', 'S', 'R', 'F', '1', '0', '0', ',', '0', ',',
-	'9', '6', '0', '0', ',', '8', ',', '1', ',', '0', '*',
-	'0', 'C', '\r','\n',
-};
-
-static const char ao_gps_set_sirf[] = {
-	0xa0, 0xa2, 0x00, 0x09,	/* length 9 bytes */
-	134,			/* Set binary serial port */
-	0, 0, 0x25, 0x80,	/* 9600 baud */
-	8,			/* data bits */
-	1,			/* stop bits */
-	0,			/* parity */
-	0,			/* pad */
-	0x01, 0x34, 0xb0, 0xb3,
-};
+#ifdef AO_GPS_4800
+static const char ao_gps_set_nmea[] = "$PSRF100,0,57600,8,1,0*37\r\n";
+#else
+static const char ao_gps_set_nmea[] = "$PSRF100,0,4800,8,1,0*0F\r\n";
+#endif
 
 const char ao_gps_config[] = {
+	0xa0, 0xa2, 0x00, 0x19,	/* length: 25 bytes */
+	128,			/* Initialize Data Source */
+	0, 0, 0, 0,		/* ECEF X */
+	0, 0, 0, 0,		/* ECEF Y */
+	0, 0, 0, 0,		/* ECEF Z */
+	0, 0, 0, 0,		/* Clock Drift */
+	0, 0, 0, 0,		/* Time of Week */
+	0, 0,			/* Week Number */
+	0,			/* Channels */
+	0xc6,			/* Clear user data, RTC not accurate, Clear history, clear ephemeris */
+	0x01, 0x46, 0xb0, 0xb3,
+
 	0xa0, 0xa2, 0x00, 0x0e,	/* length: 14 bytes */
 	136,			/* mode control */
 	0, 0,			/* reserved */
@@ -240,34 +242,29 @@ ao_sirf_parse_41(void)
 	}
 }
 
-void
+static void
 ao_gps_setup(void) __reentrant
 {
-	uint8_t	i, j, k;
-	for (j = 0; j < 2; j++) {
-#ifdef AO_GPS_TEST
-		ao_serial_set_speed(j);
+	uint8_t	i, k;
+#ifdef AO_GPS_4800
+	ao_serial_set_speed(AO_SERIAL_SPEED_4800);
 #endif
-		for (i = 0; i < 128; i++)
-			ao_serial_putchar(0x55);
-		for (k = 0; k < 4; k++)
-			for (i = 0; i < sizeof (ao_gps_set_nmea); i++)
-				ao_serial_putchar(ao_gps_set_nmea[i]);
-		for (i = 0; i < 128; i++)
-			ao_serial_putchar(0x55);
-		for (k = 0; k < 4; k++)
-			for (i = 0; i < sizeof (ao_gps_set_sirf); i++)
-				ao_serial_putchar(ao_gps_set_sirf[i]);
-	}
+	for (i = 0; i < 64; i++)
+		ao_serial_putchar(0x00);
+	for (k = 0; k < 3; k++)
+		for (i = 0; i < sizeof (ao_gps_set_nmea); i++)
+			ao_serial_putchar(ao_gps_set_nmea[i]);
+#ifdef AO_GPS_4800
+	ao_serial_set_speed(AO_SERIAL_SPEED_57600);
+#endif
+	for (i = 0; i < 64; i++)
+		ao_serial_putchar(0x00);
 }
 
 static const char ao_gps_set_message_rate[] = {
 	0xa0, 0xa2, 0x00, 0x08,
 	166,
 	0,
-#define SET_MESSAGE_RATE_ID	6
-#define SET_MESSAGE_RATE	7
-
 };
 
 void
@@ -302,19 +299,23 @@ static const uint8_t sirf_disable[] = {
 void
 ao_gps(void) __reentrant
 {
-	uint8_t	i;
+	uint8_t	i, k;
 	uint16_t cksum;
 
-	for (i = 0; i < sizeof (ao_gps_config); i++)
-		ao_serial_putchar(ao_gps_config[i]);
-	for (i = 0; i < sizeof (sirf_disable); i++)
-		ao_sirf_set_message_rate(sirf_disable[i], 0);
-	ao_sirf_set_message_rate(41, 1);
+	ao_gps_setup();
+	for (k = 0; k < 5; k++)
+	{
+		for (i = 0; i < sizeof (ao_gps_config); i++)
+			ao_serial_putchar(ao_gps_config[i]);
+		for (i = 0; i < sizeof (sirf_disable); i++)
+			ao_sirf_set_message_rate(sirf_disable[i], 0);
+		ao_sirf_set_message_rate(41, 1);
+	}
 	for (;;) {
 		/* Locate the begining of the next record */
-		while (ao_sirf_byte() != 0xa0)
+		while (ao_sirf_byte() != (uint8_t) 0xa0)
 			;
-		if (ao_sirf_byte() != 0xa2)
+		if (ao_sirf_byte() != (uint8_t) 0xa2)
 			continue;
 
 		/* Length */
@@ -327,7 +328,6 @@ ao_gps(void) __reentrant
 
 		/* message ID */
 		i = data_byte ();							/* 0 */
-		printf ("message %d len %d\n", i, ao_sirf_len);
 
 		switch (i) {
 		case 41:
@@ -345,9 +345,9 @@ ao_gps(void) __reentrant
 		cksum |= ao_sirf_byte();
 		if (ao_sirf_cksum != cksum)
 			continue;
-		if (ao_sirf_byte() != 0xb0)
+		if (ao_sirf_byte() != (uint8_t) 0xb0)
 			continue;
-		if (ao_sirf_byte() != 0xb3)
+		if (ao_sirf_byte() != (uint8_t) 0xb3)
 			continue;
 
 		switch (i) {
@@ -356,7 +356,7 @@ ao_gps(void) __reentrant
 			ao_gps_data.hour = ao_sirf_data.utc_hour;
 			ao_gps_data.minute = ao_sirf_data.utc_minute;
 			ao_gps_data.second = ao_sirf_data.utc_second / 1000;
-			ao_gps_data.flags = (ao_sirf_data.num_sv << AO_GPS_NUM_SAT_SHIFT) & AO_GPS_NUM_SAT_MASK;
+			ao_gps_data.flags = ((ao_sirf_data.num_sv << AO_GPS_NUM_SAT_SHIFT) & AO_GPS_NUM_SAT_MASK) | AO_GPS_RUNNING;
 			if ((ao_sirf_data.nav_type & NAV_TYPE_GPS_FIX_TYPE_MASK) >= NAV_TYPE_4_SV_KF)
 				ao_gps_data.flags |= AO_GPS_VALID;
 			ao_gps_data.latitude = ao_sirf_data.lat;