X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_pad.c;h=419ea8d34c58e4b5a5281e80f1aff0b4e883eeff;hb=2839796ca5ace5f0c79643afc1a868893246b621;hp=144cbd70a8834e4053e67c6bebec423e68ae8175;hpb=8124af8c27b2b9e446aa3a4f1da83d4db7c1ea87;p=fw%2Faltos

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index 144cbd70..419ea8d3 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -29,6 +29,10 @@ static __pdata uint8_t	ao_pad_box;
 static __xdata uint8_t	ao_pad_disabled;
 static __pdata uint16_t	ao_pad_packet_time;
 
+#ifndef AO_PAD_RSSI_MINIMUM
+#define AO_PAD_RSSI_MINIMUM	-90
+#endif
+
 #define DEBUG	1
 
 #if DEBUG
@@ -36,8 +40,8 @@ static __pdata uint8_t	ao_pad_debug;
 #define PRINTD(...) (ao_pad_debug ? (printf(__VA_ARGS__), 0) : 0)
 #define FLUSHD()    (ao_pad_debug ? (flush(), 0) : 0)
 #else
-#define PRINTD(...) 
-#define FLUSHD()    
+#define PRINTD(...)
+#define FLUSHD()
 #endif
 
 static void
@@ -123,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;
@@ -138,7 +144,7 @@ ao_pad_monitor(void)
 		}
 		if ((ao_time() - ao_pad_packet_time) > AO_SEC_TO_TICKS(2))
 			cur |= AO_LED_RED;
-		else if (ao_radio_cmac_rssi < -90)
+		else if (ao_radio_cmac_rssi < AO_PAD_RSSI_MINIMUM)
 			cur |= AO_LED_AMBER;
 		else
 			cur |= AO_LED_GREEN;
@@ -255,7 +261,7 @@ ao_pad(void)
 		if (ret != AO_RADIO_CMAC_OK)
 			continue;
 		ao_pad_packet_time = ao_time();
-		
+
 		ao_pad_box = ao_pad_read_box();
 
 		PRINTD ("tick %d box %d (me %d) cmd %d channels %02x\n",
@@ -282,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) {
@@ -314,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();
@@ -362,14 +360,26 @@ ao_pad_test(void)
 void
 ao_pad_manual(void)
 {
+	uint8_t	ignite;
+	int	repeat;
 	ao_cmd_white();
 	if (!ao_match_word("DoIt"))
 		return;
 	ao_cmd_decimal();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	ao_pad_ignite = 1 << ao_cmd_lex_i;
-	ao_wakeup(&ao_pad_ignite);
+	ignite = 1 << ao_cmd_lex_i;
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success) {
+		repeat = 1;
+		ao_cmd_status = ao_cmd_success;
+	} else
+		repeat = ao_cmd_lex_i;
+	while (repeat-- > 0) {
+		ao_pad_ignite = ignite;
+		ao_wakeup(&ao_pad_ignite);
+		ao_delay(AO_PAD_FIRE_TIME>>1);
+	}
 }
 
 static __xdata struct ao_task ao_pad_task;