X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FMakefile.proto;h=d4a8c4ea173a0681bd8c698091455e3c80b34c5e;hb=504ab7ab355652d5d01094c927089029596a0753;hp=30cd57981ae7a79504d26698f903c30d2c27605c;hpb=02611efea0c485d78fad08c696c1f56e868d36b8;p=fw%2Faltos

diff --git a/src/Makefile.proto b/src/Makefile.proto
index 30cd5798..d4a8c4ea 100644
--- a/src/Makefile.proto
+++ b/src/Makefile.proto
@@ -5,6 +5,11 @@
 vpath %.c ..
 vpath %.h ..
 vpath make-altitude ..
+vpath make-kalman ..
+vpath kalman.5c ../kalman
+vpath kalman_filter.5c ../kalman
+vpath load_csv.5c ../kalman
+vpath matrix.5c ../kalman
 vpath ao-make-product.5c ..
 
 CC=sdcc
@@ -13,9 +18,11 @@ ifndef VERSION
 include ../Version
 endif
 
-CFLAGS=--model-small --debug --opt-code-speed
+CFLAGS=--model-small --debug --opt-code-speed -DCODESIZE=$(CODESIZE)
 
-LDFLAGS=--out-fmt-ihx --code-loc 0x0000 --code-size 0x8000 \
+CODESIZE ?= 0x8000
+
+LDFLAGS=--out-fmt-ihx --code-loc 0x0000 --code-size $(CODESIZE) \
 	--xram-loc 0xf000 --xram-size 0xda2 --iram-size 0xff
 
 INC = \
@@ -23,6 +30,7 @@ INC = \
 	ao_pins.h \
 	cc1111.h \
 	altitude.h \
+	ao_kalman.h \
 	25lc1024.h
 
 #
@@ -54,9 +62,7 @@ USB_DRIVER_SRC = \
 	ao_usb.c
 
 TELE_COMMON_SRC = \
-	ao_packet.c \
-	ao_packet_slave.c \
-	ao_state.c
+	ao_packet.c
 
 #
 # Receiver code
@@ -65,6 +71,7 @@ TELE_RECEIVER_SRC =\
 	ao_monitor.c \
 	ao_gps_print.c \
 	ao_packet_master.c \
+	ao_state.c \
 	ao_rssi.c
 
 #
@@ -99,6 +106,7 @@ TM_DRIVER_SRC = \
 	ao_adc.c \
 	ao_gps_report.c \
 	ao_ignite.c \
+	ao_packet_slave.c \
 	$(BEEP_DRIVER_SRC) \
 	$(USB_DRIVER_SRC)
 
@@ -128,18 +136,29 @@ M25_DRIVER_SRC = \
 #
 SIRF_DRIVER_SRC = \
 	ao_gps_sirf.c
+
 #
 # Skytraq driver source
 #
 SKY_DRIVER_SRC = \
 	ao_gps_skytraq.c
 
+
+#
+# BTM-182 driver source
+#
+BTM_DRIVER_SRC = \
+	ao_btm.c
+
 #
 # Tasks run on TeleMetrum
 #
 TM_TASK_SRC = \
 	ao_flight.c \
+	ao_sample.c \
+	ao_kalman.c \
 	ao_log.c \
+	ao_log_big.c \
 	ao_report.c \
 	ao_telemetry.c
 
@@ -159,6 +178,95 @@ TM_BASE_SRC = \
 	$(TM_TASK_SRC) \
 	$(TM_MAIN_SRC)
 
+#
+# Sources for TeleMini
+TMINI_DRIVER_SRC = \
+	ao_adc.c \
+	ao_ignite.c \
+	ao_config.c \
+	ao_storage.c \
+	ao_packet_slave.c \
+	ao_intflash.c
+
+TMINI_TASK_SRC = \
+	ao_flight.c \
+	ao_sample.c \
+	ao_kalman.c \
+	ao_log.c \
+	ao_log_tiny.c \
+	ao_report.c \
+	ao_telemetry.c
+
+TMINI_MAIN_SRC = \
+	ao_telemini.c
+
+TMINI_BASE_SRC = \
+	$(ALTOS_SRC) \
+	$(ALTOS_DRIVER_SRC) \
+	$(TELE_DRIVER_SRC) \
+	$(TELE_COMMON_SRC) \
+	$(TMINI_DRIVER_SRC) \
+	$(TMINI_TASK_SRC) \
+	$(TMINI_MAIN_SRC)
+
+#
+# Sources for TeleNano
+TNANO_DRIVER_SRC = \
+	ao_adc.c \
+	ao_config.c \
+	ao_storage.c \
+	ao_packet_slave.c \
+	ao_intflash.c
+
+TNANO_TASK_SRC = \
+	ao_flight_nano.c \
+	ao_sample.c \
+	ao_kalman.c \
+	ao_log.c \
+	ao_log_tiny.c \
+	ao_report.c \
+	ao_telemetry.c
+
+TNANO_MAIN_SRC = \
+	ao_telenano.c
+
+TNANO_BASE_SRC = \
+	$(ALTOS_SRC) \
+	$(ALTOS_DRIVER_SRC) \
+	$(TELE_DRIVER_SRC) \
+	$(TELE_COMMON_SRC) \
+	$(TNANO_DRIVER_SRC) \
+	$(TNANO_TASK_SRC) \
+	$(TNANO_MAIN_SRC)
+
+#
+# Sources for TeleBluetooth
+#
+
+TBT_MAIN_SRC = \
+	ao_telebt.c
+
+TBT_BASE_SRC = \
+	$(ALTOS_SRC) \
+	$(ALTOS_DRIVER_SRC) \
+	$(TELE_RECEIVER_SRC) \
+	$(TELE_COMMON_SRC) \
+	$(SERIAL_DRIVER_SRC) \
+	$(USB_DRIVER_SRC) \
+	$(BTM_DRIVER_SRC) \
+	$(DBG_SRC) \
+	$(TBT_MAIN_SRC)
+
+TBT_V_0_1_SRC = \
+	$(TBT_BASE_SRC) \
+	$(SPI_DRIVER_SRC) \
+	$(M25_DRIVER_SRC) \
+	$(BEEP_DRIVER_SRC) \
+	ao_log_telem.c
+
+#
+# TI Dongle sources
+#
 TI_MAIN_SRC = \
 	ao_tidongle.c
 
@@ -245,11 +353,13 @@ all: ../$(PROG)
 ../altitude.h: make-altitude
 	nickle $< > $@
 
+../ao_kalman.h: make-kalman kalman.5c kalman_filter.5c load_csv.5c matrix.5c
+	sh $< > $@
+
 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$@ $<
+$(REL): ao_product.h
 
 distclean:	clean