projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/megametrum: Support the four additional pyro channels
[fw/altos]
/
src
/
megametrum-v0.1
/
ao_pins.h
diff --git
a/src/megametrum-v0.1/ao_pins.h
b/src/megametrum-v0.1/ao_pins.h
index dc3761ba3f16506d2138e1c12b120652c58fb210..2c438f6c9f53dba8f82a6ce4244fbdb49c370b42 100644
(file)
--- a/
src/megametrum-v0.1/ao_pins.h
+++ b/
src/megametrum-v0.1/ao_pins.h
@@
-120,29
+120,26
@@
#define AO_IGNITER_CLOSED 400
#define AO_IGNITER_OPEN 60
#define AO_IGNITER_CLOSED 400
#define AO_IGNITER_OPEN 60
-#define AO_IGNITER_
PORT_A
(&stm_gpiod)
-#define AO_IGNITER_
PIN_A
6
+#define AO_IGNITER_
DROGUE_PORT
(&stm_gpiod)
+#define AO_IGNITER_
DROGUE_PIN
6
-#define AO_IGNITER_
PORT_B
(&stm_gpiod)
-#define AO_IGNITER_
PIN_B
7
+#define AO_IGNITER_
MAIN_PORT
(&stm_gpiod)
+#define AO_IGNITER_
MAIN_PIN
7
-#define AO_
IGNITER_PORT_C
(&stm_gpiob)
-#define AO_
IGNITER_PIN_C
5
+#define AO_
PYRO_PORT_0
(&stm_gpiob)
+#define AO_
PYRO_PIN_0
5
-#define AO_
IGNITER_PORT_D
(&stm_gpioe)
-#define AO_
IGNITER_PIN_D
4
+#define AO_
PYRO_PORT_1
(&stm_gpioe)
+#define AO_
PYRO_PIN_1
4
-#define AO_
IGNITER_PORT_E
(&stm_gpioe)
-#define AO_
IGNITER_PIN_E
6
+#define AO_
PYRO_PORT_2
(&stm_gpioe)
+#define AO_
PYRO_PIN_2
6
-#define AO_
IGNITER_PORT_F
(&stm_gpioe)
-#define AO_
IGNITER_PIN_F
5
+#define AO_
PYRO_PORT_3
(&stm_gpioe)
+#define AO_
PYRO_PIN_3
5
-#define AO_IGNITER_DROGUE_PORT AO_IGNITER_PORT_A
-#define AO_IGNITER_DROGUE_PIN AO_IGNITER_PIN_A
-
-#define AO_IGNITER_MAIN_PORT AO_IGNITER_PORT_B
-#define AO_IGNITER_MAIN_PIN AO_IGNITER_PIN_B
+/* Number of general purpose pyro channels available */
+#define AO_PYRO_NUM 4
#define AO_IGNITER_SET_DROGUE(v) stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
#define AO_IGNITER_SET_MAIN(v) stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
#define AO_IGNITER_SET_DROGUE(v) stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
#define AO_IGNITER_SET_MAIN(v) stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
@@
-326,6
+323,8
@@
struct ao_adc {
* Profiling Viterbi decoding
*/
* Profiling Viterbi decoding
*/
+#ifndef AO_PROFILE
#define AO_PROFILE 0
#define AO_PROFILE 0
+#endif
#endif /* _AO_PINS_H_ */
#endif /* _AO_PINS_H_ */