X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_pad.c;h=419ea8d34c58e4b5a5281e80f1aff0b4e883eeff;hb=553c89f8c64398cb1a815b1fa248980cd3f62ef8;hp=3ad239cced3e3c62f07545ba51277982668face2;hpb=e7c25e3ba04b1e9f8e6fa31e2d464fe96a074dad;p=fw%2Faltos

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index 3ad239cc..419ea8d3 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -127,6 +127,8 @@ ao_pad_monitor(void)
 
 #define VOLTS_TO_PYRO(x) ((int16_t) ((x) * 27.0 / 127.0 / 3.3 * 32767.0))
 
+		/* convert ADC value to voltage in tenths, then add .2 for the diode drop */
+		query.battery = (packet->adc.batt + 96) / 192 + 2;
 		cur = 0;
 		if (pyro > VOLTS_TO_PYRO(10)) {
 			query.arm_status = AO_PAD_ARM_STATUS_ARMED;
@@ -286,8 +288,7 @@ ao_pad(void)
 			PRINTD ("armed\n");
 			ao_pad_armed = command.channels;
 			ao_pad_arm_time = ao_time();
-
-			/* fall through ... */
+			break;
 
 		case AO_LAUNCH_QUERY:
 			if (command.box != ao_pad_box) {
@@ -318,13 +319,6 @@ ao_pad(void)
 					ao_pad_arm_time, ao_time());
 				break;
 			}
-			time_difference = command.tick - ao_time();
-			if (time_difference < 0)
-				time_difference = -time_difference;
-			if (time_difference > 10) {
-				PRINTD ("time different too large %d\n", time_difference);
-				break;
-			}
 			PRINTD ("ignite\n");
 			ao_pad_ignite = ao_pad_armed;
 			ao_pad_arm_time = ao_time();