X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmegametrum-v0.1%2FMakefile;h=a5fdcbb28dfbaffc28010b2561c9d07fe08f89a6;hb=59f355f5288b42b2e47743d06e41e55819a55f64;hp=4f5e9244c9e004d46226425379fde44a09cfb3de;hpb=0bda768c2be5b81bec13f21d4d3bb6a11a8e88fa;p=fw%2Faltos

diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index 4f5e9244..a5fdcbb2 100644
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -8,19 +8,48 @@ include ../stm/Makefile.defs
 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_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 \
+	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 \
 	ao_product.c \
 	ao_romconfig.c \
 	ao_cmd.c \
+	ao_config.c \
 	ao_task.c \
 	ao_led.c \
 	ao_stdio.c \
@@ -28,27 +57,62 @@ ALTOS_SRC = \
 	ao_timer.c \
 	ao_mutex.c \
 	ao_serial_stm.c \
-	ao_gps_skytraq.c
+	ao_gps_skytraq.c \
+	ao_gps_report_mega.c \
+	ao_ignite.c \
+	ao_freq.c \
+	ao_dma_stm.c \
+	ao_spi_stm.c \
+	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 \
+	ao_m25.c \
+	ao_usb_stm.c \
+	ao_exti_stm.c \
+	ao_report.c \
+	ao_i2c_stm.c \
+	ao_mpu6000.c \
+	ao_convert_pa.c \
+	ao_log.c \
+	ao_log_mega.c \
+	ao_sample.c \
+	ao_kalman.c \
+	ao_flight.c \
+	ao_telemetry.c \
+	ao_packet_slave.c \
+	ao_packet.c \
+	ao_companion.c \
+	ao_pyro.c \
+	ao_aprs.c \
+	$(PROFILE) \
+	$(SAMPLE_PROFILE) \
+	$(STACK_GUARD)
 
 PRODUCT=MegaMetrum-v0.1
 PRODUCT_DEF=-DMEGAMETRUM
-IDPRODUCT=0x000a
+IDPRODUCT=0x0023
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS)
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g
 
-PROG=megametrum-v0.1
+PROGNAME=megametrum-v0.1
+PROG=$(PROGNAME)-$(VERSION).elf
 
 SRC=$(ALTOS_SRC) ao_megametrum.c
 OBJ=$(SRC:.c=.o)
 
 all: $(PROG)
 
-LDFLAGS=-L../stm -Wl,-Taltos.ld
-
-$(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)
@@ -56,13 +120,10 @@ $(OBJ): $(INC)
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
-ao_product.rel: ao_product.c ao_product.h
-	$(call quiet,CC) -c $(CFLAGS) -D PRODUCT_DEFS='\"ao_product.h\"' -o$@ $<
-
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f *.o $(PROGNAME)-*.elf
 	rm -f ao_product.h
 
 install: