projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stm32f1: Get boot loader working
[fw/altos]
/
src
/
teleballoon-v2.0
/
ao_pins.h
diff --git
a/src/teleballoon-v2.0/ao_pins.h
b/src/teleballoon-v2.0/ao_pins.h
index 746bb3ee72c55085ab30c76ef76e5bfb1db0741d..72ed0cebb0829d64ad9a0abc62ef8860bea67dac 100644
(file)
--- a/
src/teleballoon-v2.0/ao_pins.h
+++ b/
src/teleballoon-v2.0/ao_pins.h
@@
-19,7
+19,6
@@
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
-#define HAS_TASK_QUEUE 1
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
@@
-64,6
+63,7
@@
#define AO_CONFIG_MAX_SIZE 1024
#define LOG_ERASE_MARK 0x55
#define LOG_MAX_ERASE 128
#define AO_CONFIG_MAX_SIZE 1024
#define LOG_ERASE_MARK 0x55
#define LOG_MAX_ERASE 128
+#define AO_LOG_FORMAT AO_LOG_FORMAT_TELEMETRUM
#define HAS_EEPROM 1
#define USE_INTERNAL_FLASH 0
#define HAS_EEPROM 1
#define USE_INTERNAL_FLASH 0
@@
-73,6
+73,9
@@
#define HAS_BEEP 1
#define HAS_BATTERY_REPORT 1
#define BEEPER_CHANNEL 4
#define HAS_BEEP 1
#define HAS_BATTERY_REPORT 1
#define BEEPER_CHANNEL 4
+#define BEEPER_TIMER 3
+#define BEEPER_PORT (&stm_gpiob)
+#define BEEPER_PIN 1
#define HAS_RADIO 1
#define HAS_TELEMETRY 1
#define HAS_APRS 1
#define HAS_RADIO 1
#define HAS_TELEMETRY 1
#define HAS_APRS 1
@@
-141,9
+144,6
@@
#define AO_IGNITER_MAIN_PORT (&stm_gpioa)
#define AO_IGNITER_MAIN_PIN 9
#define AO_IGNITER_MAIN_PORT (&stm_gpioa)
#define AO_IGNITER_MAIN_PIN 9
-#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)
-
/*
* ADC
*/
/*
* ADC
*/
@@
-158,7
+158,7
@@
struct ao_adc {
};
#define AO_ADC_DUMP(p) \
};
#define AO_ADC_DUMP(p) \
- printf("tick: %5u drogue: %5d main: %5d batt: %5d\n", \
+ printf("tick: %5
l
u drogue: %5d main: %5d batt: %5d\n", \
(p)->tick, \
(p)->adc.sense_a, (p)->adc.sense_m, \
(p)->adc.v_batt);
(p)->tick, \
(p)->adc.sense_a, (p)->adc.sense_m, \
(p)->adc.v_batt);