altos: Extend GPS altitudes to at least 24 bits everywhere

[fw/altos] / altoslib / AltosEepromGPS.java

diff --git a/altoslib/AltosEepromGPS.java b/altoslib/AltosEepromGPS.java
index 3c1852c0350258a1ce34830ea28895ed26e9ee53..46a2173de6063c08211789598df215241c1178f2 100644 (file)
--- a/altoslib/AltosEepromGPS.java
+++ b/altoslib/AltosEepromGPS.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
@@ -118,8 +118,21 @@ public class AltosEepromGPS extends AltosEeprom {
                        gps.ground_speed = ground_speed() * 1.0e-2;
                        gps.course = course() * 2;
                        gps.climb_rate = climb_rate() * 1.0e-2;
-                       gps.hdop = hdop();
-                       gps.vdop = vdop();
+                       if (state.compare_version("1.4.9") >= 0) {
+                               gps.pdop = pdop() / 10.0;
+                               gps.hdop = hdop() / 10.0;
+                               gps.vdop = vdop() / 10.0;
+                       } else {
+                               gps.pdop = pdop() / 100.0;
+                               if (gps.pdop < 0.8)
+                                       gps.pdop += 2.56;
+                               gps.hdop = hdop() / 100.0;
+                               if (gps.hdop < 0.8)
+                                       gps.hdop += 2.56;
+                               gps.vdop = vdop() / 100.0;
+                               if (gps.vdop < 0.8)
+                                       gps.vdop += 2.56;
+                       }
                        break;
                }
        }