projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: New teledongle and telebt devices are not pair-programmed
[fw/altos]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 5ae61a007f7778f94d971ffc4f85df9405e2899f..05e99c7fbfd77405ecabb89694cff4aa2662de00 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-13,43
+13,64
@@
vpath load_csv.5c kalman
vpath matrix.5c kalman
include Version
vpath matrix.5c kalman
include Version
+TOPDIR=.
+include Makedefs
SDCCDIRS=\
telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
SDCCDIRS=\
telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
- teledongle-v0.2
teledongle-v0.1
\
- telemini-v1.0 tele
nano-v0.1
\
+ teledongle-v0.2 \
+ telemini-v1.0 tele
mini-v2.0
\
telebt-v1.0 \
telebt-v1.0 \
- telemetrum-v0.1-sky telemetrum-v0.1-sirf \
- telelaunch-v0.1 tidongle test \
teleterra-v0.2 teleshield-v0.1 \
teleterra-v0.2 teleshield-v0.1 \
- telefire-v0.1 \
- spiradio-v0.1
+ telefire-v0.1
telefire-v0.2
\
+ telerepeat-v1.0
-AVRDIRS=\
- telescience-v0.1 telescience-pwm telepyro-v0.1 micropeak
-
-ARMDIRS=\
+ARMM3DIRS=\
+ easymega-v1.0 easymega-v1.0/flash-loader \
telemega-v0.1 telemega-v0.1/flash-loader \
telemega-v0.1 telemega-v0.1/flash-loader \
- telemega-v0.3 telemega-v0.3/flash-loader \
+ telemega-v1.0 telemega-v1.0/flash-loader \
+ telemetrum-v2.0 telemetrum-v2.0/flash-loader \
megadongle-v0.1 megadongle-v0.1/flash-loader \
megadongle-v0.1 megadongle-v0.1/flash-loader \
- telegps-v0.
1 telegps-v0.1
/flash-loader \
-
stm-bringup stm-demo telelco-v0.1
\
+ telegps-v0.
3 telegps-v0.3
/flash-loader \
+
telegps-v1.0 telegps-v1.0/flash-loader
\
telelco-v0.2 telelco-v0.2/flash-loader \
telelco-v0.2 telelco-v0.2/flash-loader \
- telescience-v0.2
+ telescience-v0.2 telescience-v0.2/flash-loader \
+ teledongle-v3.0 teledongle-v3.0/flash-loader \
+ teleballoon-v2.0 \
+ telebt-v3.0 telebt-v3.0/flash-loader
-ifneq ($(shell which sdcc),)
- SUBDIRS += $(SDCCDIRS)
+ARMM0DIRS=\
+ easymini-v1.0 easymini-v1.0/flash-loader
+
+AVRDIRS=\
+ telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1 microkite
+
+SUBDIRS=
+
+ifeq ($(strip $(HAVE_PDCLIB)),yes)
+PDCLIB=pdclib
+CLEAN_PDCLIB=clean-pdclib
endif
endif
-if
neq ($(shell which avr-gcc),
)
-
SUBDIRS += $(AVR
DIRS)
+if
eq ($(strip $(HAVE_SDCC)),yes
)
+
SUBDIRS+=$(SDCC
DIRS)
endif
endif
-ifneq ($(shell which arm-none-eabi-gcc),)
- SUBDIRS += $(ARMDIRS)
+ifeq ($(strip $(HAVE_ARM_M3_CC)),yes)
+SUBDIRS+=$(ARMM3DIRS)
+foo=bar
endif
endif
-ALLDIRS=$(SDCCDIRS) $(AVRDIRS) $(ARMDIRS)
+ifeq ($(strip $(HAVE_ARM_M0_CC)),yes)
+SUBDIRS+=$(ARMM0DIRS)
+baz=bletch
+endif
+
+ifeq ($(strip $(HAVE_AVR_CC)),yes)
+SUBDIRS += $(AVRDIRS)
+endif
+
+ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS)
all: all-local all-recursive
all: all-local all-recursive
@@
-81,7
+102,7
@@
uninstall:
all-recursive: all-local
all-recursive: all-local
-all-local: altitude.h altitude-pa.h a
o_kalman.h ao_whiten.h
+all-local: altitude.h altitude-pa.h a
ltitude-pa-small.h ao_kalman.h ao_whiten.h $(PDCLIB)
altitude.h: make-altitude
nickle $< > $@
altitude.h: make-altitude
nickle $< > $@
@@
-89,11
+110,22
@@
altitude.h: make-altitude
altitude-pa.h: make-altitude-pa
nickle $< > $@
altitude-pa.h: make-altitude-pa
nickle $< > $@
-ao_kalman.h: make-kalman kalman.5c kalman_filter.5c load_csv.5c matrix.5c
+altitude-pa-small.h: make-altitude-pa
+ nickle $< --sample 3 > $@
+
+ao_kalman.h: make-kalman kalman.5c kalman_micro.5c kalman_filter.5c load_csv.5c matrix.5c
bash $< kalman > $@
ao_whiten.h: make-whiten
nickle $< > $@
bash $< kalman > $@
ao_whiten.h: make-whiten
nickle $< > $@
-clean-local:
+clean-local:
$(CLEAN_PDCLIB)
rm -f altitude.h ao_kalman.h
rm -f altitude.h ao_kalman.h
+
+pdclib:
+ mkdir -p $(PDCLIB_ROOT)/include $(PDCLIB_ROOT)/lib
+ cd ../pdclib && make && make prefix=`pwd`/../pdclib-root install
+
+clean-pdclib:
+ rm -rf $(PDCLIB_ROOT)
+ cd ../pdclib && make clean