X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_pad.c;h=28c00fe33ed51385a9384c08af5328a5d6b6b3b0;hp=e51d237b63c94e12650042e5dc106f29d20d1db4;hb=e3b30d4bd6faf68c885791fb87229558cc1157a6;hpb=26ce7a9a213bdd35a13937054988e7b8fa749632

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index e51d237b..28c00fe3 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -155,14 +156,16 @@ ao_pad_monitor(void)
 		if (pyro > VOLTS_TO_PYRO(10)) {
 			query.arm_status = AO_PAD_ARM_STATUS_ARMED;
 			cur |= AO_LED_ARMED;
-		} else if (pyro < VOLTS_TO_PYRO(5)) {
-			query.arm_status = AO_PAD_ARM_STATUS_DISARMED;
-			arm_beep_time = 0;
-		} else {
+#if AO_FIRE_R_POWER_FET
+		} else if (pyro > VOLTS_TO_PYRO(5)) {
 			if ((ao_time() % 100) < 50)
 				cur |= AO_LED_ARMED;
 			query.arm_status = AO_PAD_ARM_STATUS_UNKNOWN;
 			arm_beep_time = 0;
+#endif
+		} else {
+			query.arm_status = AO_PAD_ARM_STATUS_DISARMED;
+			arm_beep_time = 0;
 		}
 		if ((ao_time() - ao_pad_packet_time) > AO_SEC_TO_TICKS(2))
 			cur |= AO_LED_RED;
@@ -279,8 +282,10 @@ ao_pad_read_box(void)
 	l = byte & 0xf;
 	return h * 10 + l;
 }
-#else
-#define ao_pad_read_box()	0
+#endif
+
+#if HAS_FIXED_PAD_BOX
+#define ao_pad_read_box()	ao_config.pad_box
 #endif
 
 #ifdef PAD_BOX
@@ -311,7 +316,7 @@ ao_pad(void)
 			command.tick, command.box, ao_pad_box, command.cmd, command.channels);
 
 		switch (command.cmd) {
-		case AO_LAUNCH_ARM:
+		case AO_PAD_ARM:
 			if (command.box != ao_pad_box) {
 				PRINTD ("box number mismatch\n");
 				break;
@@ -333,7 +338,7 @@ ao_pad(void)
 			ao_pad_arm_time = ao_time();
 			break;
 
-		case AO_LAUNCH_QUERY:
+		case AO_PAD_QUERY:
 			if (command.box != ao_pad_box) {
 				PRINTD ("box number mismatch\n");
 				break;
@@ -352,11 +357,30 @@ ao_pad(void)
 				query.igniter_status[3]);
 			ao_radio_cmac_send(&query, sizeof (query));
 			break;
-		case AO_LAUNCH_FIRE:
+		case AO_PAD_FIRE:
+			if (!ao_pad_armed) {
+				PRINTD ("not armed\n");
+				break;
+			}
+			if ((uint16_t) (ao_time() - ao_pad_arm_time) > AO_SEC_TO_TICKS(20)) {
+				PRINTD ("late pad arm_time %d time %d\n",
+					ao_pad_arm_time, ao_time());
+				break;
+			}
+			PRINTD ("ignite\n");
+			ao_pad_ignite = ao_pad_armed;
+			ao_pad_arm_time = ao_time();
+			ao_wakeup(&ao_pad_ignite);
+			break;
+		}
+		case AO_PAD_STATIC:
 			if (!ao_pad_armed) {
 				PRINTD ("not armed\n");
 				break;
 			}
+#ifdef HAS_LOG
+			if (!ao_log_running) ao_log_start();
+#endif
 			if ((uint16_t) (ao_time() - ao_pad_arm_time) > AO_SEC_TO_TICKS(20)) {
 				PRINTD ("late pad arm_time %d time %d\n",
 					ao_pad_arm_time, ao_time());
@@ -368,6 +392,12 @@ ao_pad(void)
 			ao_wakeup(&ao_pad_ignite);
 			break;
 		}
+		case AO_PAD_ENDSTATIC:
+#ifdef HAS_LOG
+			ao_log_stop();
+#endif
+			break;
+		}
 	}
 }