projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
telemetrum-v2.0
/
Makefile
diff --git
a/src/telemetrum-v2.0/Makefile
b/src/telemetrum-v2.0/Makefile
index a5370224cb172d0b48e722a4fb09171a919153c4..d77e95852e825236075cca0b913374a4c55fb188 100644
(file)
--- a/
src/telemetrum-v2.0/Makefile
+++ b/
src/telemetrum-v2.0/Makefile
@@
-9,6
+9,7
@@
INC = \
ao.h \
ao_arch.h \
ao_arch_funcs.h \
ao.h \
ao_arch.h \
ao_arch_funcs.h \
+ ao_boot.h \
ao_companion.h \
ao_data.h \
ao_sample.h \
ao_companion.h \
ao_data.h \
ao_sample.h \
@@
-37,6
+38,9
@@
INC = \
#STACK_GUARD=ao_mpu_stm.c
#STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
#STACK_GUARD=ao_mpu_stm.c
#STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
+MATH_SRC=\
+ ef_log.c
+
ALTOS_SRC = \
ao_boot_chain.c \
ao_interrupt.c \
ALTOS_SRC = \
ao_boot_chain.c \
ao_interrupt.c \
@@
-73,6
+77,7
@@
ALTOS_SRC = \
ao_eeprom_stm.c \
ao_report.c \
ao_convert_pa.c \
ao_eeprom_stm.c \
ao_report.c \
ao_convert_pa.c \
+ ao_convert_volt.c \
ao_log.c \
ao_log_metrum.c \
ao_sample.c \
ao_log.c \
ao_log_metrum.c \
ao_sample.c \
@@
-83,6
+88,7
@@
ALTOS_SRC = \
ao_packet.c \
ao_companion.c \
ao_aprs.c \
ao_packet.c \
ao_companion.c \
ao_aprs.c \
+ $(MATH_SRC) \
$(PROFILE) \
$(SAMPLE_PROFILE) \
$(STACK_GUARD)
$(PROFILE) \
$(SAMPLE_PROFILE) \
$(STACK_GUARD)
@@
-95,11
+101,12
@@
CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STA
PROGNAME=telemetrum-v2.0
PROG=$(PROGNAME)-$(VERSION).elf
PROGNAME=telemetrum-v2.0
PROG=$(PROGNAME)-$(VERSION).elf
+HEX=$(PROGNAME)-$(VERSION).ihx
SRC=$(ALTOS_SRC) ao_telemetrum.c
OBJ=$(SRC:.c=.o)
SRC=$(ALTOS_SRC) ao_telemetrum.c
OBJ=$(SRC:.c=.o)
-all: $(PROG)
+all: $(PROG)
$(HEX)
$(PROG): Makefile $(OBJ) altos.ld
$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
$(PROG): Makefile $(OBJ) altos.ld
$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
@@
-115,7
+122,7
@@
ao_product.h: ao-make-product.5c ../Version
distclean: clean
clean:
distclean: clean
clean:
- rm -f *.o $(PROGNAME)-*.elf
+ rm -f *.o $(PROGNAME)-*.elf
$(PROGNAME)-*.ihx
rm -f ao_product.h
install:
rm -f ao_product.h
install: