X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftelemega-v2.0%2FMakefile;h=6c84792efd28f853caced2286df9c5f2417c8bc1;hp=2e0e8908e6d90fe962e7fc11486ef393c0bf5eb9;hb=7a89aa1ea7e1b02b5cd310986adf4239ec0ce91d;hpb=8aa0ab9fe9ca41f6d520d388973164bc0c599a06

diff --git a/src/telemega-v2.0/Makefile b/src/telemega-v2.0/Makefile
index 2e0e8908..6c84792e 100644
--- a/src/telemega-v2.0/Makefile
+++ b/src/telemega-v2.0/Makefile
@@ -21,16 +21,14 @@ INC = \
 	ao_hmc5883.h \
 	ao_mpu6000.h \
 	ao_mma655x.h \
-	ao_cc1120_CC1120.h \
+	ao_cc1200_CC1200.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 \
 	ao_ms5607_convert.c \
 	Makefile
 
@@ -49,21 +47,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 \
@@ -72,7 +55,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 \
@@ -85,9 +68,7 @@ ALTOS_SRC = \
 	ao_freq.c \
 	ao_dma_stm.c \
 	ao_spi_stm.c \
-	ao_cc1120.c \
-	ao_fec_tx.c \
-	ao_fec_rx.c \
+	ao_cc1200.c \
 	ao_data.c \
 	ao_ms5607.c \
 	ao_mma655x.c \
@@ -116,7 +97,6 @@ ALTOS_SRC = \
 	ao_pyro.c \
 	ao_aprs.c \
 	ao_pwm_stm.c \
-	$(MATH_SRC) \
 	$(PROFILE) \
 	$(SAMPLE_PROFILE) \
 	$(STACK_GUARD)
@@ -125,7 +105,7 @@ PRODUCT=TeleMega-v2.0
 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-v2.0
 PROG=$(PROGNAME)-$(VERSION).elf
@@ -137,16 +117,10 @@ 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: