From 6a79fe8144dcab10294caa4b0eac967eeb0d8e7e Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 5 Jun 2014 21:42:10 -0700 Subject: altos: Add telegps-v1.0 code and loader Signed-off-by: Keith Packard --- src/telegps-v1.0/Makefile | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 src/telegps-v1.0/Makefile (limited to 'src/telegps-v1.0/Makefile') diff --git a/src/telegps-v1.0/Makefile b/src/telegps-v1.0/Makefile new file mode 100644 index 00000000..5f2a100c --- /dev/null +++ b/src/telegps-v1.0/Makefile @@ -0,0 +1,91 @@ +# +# AltOS build +# +# + +include ../lpc/Makefile.defs + +INC = \ + ao.h \ + ao_arch.h \ + ao_arch_funcs.h \ + ao_pins.h \ + ao_product.h \ + ao_task.h \ + ao_whiten.h \ + ao_cc115l.h \ + ao_fec.h \ + lpc.h \ + Makefile + + +# ao_data.c \ +# ao_adc_lpc.c \ +# ao_convert_volt.c \ + +ALTOS_SRC = \ + ao_interrupt.c \ + ao_boot_chain.c \ + ao_product.c \ + ao_romconfig.c \ + ao_cmd.c \ + ao_config.c \ + ao_task.c \ + ao_stdio.c \ + ao_panic.c \ + ao_timer_lpc.c \ + ao_mutex.c \ + ao_freq.c \ + ao_spi_lpc.c \ + ao_usb_lpc.c \ + ao_exti_lpc.c \ + ao_serial_lpc.c \ + ao_gps_ublox.c \ + ao_gps_show.c \ + 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 \ + ao_distance.c \ + ao_sqrt.c \ + $(SAMPLE_PROFILE) + +PRODUCT=TeleGPS-v1.0 +PRODUCT_DEF=-DTELEGPS +IDPRODUCT=0x0025 + +CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) $(PROFILE_DEF) -Os -g + +PROGNAME=telegps-v1.0 +PROG=$(PROGNAME)-$(VERSION).elf + +SRC=$(ALTOS_SRC) ao_telegps.c +OBJ=$(SRC:.c=.o) + +all: $(PROG) + +LDFLAGS=-L../lpc -Wl,-Taltos.ld + +$(PROG): Makefile $(OBJ) altos.ld + $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -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 ao_serial_lpc.h $(PROGNAME)-*.elf $(PROGNAME)-*.ihx + rm -f ao_product.h + +install: + +uninstall: -- cgit v1.2.3 From d562a5d3a6dfea334a66ee74893b400bdca09315 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 7 Jun 2014 11:44:07 -0700 Subject: altos: Switch TeleGPS to GPS logging format It's customized for TeleGPS uses Signed-off-by: Keith Packard --- src/telegps-v0.3/Makefile | 3 +-- src/telegps-v0.3/ao_telegps.c | 1 - src/telegps-v1.0/Makefile | 3 +-- src/telegps-v1.0/ao_telegps.c | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/telegps-v1.0/Makefile') diff --git a/src/telegps-v0.3/Makefile b/src/telegps-v0.3/Makefile index 00730b29..9736407c 100644 --- a/src/telegps-v0.3/Makefile +++ b/src/telegps-v0.3/Makefile @@ -46,8 +46,7 @@ ALTOS_SRC = \ ao_storage.c \ ao_m25.c \ ao_log.c \ - ao_log_mega.c \ - ao_gps_report_mega.c \ + ao_log_gps.c \ ao_distance.c \ ao_sqrt.c \ $(SAMPLE_PROFILE) diff --git a/src/telegps-v0.3/ao_telegps.c b/src/telegps-v0.3/ao_telegps.c index 6a022828..bc7eeea8 100644 --- a/src/telegps-v0.3/ao_telegps.c +++ b/src/telegps-v0.3/ao_telegps.c @@ -46,7 +46,6 @@ main(void) ao_gps_init(); #if HAS_LOG - ao_gps_report_mega_init(); ao_log_init(); #endif diff --git a/src/telegps-v1.0/Makefile b/src/telegps-v1.0/Makefile index 5f2a100c..ed864d64 100644 --- a/src/telegps-v1.0/Makefile +++ b/src/telegps-v1.0/Makefile @@ -50,8 +50,7 @@ ALTOS_SRC = \ ao_storage.c \ ao_m25.c \ ao_log.c \ - ao_log_mega.c \ - ao_gps_report_mega.c \ + ao_log_gps.c \ ao_distance.c \ ao_sqrt.c \ $(SAMPLE_PROFILE) diff --git a/src/telegps-v1.0/ao_telegps.c b/src/telegps-v1.0/ao_telegps.c index 50a5b8ee..1185a5dd 100644 --- a/src/telegps-v1.0/ao_telegps.c +++ b/src/telegps-v1.0/ao_telegps.c @@ -49,7 +49,6 @@ main(void) ao_gps_init(); #if HAS_LOG - ao_gps_report_mega_init(); ao_log_init(); #endif -- cgit v1.2.3 From 23d9d37fd2a8f4b867f34e71a2b0f7cb090717c1 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 7 Jun 2014 21:12:09 -0700 Subject: altos: Make telegps builds depend on ao_tracker.h Signed-off-by: Keith Packard --- src/telegps-v0.3/Makefile | 1 + src/telegps-v1.0/Makefile | 1 + 2 files changed, 2 insertions(+) (limited to 'src/telegps-v1.0/Makefile') diff --git a/src/telegps-v0.3/Makefile b/src/telegps-v0.3/Makefile index 9736407c..27279792 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 \ diff --git a/src/telegps-v1.0/Makefile b/src/telegps-v1.0/Makefile index ed864d64..b5c3dfa3 100644 --- a/src/telegps-v1.0/Makefile +++ b/src/telegps-v1.0/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 \ -- cgit v1.2.3 From ee2216af17f23781ea912caba29fbd7e4d9ff480 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 7 Jun 2014 22:23:19 -0700 Subject: altos: Enable ADC for TeleGPS v1.0 battery voltage measuring Signed-off-by: Keith Packard --- src/telegps-v1.0/Makefile | 7 +++---- src/telegps-v1.0/ao_pins.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/telegps-v1.0/Makefile') diff --git a/src/telegps-v1.0/Makefile b/src/telegps-v1.0/Makefile index b5c3dfa3..7513aad9 100644 --- a/src/telegps-v1.0/Makefile +++ b/src/telegps-v1.0/Makefile @@ -20,10 +20,6 @@ INC = \ Makefile -# ao_data.c \ -# ao_adc_lpc.c \ -# ao_convert_volt.c \ - ALTOS_SRC = \ ao_interrupt.c \ ao_boot_chain.c \ @@ -54,6 +50,9 @@ ALTOS_SRC = \ ao_log_gps.c \ ao_distance.c \ ao_sqrt.c \ + ao_data.c \ + ao_adc_lpc.c \ + ao_convert_volt.c \ $(SAMPLE_PROFILE) PRODUCT=TeleGPS-v1.0 diff --git a/src/telegps-v1.0/ao_pins.h b/src/telegps-v1.0/ao_pins.h index 1ec53fb2..5c58b34d 100644 --- a/src/telegps-v1.0/ao_pins.h +++ b/src/telegps-v1.0/ao_pins.h @@ -119,7 +119,7 @@ * ADC */ -#define HAS_ADC 0 +#define HAS_ADC 1 #define LOG_ADC 0 #define AO_DATA_RING 4 -- cgit v1.2.3 From 0495f1b5282d8f7449cbbc1dbf99d63818d7c03c Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 11 Jun 2014 23:26:36 -0700 Subject: altos/telegps: Build .ihx versions for TeleGPS Needed to load with java Signed-off-by: Keith Packard --- src/telegps-v0.3/Makefile | 3 ++- src/telegps-v1.0/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/telegps-v1.0/Makefile') diff --git a/src/telegps-v0.3/Makefile b/src/telegps-v0.3/Makefile index 27279792..1eaf7c47 100644 --- a/src/telegps-v0.3/Makefile +++ b/src/telegps-v0.3/Makefile @@ -60,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-v1.0/Makefile b/src/telegps-v1.0/Makefile index 7513aad9..bd13cfe7 100644 --- a/src/telegps-v1.0/Makefile +++ b/src/telegps-v1.0/Makefile @@ -63,11 +63,12 @@ CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) $(PROFILE_DEF) -Os -g PROGNAME=telegps-v1.0 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 -- cgit v1.2.3