projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version to 0.9.7
[fw/altos]
/
src
/
Makefile.proto
diff --git
a/src/Makefile.proto
b/src/Makefile.proto
index eabd17b9af698f8edb09fe7fbd2b5a967bdd9f55..8f98d3544101a15b058668f70dc2ae2d490f0e0d 100644
(file)
--- a/
src/Makefile.proto
+++ b/
src/Makefile.proto
@@
-5,6
+5,11
@@
vpath %.c ..
vpath %.h ..
vpath make-altitude ..
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
vpath ao-make-product.5c ..
CC=sdcc
@@
-25,6
+30,7
@@
INC = \
ao_pins.h \
cc1111.h \
altitude.h \
ao_pins.h \
cc1111.h \
altitude.h \
+ ao_kalman.h \
25lc1024.h
#
25lc1024.h
#
@@
-56,9
+62,7
@@
USB_DRIVER_SRC = \
ao_usb.c
TELE_COMMON_SRC = \
ao_usb.c
TELE_COMMON_SRC = \
- ao_packet.c \
- ao_packet_slave.c \
- ao_state.c
+ ao_packet.c
#
# Receiver code
#
# Receiver code
@@
-67,6
+71,7
@@
TELE_RECEIVER_SRC =\
ao_monitor.c \
ao_gps_print.c \
ao_packet_master.c \
ao_monitor.c \
ao_gps_print.c \
ao_packet_master.c \
+ ao_state.c \
ao_rssi.c
#
ao_rssi.c
#
@@
-101,6
+106,7
@@
TM_DRIVER_SRC = \
ao_adc.c \
ao_gps_report.c \
ao_ignite.c \
ao_adc.c \
ao_gps_report.c \
ao_ignite.c \
+ ao_packet_slave.c \
$(BEEP_DRIVER_SRC) \
$(USB_DRIVER_SRC)
$(BEEP_DRIVER_SRC) \
$(USB_DRIVER_SRC)
@@
-130,17
+136,33
@@
M25_DRIVER_SRC = \
#
SIRF_DRIVER_SRC = \
ao_gps_sirf.c
#
SIRF_DRIVER_SRC = \
ao_gps_sirf.c
+
#
# Skytraq driver source
#
SKY_DRIVER_SRC = \
ao_gps_skytraq.c
#
# Skytraq driver source
#
SKY_DRIVER_SRC = \
ao_gps_skytraq.c
+
+#
+# BTM-182 driver source
+#
+BTM_DRIVER_SRC = \
+ ao_btm.c
+
+#
+# Companion port driver source
+#
+COMPANION_SRC = \
+ ao_companion.c
+
#
# Tasks run on TeleMetrum
#
TM_TASK_SRC = \
ao_flight.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_log.c \
ao_log_big.c \
ao_report.c \
@@
-169,14
+191,17
@@
TMINI_DRIVER_SRC = \
ao_ignite.c \
ao_config.c \
ao_storage.c \
ao_ignite.c \
ao_config.c \
ao_storage.c \
+ ao_packet_slave.c \
ao_intflash.c
TMINI_TASK_SRC = \
ao_flight.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_log.c \
ao_log_tiny.c \
ao_report.c \
- ao_telemetry
_tiny
.c
+ ao_telemetry.c
TMINI_MAIN_SRC = \
ao_telemini.c
TMINI_MAIN_SRC = \
ao_telemini.c
@@
-194,20
+219,22
@@
TMINI_BASE_SRC = \
# Sources for TeleNano
TNANO_DRIVER_SRC = \
ao_adc.c \
# Sources for TeleNano
TNANO_DRIVER_SRC = \
ao_adc.c \
- ao_ignite.c \
ao_config.c \
ao_storage.c \
ao_config.c \
ao_storage.c \
+ ao_packet_slave.c \
ao_intflash.c
TNANO_TASK_SRC = \
ao_intflash.c
TNANO_TASK_SRC = \
- ao_flight.c \
+ ao_flight_nano.c \
+ ao_sample.c \
+ ao_kalman.c \
ao_log.c \
ao_log_tiny.c \
ao_report.c \
ao_log.c \
ao_log_tiny.c \
ao_report.c \
- ao_telemetry
_tiny
.c
+ ao_telemetry.c
TNANO_MAIN_SRC = \
TNANO_MAIN_SRC = \
- ao_tele
mini
.c
+ ao_tele
nano
.c
TNANO_BASE_SRC = \
$(ALTOS_SRC) \
TNANO_BASE_SRC = \
$(ALTOS_SRC) \
@@
-218,6
+245,31
@@
TNANO_BASE_SRC = \
$(TNANO_TASK_SRC) \
$(TNANO_MAIN_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 Dongle sources
#
@@
-307,11
+359,13
@@
all: ../$(PROG)
../altitude.h: make-altitude
nickle $< > $@
../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.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
distclean: clean