diff options
| author | Keith Packard <keithp@keithp.com> | 2018-10-20 17:22:59 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2018-10-20 17:31:57 -0700 |
| commit | f13e294d4644096b0529383c1d60d5e4b7916d76 (patch) | |
| tree | 171ae787d71d92cf01e4d7d2a7559b37a3d01ce3 /altoslib/AltosTelemetryConfiguration.java | |
| parent | c01514fa1e0a2cea3955c71a833b4a21b3d33f24 (diff) | |
altoslib: Add support for TeleGPS v2
The battery voltage ADC values are different from TeleGPS v1 (max 4095
instead of 32767).
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosTelemetryConfiguration.java')
| -rw-r--r-- | altoslib/AltosTelemetryConfiguration.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/altoslib/AltosTelemetryConfiguration.java b/altoslib/AltosTelemetryConfiguration.java index 4411a77d..22fd8568 100644 --- 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()); |