From: Keith Packard <keithp@keithp.com>
Date: Sun, 8 Jun 2014 04:57:43 +0000 (-0700)
Subject: altos: Encode TeleGPS battery voltage in configuration packet
X-Git-Tag: 1.3.2.4~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ef85b3bc5300904ebfb878b1c7313a82b5b7aebf

altos: Encode TeleGPS battery voltage in configuration packet

TeleGPS doesn't need apogee delay, so re-purpose it for the battery voltage

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/kernel/ao_telemetry.c b/src/kernel/ao_telemetry.c
index 2292d229..dcda0dd7 100644
--- a/src/kernel/ao_telemetry.c
+++ b/src/kernel/ao_telemetry.c
@@ -305,8 +305,14 @@ ao_send_configuration(void)
 #endif
 		telemetry.configuration.config_major = AO_CONFIG_MAJOR;
 		telemetry.configuration.config_minor = AO_CONFIG_MINOR;
+#if AO_idProduct_NUMBER == 0x25 && HAS_ADC
+		/* TeleGPS gets battery voltage instead of apogee delay */
+		telemetry.configuration.apogee_delay = ao_data_ring[ao_data_ring_prev(ao_data_head)].adc.v_batt;
+#else
 		telemetry.configuration.apogee_delay = ao_config.apogee_delay;
 		telemetry.configuration.main_deploy = ao_config.main_deploy;
+#endif
+
 		telemetry.configuration.flight_log_max = ao_config.flight_log_max >> 10;
 		ao_xmemcpy (telemetry.configuration.callsign,
 			    ao_config.callsign,