projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/easytimer-v2: Update comments in flash loader ao_pins.h
[fw/altos]
/
src
/
telemega-v1.0
/
Makefile
diff --git
a/src/telemega-v1.0/Makefile
b/src/telemega-v1.0/Makefile
index e3204c1180ee9eea2aac0ef304d40696e5363c2c..0e4e00831c81f24385cdbf22d72bf5aa49e04b5d 100644
(file)
--- a/
src/telemega-v1.0/Makefile
+++ b/
src/telemega-v1.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 \
@@
-26,10
+27,9
@@
INC = \
ao_whiten.h \
ao_sample_profile.h \
ao_quaternion.h \
ao_whiten.h \
ao_sample_profile.h \
ao_quaternion.h \
- math.h \
ao_mpu.h \
stm32l.h \
ao_mpu.h \
stm32l.h \
-
math.h
\
+
ao_ms5607_convert.c
\
Makefile
#
Makefile
#
@@
-47,20
+47,6
@@
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_acos.c \
- ef_sqrt.c \
- ef_rem_pio2.c \
- kf_cos.c \
- kf_sin.c \
- kf_rem_pio2.c \
- sf_copysign.c \
- sf_cos.c \
- sf_fabs.c \
- sf_floor.c \
- sf_scalbn.c \
- sf_sin.c
-
ALTOS_SRC = \
ao_boot_chain.c \
ao_interrupt.c \
ALTOS_SRC = \
ao_boot_chain.c \
ao_interrupt.c \
@@
-69,7
+55,7
@@
ALTOS_SRC = \
ao_cmd.c \
ao_config.c \
ao_task.c \
ao_cmd.c \
ao_config.c \
ao_task.c \
- ao_led.c \
+ ao_led
_stm
.c \
ao_stdio.c \
ao_panic.c \
ao_timer.c \
ao_stdio.c \
ao_panic.c \
ao_timer.c \
@@
-100,6
+86,7
@@
ALTOS_SRC = \
ao_i2c_stm.c \
ao_mpu6000.c \
ao_convert_pa.c \
ao_i2c_stm.c \
ao_mpu6000.c \
ao_convert_pa.c \
+ ao_convert_volt.c \
ao_log.c \
ao_log_mega.c \
ao_sample.c \
ao_log.c \
ao_log_mega.c \
ao_sample.c \
@@
-111,7
+98,6
@@
ALTOS_SRC = \
ao_companion.c \
ao_pyro.c \
ao_aprs.c \
ao_companion.c \
ao_pyro.c \
ao_aprs.c \
- $(MATH_SRC) \
$(PROFILE) \
$(SAMPLE_PROFILE) \
$(STACK_GUARD)
$(PROFILE) \
$(SAMPLE_PROFILE) \
$(STACK_GUARD)
@@
-120,7
+106,7
@@
PRODUCT=TeleMega-v1.0
PRODUCT_DEF=-DTELEMEGA
IDPRODUCT=0x0023
PRODUCT_DEF=-DTELEMEGA
IDPRODUCT=0x0023
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF)
-Os -g
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF)
PROGNAME=telemega-v1.0
PROG=$(PROGNAME)-$(VERSION).elf
PROGNAME=telemega-v1.0
PROG=$(PROGNAME)-$(VERSION).elf
@@
-132,20
+118,14
@@
OBJ=$(SRC:.c=.o)
all: $(PROG) $(HEX)
$(PROG): Makefile $(OBJ) altos.ld
all: $(PROG) $(HEX)
$(PROG): Makefile $(OBJ) altos.ld
- $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
-
-../altitude-pa.h: make-altitude-pa
- nickle $< > $@
+ $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
$(OBJ): $(INC)
$(OBJ): $(INC)
-ao_product.h: ao-make-product.5c ../Version
- $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
distclean: clean
clean:
distclean: clean
clean:
- rm -f *.o $(PROGNAME)-*.elf
+ rm -f *.o $(PROGNAME)-*.elf
$(PROGNAME)-*.ihx $(PROGNAME)-*.map
rm -f ao_product.h
install:
rm -f ao_product.h
install: