X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmegametrum-v0.1%2FMakefile;h=b100fafcbb85fbb5e0f1e860f8779dbdd6654c8b;hb=b119e19604aa557a40e848c60d98a67b5f259bbd;hp=e789a0e86ed57195d7d38c38edbb7a391c980283;hpb=f9f65211c378849270a6138fda05ed2a166f7d82;p=fw%2Faltos

diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index e789a0e8..b100fafc 100644
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -9,18 +9,22 @@ INC = \
 	ao.h \
 	ao_arch.h \
 	ao_arch_funcs.h \
+	ao_companion.h \
 	ao_data.h \
 	ao_sample.h \
 	ao_pins.h \
-	altitude.h \
+	altitude-pa.h \
 	ao_kalman.h \
 	ao_product.h \
 	ao_ms5607.h \
 	ao_hmc5883.h \
 	ao_mpu6000.h \
+	ao_mma655x.h \
 	ao_cc1120_CC1120.h \
 	ao_profile.h \
+	ao_task.h \
 	ao_whiten.h \
+	ao_sample_profile.h \
 	stm32l.h
 
 #
@@ -28,6 +32,11 @@ INC = \
 #
 
 #PROFILE=ao_profile.c
+#PROFILE_DEF=-DAO_PROFILE=1
+
+SAMPLE_PROFILE=ao_sample_profile.c \
+	ao_sample_profile_timer.c
+SAMPLE_PROFILE_DEF=-DHAS_SAMPLE_PROFILE=1
 
 #	ao_hmc5883.c
 
@@ -53,7 +62,10 @@ ALTOS_SRC = \
 	ao_cc1120.c \
 	ao_fec_tx.c \
 	ao_fec_rx.c \
+	ao_data.c \
 	ao_ms5607.c \
+	ao_mma655x.c \
+	ao_hmc5883.c \
 	ao_adc_stm.c \
 	ao_beep_stm.c \
 	ao_storage.c \
@@ -66,32 +78,35 @@ ALTOS_SRC = \
 	ao_convert_pa.c \
 	ao_log.c \
 	ao_log_mega.c \
-	ao_sample_mm.c \
+	ao_sample.c \
 	ao_kalman.c \
-	ao_flight_mm.c \
+	ao_flight.c \
 	ao_telemetry.c \
 	ao_packet_slave.c \
 	ao_packet.c \
 	ao_companion.c \
-	$(PROFILE)
+	ao_pyro.c \
+	$(PROFILE) \
+	$(SAMPLE_PROFILE)
 
 PRODUCT=MegaMetrum-v0.1
 PRODUCT_DEF=-DMEGAMETRUM
 IDPRODUCT=0x0023
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -Os -g
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) -Os -g
 
-PROG=megametrum-v0.1-$(VERSION).elf
+PROGNAME=megametrum-v0.1
+PROG=$(PROGNAME)-$(VERSION).elf
 
 SRC=$(ALTOS_SRC) ao_megametrum.c
 OBJ=$(SRC:.c=.o)
 
 all: $(PROG)
 
-$(PROG): Makefile $(OBJ)
+$(PROG): Makefile $(OBJ) altos.ld
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
 
-../altitude.h: make-altitude
+../altitude-pa.h: make-altitude-pa
 	nickle $< > $@
 
 $(OBJ): $(INC)
@@ -102,7 +117,7 @@ ao_product.h: ao-make-product.5c ../Version
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f *.o $(PROGNAME)-*.elf
 	rm -f ao_product.h
 
 install: