diff options
author | Bdale Garbee <bdale@gag.com> | 2015-07-15 16:43:50 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2015-07-15 16:43:50 -0600 |
commit | 643c2fb03833d658320f476ef731bbb06fe3cc31 (patch) | |
tree | 878c9df5dbd9bab9169becea4e06e8bae3529541 /altoslib/AltosGPS.java | |
parent | e41786fb384892961a6547e17812a24314ce9623 (diff) | |
parent | 271f56a41c7e785b0fab7e572325df842d104277 (diff) |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altoslib/AltosGPS.java')
-rw-r--r-- | altoslib/AltosGPS.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java index 2139efb2..6793adf1 100644 --- a/altoslib/AltosGPS.java +++ b/altoslib/AltosGPS.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_6; +package org.altusmetrum.altoslib_7; import java.text.*; import java.util.concurrent.*; @@ -195,10 +195,10 @@ public class AltosGPS implements Cloneable, Serializable { lon = AltosParse.parse_coord(words[i++]); alt = AltosParse.parse_int(words[i++]); if (version > 1 || (i < words.length && !words[i].equals("SAT"))) { - ground_speed = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "m/s(H)")); + ground_speed = AltosParse.parse_double_net(AltosParse.strip_suffix(words[i++], "m/s(H)")); course = AltosParse.parse_int(words[i++]); - climb_rate = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "m/s(V)")); - hdop = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "(hdop)")); + climb_rate = AltosParse.parse_double_net(AltosParse.strip_suffix(words[i++], "m/s(V)")); + hdop = AltosParse.parse_double_net(AltosParse.strip_suffix(words[i++], "(hdop)")); h_error = AltosParse.parse_int(words[i++]); v_error = AltosParse.parse_int(words[i++]); } |