X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymega-v2.0%2FMakefile;h=d999232f6b2c4c105cf4101643f822f9018f950b;hb=6846db985d77c25b4deb5f8a763eec245a0a3a71;hp=ece4e9bb93f65511808487c20356adf0bfc2e9d7;hpb=6fdc392ef1b624c06e26e7a053c3579435c455d5;p=fw%2Faltos

diff --git a/src/easymega-v2.0/Makefile b/src/easymega-v2.0/Makefile
index ece4e9bb..d999232f 100644
--- 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_adxl375.h \
 	ao_profile.h \
 	ao_task.h \
 	ao_whiten.h \
 	ao_sample_profile.h \
 	ao_quaternion.h \
-	math.h \
 	ao_mpu.h \
 	stm32l.h \
-	math.h \
 	Makefile
 
 #
@@ -44,21 +43,6 @@ INC = \
 #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 \
@@ -67,7 +51,7 @@ ALTOS_SRC = \
 	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 \
@@ -79,6 +63,7 @@ ALTOS_SRC = \
 	ao_data.c \
 	ao_ms5607.c \
 	ao_mpu9250.c \
+	ao_adxl375.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 \
-	$(MATH_SRC) \
 	$(PROFILE) \
 	$(SAMPLE_PROFILE) \
 	$(STACK_GUARD)
@@ -106,7 +90,7 @@ PRODUCT=EasyMega-v2.0
 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-v2.0
 PROG=$(PROGNAME)-$(VERSION).elf
@@ -118,20 +102,14 @@ OBJ=$(SRC:.c=.o)
 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)
 
-ao_product.h: ao-make-product.5c ../Version
-	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
 distclean:	clean
 
 clean:
-	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
+	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx $(PROGNAME)-*.map
 	rm -f ao_product.h
 
 install: