telegps-v2.0: Remove fec_tx code and ADC logging.

This gets telegps-v2.0 to link.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/telegps-v2.0/Makefile b/src/telegps-v2.0/Makefile
index 58cf26e8c755b600cc7ae55e1b424c1272f25b08..19d088d381853e67590d340c5c5dec06473eba4e 100644 (file)
--- a/src/telegps-v2.0/Makefile
+++ b/src/telegps-v2.0/Makefile
@@ -13,8 +13,7 @@ INC = \
        ao_product.h \
        ao_tracker.h \
        ao_task.h \
        ao_product.h \
        ao_tracker.h \
        ao_task.h \

-       ao_whiten.h \
-       ao_cc115l.h \
+       ao_cc1200.h \

        ao_fec.h \
        stm32f0.h \
        Makefile
        ao_fec.h \
        stm32f0.h \
        Makefile


@@ -24,6 +23,7 @@ ALTOS_SRC = \
        ao_adc_stm.c \
        ao_led.c \
        ao_interrupt.c \
        ao_adc_stm.c \
        ao_led.c \
        ao_interrupt.c \

+       ao_boot_chain.c \

        ao_product.c \
        ao_romconfig.c \
        ao_cmd.c \
        ao_product.c \
        ao_romconfig.c \
        ao_cmd.c \


@@ -42,7 +42,6 @@ ALTOS_SRC = \
        ao_gps_ublox.c \
        ao_gps_show.c \
        ao_cc1200.c \
        ao_gps_ublox.c \
        ao_gps_show.c \
        ao_cc1200.c \

-       ao_fec_tx.c \

        ao_aprs.c \
        ao_tracker.c \
        ao_telemetry.c \
        ao_aprs.c \
        ao_tracker.c \
        ao_telemetry.c \


@@ -71,10 +70,8 @@ OBJ=$(SRC:.c=.o)
 
 all: $(PROG) $(HEX)
 
 
 all: $(PROG) $(HEX)
 

-LDFLAGS=-L../stmf0 -Wl,-Taltos.ld
-

 $(PROG): Makefile $(OBJ) altos.ld
 $(PROG): Makefile $(OBJ) altos.ld

-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
+       $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)

 
 $(OBJ): $(INC)
 
 
 $(OBJ): $(INC)
 

diff --git a/src/telegps-v2.0/ao_pins.h b/src/telegps-v2.0/ao_pins.h
index acba8c3757af16c85b83fc536a574a03ea4a8912..c51f0afb61450e61e8712a5b3334d77526fc5722 100644 (file)
--- a/src/telegps-v2.0/ao_pins.h
+++ b/src/telegps-v2.0/ao_pins.h
@@ -26,6 +26,7 @@
 
 #define LEDS_AVAILABLE  (AO_LED_RED)
 
 
 #define LEDS_AVAILABLE  (AO_LED_RED)
 

+#define IS_FLASH_LOADER                0

 #define HAS_BEEP              0
 
 #define AO_HSE                  32000000
 #define HAS_BEEP              0
 
 #define AO_HSE                  32000000


@@ -120,6 +121,7 @@ struct ao_adc {
 #define HAS_LOG                        1
 #define FLIGHT_LOG_APPEND      1
 #define HAS_TRACKER            1
 #define HAS_LOG                        1
 #define FLIGHT_LOG_APPEND      1
 #define HAS_TRACKER            1

+#define LOG_ADC                        0

 
 #define AO_CONFIG_DEFAULT_APRS_INTERVAL                0
 #define AO_CONFIG_DEFAULT_RADIO_POWER          0xc0
 
 #define AO_CONFIG_DEFAULT_APRS_INTERVAL                0
 #define AO_CONFIG_DEFAULT_RADIO_POWER          0xc0