From: Keith Packard <keithp@keithp.com>
Date: Fri, 11 Jul 2014 00:13:09 +0000 (-0700)
Subject: altos: Scale DOP values by 10 in GPS drivers
X-Git-Tag: 1.4.9.2~17
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=47e62bb26984f6c84660c1d0451f77c2d6ad7e5a

altos: Scale DOP values by 10 in GPS drivers

sky traq was scaling by 5, ublox was scaling by 100.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/drivers/ao_gps_skytraq.c b/src/drivers/ao_gps_skytraq.c
index 81178051..066df6ff 100644
--- a/src/drivers/ao_gps_skytraq.c
+++ b/src/drivers/ao_gps_skytraq.c
@@ -278,10 +278,10 @@ ao_nmea_gga(void)
 
 	ao_gps_lexchar();
 	i = ao_gps_decimal(0xff);
-	if (i <= 50) {
-		i = (uint8_t) 5 * i;
+	if (i <= 25) {
+		i = (uint8_t) 10 * i;
 		if (ao_gps_char == '.')
-			i = (i + ((uint8_t) ao_gps_decimal(1) >> 1));
+			i = (i + ((uint8_t) ao_gps_decimal(1)));
 	} else
 		i = 255;
 	ao_gps_next.hdop = i;
diff --git a/src/drivers/ao_gps_ublox.c b/src/drivers/ao_gps_ublox.c
index 48765998..74c29e0a 100644
--- a/src/drivers/ao_gps_ublox.c
+++ b/src/drivers/ao_gps_ublox.c
@@ -740,11 +740,11 @@ ao_gps(void) __reentrant
 				ao_gps_data.minute = nav_timeutc.min;
 				ao_gps_data.second = nav_timeutc.sec;
 
-				ao_gps_data.pdop = nav_dop.pdop;
-				ao_gps_data.hdop = nav_dop.hdop;
-				ao_gps_data.vdop = nav_dop.vdop;
-
-				/* mode is not set */
+				/* we report dop scaled by 10, but ublox provides dop scaled by 100
+				 */
+				ao_gps_data.pdop = nav_dop.pdop / 10;
+				ao_gps_data.hdop = nav_dop.hdop / 10;
+				ao_gps_data.vdop = nav_dop.vdop / 10;
 
 				ao_gps_data.ground_speed = nav_velned.g_speed;
 				ao_gps_data.climb_rate = -nav_velned.vel_d;