X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryConfiguration.java;h=f85025778be7c2b6b835f0cd06e21d842bc7bde6;hb=91656c9d1d6175e06d4bed8e448ac6773e172de0;hp=4411a77d44c635d601582b17cf3805f09b5a50d3;hpb=297eb795b24ec31f6599f48bc8c3769557a7ec6f;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryConfiguration.java b/altoslib/AltosTelemetryConfiguration.java
index 4411a77d..f8502577 100644
--- a/altoslib/AltosTelemetryConfiguration.java
+++ b/altoslib/AltosTelemetryConfiguration.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 
 public class AltosTelemetryConfiguration extends AltosTelemetryStandard {
@@ -43,9 +43,15 @@ public class AltosTelemetryConfiguration extends AltosTelemetryStandard {
 		listener.set_device_type(device_type());
 		cal_data.set_flight(flight());
 		cal_data.set_config(config_major(), config_minor(), flight_log_max());
-		if (device_type() == AltosLib.product_telegps)
-			listener.set_battery_voltage(AltosConvert.tele_gps_voltage(v_batt()));
-		else
+		if (device_type() == AltosLib.product_telegps) {
+			int v_batt = v_batt();
+			double batt;
+			if (v_batt > 4095)
+				batt = AltosConvert.tele_gps_1_voltage(v_batt);
+			else
+				batt = AltosConvert.tele_gps_2_voltage(v_batt);
+			listener.set_battery_voltage(batt);
+		} else
 			cal_data.set_flight_params(apogee_delay() / 100.0, main_deploy());
 
 		cal_data.set_callsign(callsign());