altos: Megametrum uses altitude-pa.h, not altitude.h

[fw/altos] / src / megametrum-v0.1 / Makefile

diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index b07d1e1daba501cc2f72758823a0c8df98ea4533..0e0534a5036b5a47c56f29a932c4d1eea9d9196e 100644 (file)
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -8,14 +8,32 @@ 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_whiten.h \
+       stm32l.h
 
 #
 # Common AltOS sources
 #
+
+#PROFILE=ao_profile.c
+#PROFILE_DEF=-DAO_PROFILE=1
+
+#      ao_hmc5883.c
+
 ALTOS_SRC = \
        ao_interrupt.c \
        ao_product.c \
@@ -30,25 +48,58 @@ ALTOS_SRC = \
        ao_mutex.c \
        ao_serial_stm.c \
        ao_gps_skytraq.c \
-       ao_cc1120.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 \
+       $(PROFILE)
 
 PRODUCT=MegaMetrum-v0.1
 PRODUCT_DEF=-DMEGAMETRUM
-IDPRODUCT=0x000a
+IDPRODUCT=0x0023
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -Os -g
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_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)
 
-$(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 +107,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: