X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmegametrum-v0.1%2FMakefile;h=a5fdcbb28dfbaffc28010b2561c9d07fe08f89a6;hb=868ef0c9c4b208c02a87180b0eede329369bdc77;hp=06b5e2ae37aea6fec0c86718898a2dbea3487f9d;hpb=bd21c050fd8b96b33ab6859c942bf55cf2b91868;p=fw%2Faltos

diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index 06b5e2ae..a5fdcbb2 100644
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -9,25 +9,40 @@ 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 \
-	stm32l.h
+	ao_sample_profile.h \
+	ao_mpu.h \
+	stm32l.h \
+	Makefile
 
 #
 # Common AltOS sources
 #
+#	ao_hmc5883.c
 
 #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
+
+#STACK_GUARD=ao_mpu_stm.c
+#STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
 
 ALTOS_SRC = \
 	ao_interrupt.c \
@@ -51,7 +66,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 \
@@ -60,37 +78,41 @@ ALTOS_SRC = \
 	ao_exti_stm.c \
 	ao_report.c \
 	ao_i2c_stm.c \
-	ao_hmc5883.c \
 	ao_mpu6000.c \
 	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 \
+	ao_aprs.c \
+	$(PROFILE) \
+	$(SAMPLE_PROFILE) \
+	$(STACK_GUARD)
 
 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) $(STACK_GUARD_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)
@@ -101,7 +123,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: