X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryConfiguration.java;h=8c922b03fa24b1340870e865ce176ba7be9a12eb;hp=e5d444dd2099beadc728addd9fe0a4180d7b49c6;hb=4231d68bae69d9a7d1f52205002db452cd5f986d;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

diff --git a/altoslib/AltosTelemetryConfiguration.java b/altoslib/AltosTelemetryConfiguration.java
index e5d444dd..8c922b03 100644
--- a/altoslib/AltosTelemetryConfiguration.java
+++ b/altoslib/AltosTelemetryConfiguration.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_6;
 
 
 public class AltosTelemetryConfiguration extends AltosTelemetryStandard {
@@ -25,6 +25,7 @@ public class AltosTelemetryConfiguration extends AltosTelemetryStandard {
 	int	config_minor;
 	int	apogee_delay;
 	int	main_deploy;
+	int	v_batt;
 	int	flight_log_max;
 	String	callsign;
 	String	version;
@@ -36,6 +37,7 @@ public class AltosTelemetryConfiguration extends AltosTelemetryStandard {
 		flight         = uint16(6);
 		config_major   = uint8(8);
 		config_minor   = uint8(9);
+		v_batt	       = uint16(10);
 		apogee_delay   = uint16(10);
 		main_deploy    = uint16(12);
 		flight_log_max = uint16(14);
@@ -47,7 +49,11 @@ public class AltosTelemetryConfiguration extends AltosTelemetryStandard {
 		super.update_state(state);
 		state.set_device_type(device_type);
 		state.set_flight(flight);
-		state.set_config(config_major, config_minor, apogee_delay, main_deploy, flight_log_max);
+		state.set_config(config_major, config_minor, flight_log_max);
+		if (device_type == AltosLib.product_telegps)
+			state.set_battery_voltage(AltosConvert.tele_gps_voltage(v_batt));
+		else
+			state.set_flight_params(apogee_delay, main_deploy);
 
 		state.set_callsign(callsign);
 		state.set_firmware_version(version);