X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_gps_skytraq.c;h=361c77ce9883a671cd98dd8fa3f5fd6f102927df;hb=7ac8efea5d60b81adccdc1e38ac4c13facfae7c9;hp=b2eef04bfd24521ef884f877ecc2a92089216816;hpb=524665fc221b0d483453c67b7211e282cebc8980;p=fw%2Faltos

diff --git a/src/ao_gps_skytraq.c b/src/ao_gps_skytraq.c
index b2eef04b..361c77ce 100644
--- a/src/ao_gps_skytraq.c
+++ b/src/ao_gps_skytraq.c
@@ -271,7 +271,15 @@ ao_gps(void) __reentrant
 			ao_gps_next.flags |= i;
 
 			ao_gps_lexchar();
-			ao_gps_skip_field();	/* Horizontal dilution */
+			ao_gps_next.hdop = ao_gps_decimal(0xff);
+			if (ao_gps_next.hdop <= 50) {
+				ao_gps_next.hdop = (uint8_t) 5 * ao_gps_next.hdop;
+				if (ao_gps_char == '.')
+					ao_gps_next.hdop = (ao_gps_next.hdop +
+							    ((uint8_t) ao_gps_decimal(1) >> 1));
+			} else
+				ao_gps_next.hdop = 255;
+			ao_gps_skip_field();
 
 			ao_gps_next.altitude = ao_gps_decimal(0xff);
 			ao_gps_skip_field();	/* skip any fractional portion */
@@ -326,10 +334,8 @@ ao_gps(void) __reentrant
 				ao_gps_skip_field();	/* elevation */
 				ao_gps_lexchar();
 				ao_gps_skip_field();	/* azimuth */
-				if (ao_gps_tracking_next.sats[i].c_n_1 = ao_gps_decimal(2))	/* C/N0 */
-					ao_gps_tracking_next.sats[i].state = 0xbf;
-				else
-					ao_gps_tracking_next.sats[i].state = 0;
+				if (!(ao_gps_tracking_next.sats[i].c_n_1 = ao_gps_decimal(2)))	/* C/N0 */
+					ao_gps_tracking_next.sats[i].svid = 0;
 				ao_gps_tracking_next.channels = i + 1;
 			}
 			if (ao_gps_char == '*') {
@@ -404,25 +410,8 @@ ao_gps(void) __reentrant
 
 __xdata struct ao_task ao_gps_task;
 
-static void
-gps_dump(void) __reentrant
-{
-	ao_mutex_get(&ao_gps_mutex);
-	ao_gps_print(&ao_gps_data);
-	putchar('\n');
-	ao_gps_tracking_print(&ao_gps_tracking_data);
-	putchar('\n');
-	ao_mutex_put(&ao_gps_mutex);
-}
-
-__code struct ao_cmds ao_gps_cmds[] = {
-	{ 'g', gps_dump,	"g                                  Display current GPS values" },
-	{ 0, gps_dump, NULL },
-};
-
 void
 ao_gps_init(void)
 {
 	ao_add_task(&ao_gps_task, ao_gps, "gps");
-	ao_cmd_register(&ao_gps_cmds[0]);
 }