projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco-v0: Test display, show batt voltage at boot
[fw/altos]
/
src
/
drivers
/
ao_pad.h
diff --git
a/src/drivers/ao_pad.h
b/src/drivers/ao_pad.h
index 3b0cf1fe27260635e007e08539ff5e6aafef4244..e41152224257db8ef4f74dca5bcbd6d88c48554d 100644
(file)
--- 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
*
* 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
*
* 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_H_
#define AO_PAD_MAX_CHANNELS 8
+#define AO_PAD_MAX_BOXES 100
struct ao_pad_command {
uint16_t tick;
struct ao_pad_command {
uint16_t tick;
@@
-38,19
+40,26
@@
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 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 */
};
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 2
+#define AO_PAD_ARM_TIME AO_SEC_TO_TICKS(3)
+
/* Fire current armed pads for 200ms, no report
*/
#define AO_PAD_FIRE 3
/* Fire current armed pads for 200ms, no report
*/
#define AO_PAD_FIRE 3
-#define AO_PAD_FIRE_TIME AO_MS_TO_TICKS(1000)
+/* Fire current armed pads for 200ms, no report, logging test stand sensors
+ */
+#define AO_PAD_STATIC 4
+#define AO_PAD_ENDSTATIC 5
+
+#define AO_PAD_FIRE_TIME AO_MS_TO_TICKS(200)
#define AO_PAD_ARM_STATUS_DISARMED 0
#define AO_PAD_ARM_STATUS_ARMED 1
#define AO_PAD_ARM_STATUS_DISARMED 0
#define AO_PAD_ARM_STATUS_ARMED 1