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

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index e0c03c74..3ad239cc 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -27,6 +27,11 @@ static __pdata uint8_t	ao_pad_armed;
 static __pdata uint16_t	ao_pad_arm_time;
 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
 
@@ -35,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
@@ -135,6 +140,12 @@ ao_pad_monitor(void)
 			query.arm_status = AO_PAD_ARM_STATUS_UNKNOWN;
 			arm_beep_time = 0;
 		}
+		if ((ao_time() - ao_pad_packet_time) > AO_SEC_TO_TICKS(2))
+			cur |= AO_LED_RED;
+		else if (ao_radio_cmac_rssi < AO_PAD_RSSI_MINIMUM)
+			cur |= AO_LED_AMBER;
+		else
+			cur |= AO_LED_GREEN;
 
 		for (c = 0; c < AO_PAD_NUM; c++) {
 			int16_t		sense = packet->adc.sense[c];
@@ -146,11 +157,11 @@ ao_pad_monitor(void)
 			 *
 			 *		v_pyro \
 			 *	100k		igniter
-			 *		output /	
+			 *		output /
 			 *	100k           \
 			 *		sense   relay
-			 *	27k            / 
-			 *		gnd ---   
+			 *	27k            /
+			 *		gnd ---
 			 *
 			 *	If the relay is closed, then sense will be 0
 			 *	If no igniter is present, then sense will be v_pyro * 27k/227k = pyro * 127 / 227 ~= pyro/2
@@ -171,9 +182,10 @@ ao_pad_monitor(void)
 			query.igniter_status[c] = status;
 		}
 		if (cur != prev) {
-			PRINTD("change leds from %02x to %02x mask %02x\n",
-			       prev, cur, AO_LED_CONTINUITY_MASK|AO_LED_ARMED);
-			ao_led_set_mask(cur, AO_LED_CONTINUITY_MASK | AO_LED_ARMED);
+			PRINTD("change leds from %02x to %02x\n",
+			       prev, cur);
+			FLUSHD();
+			ao_led_set(cur);
 			prev = cur;
 		}
 
@@ -182,10 +194,7 @@ ao_pad_monitor(void)
 
 		if (ao_pad_armed) {
 			ao_strobe(1);
-			if (sample & 2)
-				ao_siren(1);
-			else
-				ao_siren(0);
+			ao_siren(1);
 			beeping = 1;
 		} else if (query.arm_status == AO_PAD_ARM_STATUS_ARMED && !beeping) {
 			if (arm_beep_time == 0) {
@@ -241,16 +250,16 @@ ao_pad(void)
 
 	ao_pad_box = 0;
 	ao_led_set(0);
-	ao_led_on(AO_LED_POWER);
 	for (;;) {
 		FLUSHD();
 		while (ao_pad_disabled)
 			ao_sleep(&ao_pad_disabled);
 		ret = ao_radio_cmac_recv(&command, sizeof (command), 0);
-		PRINTD ("cmac_recv %d\n", ret);
+		PRINTD ("cmac_recv %d %d\n", ret, ao_radio_cmac_rssi);
 		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",
@@ -357,14 +366,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;
@@ -379,6 +400,26 @@ ao_pad_set_debug(void)
 	if (ao_cmd_status == ao_cmd_success)
 		ao_pad_debug = ao_cmd_lex_i != 0;
 }
+
+
+static void
+ao_pad_alarm_debug(void)
+{
+	uint8_t	which, value;
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	which = ao_cmd_lex_i;
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	value = ao_cmd_lex_i;
+	printf ("Set %s to %d\n", which ? "siren" : "strobe", value);
+	if (which)
+		ao_siren(value);
+	else
+		ao_strobe(value);
+}
 #endif
 
 __code struct ao_cmds ao_pad_cmds[] = {
@@ -386,6 +427,7 @@ __code struct ao_cmds ao_pad_cmds[] = {
 	{ ao_pad_manual,	"i <key> <n>\0Fire igniter. <key> is doit with D&I" },
 #if DEBUG
 	{ ao_pad_set_debug,	"D <0 off, 1 on>\0Debug" },
+	{ ao_pad_alarm_debug,	"S <0 strobe, 1 siren> <0 off, 1 on>\0Set alarm output" },
 #endif
 	{ 0, NULL }
 };