X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_pad.h;h=648d3005f000172babbfc594cebb6aeaa5bb86af;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hp=ae4f3db46180584de3ca78ee8fcf575769a2e1c8;hpb=72d44d14aefcb754b871835aec8d265771357212;p=fw%2Faltos

diff --git a/src/drivers/ao_pad.h b/src/drivers/ao_pad.h
index ae4f3db4..648d3005 100644
--- a/src/drivers/ao_pad.h
+++ b/src/drivers/ao_pad.h
@@ -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
@@ -19,6 +20,7 @@
 #define _AO_PAD_H_
 
 #define AO_PAD_MAX_CHANNELS	8
+#define AO_PAD_MAX_BOXES	100
 
 struct ao_pad_command {
 	uint16_t	tick;
@@ -38,19 +40,21 @@ struct ao_pad_query {
 	uint8_t		channels;	/* which chanels are present */
 	uint8_t		armed;		/* which channels are armed */
 	uint8_t		arm_status;	/* status of arming switch */
+	uint8_t		battery;	/* battery voltage in decivolts */
 	uint8_t		igniter_status[AO_PAD_MAX_CHANNELS];	/* status for each igniter */
 };
 
-/* Set current armed pads, report back status
+/* Arm pads for 3 seconds, no report
  */
-  
 #define AO_PAD_ARM		2
 
+#define AO_PAD_ARM_TIME		AO_SEC_TO_TICKS(3)
+
 /* Fire current armed pads for 200ms, no report
  */
 #define AO_PAD_FIRE		3
 
-#define AO_PAD_FIRE_TIME	AO_MS_TO_TICKS(250)
+#define AO_PAD_FIRE_TIME	AO_MS_TO_TICKS(200)
 
 #define AO_PAD_ARM_STATUS_DISARMED	0
 #define AO_PAD_ARM_STATUS_ARMED		1