diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-05 18:49:59 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-06-05 18:49:59 -0700 |
| commit | fe0aaf4413035f9de2c805c612c71188ec8c6f4d (patch) | |
| tree | 08651cd66e87bfd54fc62bd39e8b31fd63ee9e6a /src | |
| parent | 6160ddadeae324b4a68db800c98c339156b63076 (diff) | |
altos/telegps-v0.3: Add tracker task
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/telegps-v0.3/Makefile | 7 | ||||
| -rw-r--r-- | src/telegps-v0.3/ao_pins.h | 5 | ||||
| -rw-r--r-- | src/telegps-v0.3/ao_telegps.c | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/telegps-v0.3/Makefile b/src/telegps-v0.3/Makefile index 5aad32b5..00730b29 100644 --- a/src/telegps-v0.3/Makefile +++ b/src/telegps-v0.3/Makefile @@ -19,9 +19,6 @@ INC = \ Makefile -MATH_SRC=\ - ef_log.c - ALTOS_SRC = \ ao_interrupt.c \ ao_boot_chain.c \ @@ -44,13 +41,15 @@ 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_distance.c \ + ao_sqrt.c \ $(SAMPLE_PROFILE) PRODUCT=TeleGPS-v0.3 diff --git a/src/telegps-v0.3/ao_pins.h b/src/telegps-v0.3/ao_pins.h index a4afaa54..ae401ed4 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,6 +69,7 @@ #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_RADIO_POWER 0xc0 @@ -87,7 +88,7 @@ #define AO_RADIO_CAL_DEFAULT 0x10b6a5 -#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..dfd7e6ad 100644 --- a/src/telegps-v0.3/ao_telegps.c +++ b/src/telegps-v0.3/ao_telegps.c @@ -17,7 +17,7 @@ #include <ao.h> #include <ao_exti.h> -#include <ao_fat.h> +#include <ao_tracker.h> uint16_t ao_flight_number = 1; @@ -25,7 +25,7 @@ int main(void) { ao_clock_init(); - + #if HAS_STACK_GUARD ao_mpu_init(); #endif @@ -52,6 +52,8 @@ main(void) ao_log_init(); #endif + ao_tracker_init(); + ao_telemetry_init(); ao_telemetry_set_interval(AO_SEC_TO_TICKS(1)); @@ -59,7 +61,7 @@ main(void) ao_sample_profile_init(); #endif ao_config_init(); - + ao_start_scheduler(); return 0; } |