projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm32f4: Working on USB
[fw/altos]
/
src
/
easymega-v2.0
/
Makefile
diff --git
a/src/easymega-v2.0/Makefile
b/src/easymega-v2.0/Makefile
index 9d490d0f144bdea89f91e19613224ffae9dec6ed..ab478a4238c61fbd9bd5c496a07311da22a86b97 100644
(file)
--- a/
src/easymega-v2.0/Makefile
+++ b/
src/easymega-v2.0/Makefile
@@
-19,15
+19,14
@@
INC = \
ao_product.h \
ao_ms5607.h \
ao_mpu9250.h \
ao_product.h \
ao_ms5607.h \
ao_mpu9250.h \
+ ao_adxl375.h \
ao_profile.h \
ao_task.h \
ao_whiten.h \
ao_sample_profile.h \
ao_quaternion.h \
ao_profile.h \
ao_task.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 \
Makefile
#
Makefile
#
@@
-44,21
+43,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 \
- ef_log.c
-
ALTOS_SRC = \
ao_boot_chain.c \
ao_interrupt.c \
ALTOS_SRC = \
ao_boot_chain.c \
ao_interrupt.c \
@@
-67,7
+51,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 \
@@
-79,6
+63,7
@@
ALTOS_SRC = \
ao_data.c \
ao_ms5607.c \
ao_mpu9250.c \
ao_data.c \
ao_ms5607.c \
ao_mpu9250.c \
+ ao_adxl375.c \
ao_adc_stm.c \
ao_beep_stm.c \
ao_eeprom_stm.c \
ao_adc_stm.c \
ao_beep_stm.c \
ao_eeprom_stm.c \
@@
-97,7
+82,6
@@
ALTOS_SRC = \
ao_flight.c \
ao_companion.c \
ao_pyro.c \
ao_flight.c \
ao_companion.c \
ao_pyro.c \
- $(MATH_SRC) \
$(PROFILE) \
$(SAMPLE_PROFILE) \
$(STACK_GUARD)
$(PROFILE) \
$(SAMPLE_PROFILE) \
$(STACK_GUARD)
@@
-106,9
+90,9
@@
PRODUCT=EasyMega-v2.0
PRODUCT_DEF=-DEASYMEGA
IDPRODUCT=0x0028
PRODUCT_DEF=-DEASYMEGA
IDPRODUCT=0x0028
-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=easymega-v
1
.0
+PROGNAME=easymega-v
2
.0
PROG=$(PROGNAME)-$(VERSION).elf
HEX=$(PROGNAME)-$(VERSION).ihx
PROG=$(PROGNAME)-$(VERSION).elf
HEX=$(PROGNAME)-$(VERSION).ihx
@@
-118,16
+102,10
@@
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: