diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-09 23:28:39 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-09 23:28:39 -0600 | 
| commit | 16405fd3eb6f82ef3a709e3ed30fc48faef7b547 (patch) | |
| tree | c111819b3ba0c9357af41c81b798326b9df7adad /altoslib/AltosTelemetryLegacy.java | |
| parent | 5a2f6ed6210844f7284fbf9f7ecba68c8a14fa52 (diff) | |
| parent | 28bd5057252e61bc5b1a35a00bc1f9fdfde097f7 (diff) | |
Merge branch 'branch-1.5' into debian
Conflicts:
	ChangeLog
	Releasing
	altosui/Instdrv/NSIS/Includes/java.nsh
	altosui/altos-windows.nsi.in
	configure.ac
	doc/Makefile
	doc/altusmetrum.xsl
	micropeak/micropeak-windows.nsi.in
	telegps/telegps-windows.nsi.in
Diffstat (limited to 'altoslib/AltosTelemetryLegacy.java')
| -rw-r--r-- | altoslib/AltosTelemetryLegacy.java | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/altoslib/AltosTelemetryLegacy.java b/altoslib/AltosTelemetryLegacy.java index 3367ece7..72a8bc4a 100644 --- a/altoslib/AltosTelemetryLegacy.java +++ b/altoslib/AltosTelemetryLegacy.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.text.*; @@ -186,6 +186,7 @@ public class AltosTelemetryLegacy extends AltosTelemetry {  	 *	g_v		GPS vertical speed (integer, cm/sec)  	 *	g_s		GPS horizontal speed (integer, cm/sec)  	 *	g_c		GPS course (integer, 0-359) +	 *	g_pd		GPS pdop (integer * 10)  	 *	g_hd		GPS hdop (integer * 10)  	 *	g_vd		GPS vdop (integer * 10)  	 *	g_he		GPS h error (integer) @@ -209,6 +210,7 @@ public class AltosTelemetryLegacy extends AltosTelemetry {  	final static String AO_TELEM_GPS_VERTICAL_SPEED		= "g_v";  	final static String AO_TELEM_GPS_HORIZONTAL_SPEED	= "g_g";  	final static String AO_TELEM_GPS_COURSE			= "g_c"; +	final static String AO_TELEM_GPS_PDOP			= "g_pd";  	final static String AO_TELEM_GPS_HDOP			= "g_hd";  	final static String AO_TELEM_GPS_VDOP			= "g_vd";  	final static String AO_TELEM_GPS_HERROR			= "g_he"; | 
