projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
telemini-v3.0
/
ao_pins.h
diff --git
a/src/telemini-v3.0/ao_pins.h
b/src/telemini-v3.0/ao_pins.h
index 17cff2aeb0e53497316fcc34e718888f9484d791..d91b1d21fcf8d04374fc4efe3029b3a72f134c20 100644
(file)
--- a/
src/telemini-v3.0/ao_pins.h
+++ b/
src/telemini-v3.0/ao_pins.h
@@
-74,9
+74,9
@@
#define AO_RECOVERY_VALUE 0
#define AO_RECOVERY_MODE AO_EXTI_MODE_PULL_UP
#define AO_RECOVERY_VALUE 0
#define AO_RECOVERY_MODE AO_EXTI_MODE_PULL_UP
-/* Beeper is on Tim
1 CH3
*/
+/* Beeper is on Tim
3 CH4
*/
#define BEEPER_CHANNEL 4
#define BEEPER_CHANNEL 4
-#define BEEPER_TIMER
2
+#define BEEPER_TIMER
3
#define BEEPER_PORT (&stm_gpioa)
#define BEEPER_PIN 3
#define BEEPER_PORT (&stm_gpioa)
#define BEEPER_PIN 3
@@
-165,11
+165,9
@@
struct ao_adc {
#define AO_IGNITER_DROGUE_PORT (&stm_gpiob)
#define AO_IGNITER_DROGUE_PIN 7
#define AO_IGNITER_DROGUE_PORT (&stm_gpiob)
#define AO_IGNITER_DROGUE_PIN 7
-#define AO_IGNITER_SET_DROGUE(v) ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)
#define AO_IGNITER_MAIN_PORT (&stm_gpiob)
#define AO_IGNITER_MAIN_PIN 6
#define AO_IGNITER_MAIN_PORT (&stm_gpiob)
#define AO_IGNITER_MAIN_PIN 6
-#define AO_IGNITER_SET_MAIN(v) ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)
#define AO_SENSE_DROGUE(p) ((p)->adc.sense_a)
#define AO_SENSE_MAIN(p) ((p)->adc.sense_m)
#define AO_SENSE_DROGUE(p) ((p)->adc.sense_a)
#define AO_SENSE_MAIN(p) ((p)->adc.sense_m)