summaryrefslogtreecommitdiff
path: root/src/telemega-v1.0
diff options
context:
space:
mode:
Diffstat (limited to 'src/telemega-v1.0')
-rw-r--r--src/telemega-v1.0/Makefile20
-rw-r--r--src/telemega-v1.0/ao_pins.h7
-rw-r--r--src/telemega-v1.0/ao_telemega.c4
3 files changed, 7 insertions, 24 deletions
diff --git a/src/telemega-v1.0/Makefile b/src/telemega-v1.0/Makefile
index 4a1b3908..62eda4ad 100644
--- a/src/telemega-v1.0/Makefile
+++ b/src/telemega-v1.0/Makefile
@@ -27,10 +27,8 @@ INC = \
ao_whiten.h \
ao_sample_profile.h \
ao_quaternion.h \
- math.h \
ao_mpu.h \
stm32l.h \
- math.h \
ao_ms5607_convert.c \
Makefile
@@ -49,21 +47,6 @@ INC = \
#STACK_GUARD=ao_mpu_stm.c
#STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
-MATH_SRC=\
- ef_acos.c \
- ef_sqrt.c \
- ef_rem_pio2.c \
- kf_cos.c \
- kf_sin.c \
- kf_rem_pio2.c \
- sf_copysign.c \
- sf_cos.c \
- sf_fabs.c \
- sf_floor.c \
- sf_scalbn.c \
- sf_sin.c \
- ef_log.c
-
ALTOS_SRC = \
ao_boot_chain.c \
ao_interrupt.c \
@@ -72,7 +55,7 @@ ALTOS_SRC = \
ao_cmd.c \
ao_config.c \
ao_task.c \
- ao_led.c \
+ ao_led_stm.c \
ao_stdio.c \
ao_panic.c \
ao_timer.c \
@@ -115,7 +98,6 @@ ALTOS_SRC = \
ao_companion.c \
ao_pyro.c \
ao_aprs.c \
- $(MATH_SRC) \
$(PROFILE) \
$(SAMPLE_PROFILE) \
$(STACK_GUARD)
diff --git a/src/telemega-v1.0/ao_pins.h b/src/telemega-v1.0/ao_pins.h
index d44394f0..a154225e 100644
--- a/src/telemega-v1.0/ao_pins.h
+++ b/src/telemega-v1.0/ao_pins.h
@@ -77,6 +77,10 @@
#define USE_STORAGE_CONFIG 0
#define HAS_USB 1
#define HAS_BEEP 1
+#define BEEPER_TIMER 3
+#define BEEPER_CHANNEL 1
+#define BEEPER_PORT (&stm_gpioc)
+#define BEEPER_PIN 6
#define HAS_BATTERY_REPORT 1
#define HAS_RADIO 1
#define HAS_TELEMETRY 1
@@ -165,9 +169,6 @@
/* 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)
-
/*
* ADC
*/
diff --git a/src/telemega-v1.0/ao_telemega.c b/src/telemega-v1.0/ao_telemega.c
index 2deb852e..328c17ff 100644
--- a/src/telemega-v1.0/ao_telemega.c
+++ b/src/telemega-v1.0/ao_telemega.c
@@ -45,7 +45,7 @@ main(void)
ao_task_init();
ao_serial_init();
- ao_led_init(LEDS_AVAILABLE);
+ ao_led_init();
ao_led_on(LEDS_AVAILABLE);
ao_timer_init();
@@ -85,7 +85,7 @@ main(void)
ao_gps_report_mega_init();
ao_telemetry_init();
ao_radio_init();
- ao_packet_slave_init(FALSE);
+ ao_packet_slave_init(false);
ao_igniter_init();
ao_companion_init();
ao_pyro_init();