diff options
Diffstat (limited to 'src/telegps-v0.3')
| -rw-r--r-- | src/telegps-v0.3/Makefile | 14 | ||||
| -rw-r--r-- | src/telegps-v0.3/ao_pins.h | 10 | ||||
| -rw-r--r-- | src/telegps-v0.3/ao_telegps.c | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/telegps-v0.3/Makefile b/src/telegps-v0.3/Makefile index 5aad32b5..1eaf7c47 100644 --- a/src/telegps-v0.3/Makefile +++ b/src/telegps-v0.3/Makefile @@ -11,6 +11,7 @@ INC = \ ao_arch_funcs.h \ ao_pins.h \ ao_product.h \ + ao_tracker.h \ ao_task.h \ ao_whiten.h \ ao_cc115l.h \ @@ -19,9 +20,6 @@ INC = \ Makefile -MATH_SRC=\ - ef_log.c - ALTOS_SRC = \ ao_interrupt.c \ ao_boot_chain.c \ @@ -44,13 +42,14 @@ ALTOS_SRC = \ ao_cc115l.c \ ao_fec_tx.c \ ao_aprs.c \ + ao_tracker.c \ ao_telemetry.c \ ao_storage.c \ ao_m25.c \ ao_log.c \ - ao_log_mega.c \ - ao_gps_report_mega.c \ - $(MATH_SRC) \ + ao_log_gps.c \ + ao_distance.c \ + ao_sqrt.c \ $(SAMPLE_PROFILE) PRODUCT=TeleGPS-v0.3 @@ -61,11 +60,12 @@ CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) $(PROFILE_DEF) -Os -g PROGNAME=telegps-v0.3 PROG=$(PROGNAME)-$(VERSION).elf +HEX=$(PROGNAME)-$(VERSION).ihx SRC=$(ALTOS_SRC) ao_telegps.c OBJ=$(SRC:.c=.o) -all: $(PROG) +all: $(PROG) $(HEX) LDFLAGS=-L../lpc -Wl,-Taltos.ld diff --git a/src/telegps-v0.3/ao_pins.h b/src/telegps-v0.3/ao_pins.h index a4afaa54..d0e4d835 100644 --- a/src/telegps-v0.3/ao_pins.h +++ b/src/telegps-v0.3/ao_pins.h @@ -46,7 +46,7 @@ #define HAS_BEEP 0 #define HAS_RADIO 1 #define HAS_TELEMETRY 1 -#define HAS_RDF 0 +#define HAS_RDF 1 #define HAS_APRS 1 #define HAS_RADIO_RECV 0 @@ -69,9 +69,11 @@ #define HAS_FLIGHT 0 #define HAS_ADC 0 #define HAS_LOG 1 +#define HAS_TRACKER 1 -#define AO_CONFIG_DEFAULT_APRS_INTERVAL 5 +#define AO_CONFIG_DEFAULT_APRS_INTERVAL 0 #define AO_CONFIG_DEFAULT_RADIO_POWER 0xc0 +#define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX 496 * 1024 /* * GPS @@ -85,9 +87,9 @@ /* gets pretty close to 434.550 */ -#define AO_RADIO_CAL_DEFAULT 0x10b6a5 +#define AO_RADIO_CAL_DEFAULT 1095378 -#define HAS_RADIO_POWER 1 +#define HAS_RADIO_POWER 0 #define AO_FEC_DEBUG 0 #define AO_CC115L_SPI_CS_PORT 0 #define AO_CC115L_SPI_CS_PIN 3 diff --git a/src/telegps-v0.3/ao_telegps.c b/src/telegps-v0.3/ao_telegps.c index 608817e7..dd699ecf 100644 --- a/src/telegps-v0.3/ao_telegps.c +++ b/src/telegps-v0.3/ao_telegps.c @@ -17,15 +17,13 @@ #include <ao.h> #include <ao_exti.h> -#include <ao_fat.h> - -uint16_t ao_flight_number = 1; +#include <ao_tracker.h> int main(void) { ao_clock_init(); - + #if HAS_STACK_GUARD ao_mpu_init(); #endif @@ -48,18 +46,18 @@ main(void) ao_gps_init(); #if HAS_LOG - ao_gps_report_mega_init(); ao_log_init(); #endif + ao_tracker_init(); + ao_telemetry_init(); - ao_telemetry_set_interval(AO_SEC_TO_TICKS(1)); #if HAS_SAMPLE_PROFILE ao_sample_profile_init(); #endif ao_config_init(); - + ao_start_scheduler(); return 0; } |