altoslib: Add support for TeleGPS v2

[fw/altos] / altoslib / AltosTelemetryConfiguration.java

diff --git a/altoslib/AltosTelemetryConfiguration.java b/altoslib/AltosTelemetryConfiguration.java
index 4411a77d44c635d601582b17cf3805f09b5a50d3..22fd8568cab896f9cf42bfa1268901ba68bf6fe6 100644 (file)
--- a/altoslib/AltosTelemetryConfiguration.java
+++ b/altoslib/AltosTelemetryConfiguration.java
@@ -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());