From: Keith Packard Date: Mon, 7 Nov 2022 03:31:05 +0000 (-0800) Subject: altos/telemetrum-v4.0: It links X-Git-Tag: 1.9.13~1^2~26^2~32 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ca76309700a3f6ec9775f6e6cce5915dcb4515c9 altos/telemetrum-v4.0: It links Still much work to do, but at least it links with most of the pieces in place. Signed-off-by: Keith Packard --- diff --git a/src/telemetrum-v4.0/Makefile b/src/telemetrum-v4.0/Makefile index 4113bd42..51916407 100644 --- a/src/telemetrum-v4.0/Makefile +++ b/src/telemetrum-v4.0/Makefile @@ -62,13 +62,11 @@ ALTOS_SRC = \ ao_dma_samd21.c \ ao_spi_samd21.c \ ao_cc1200.c \ - ao_fec_tx.c \ - ao_fec_rx.c \ ao_data.c \ ao_ms5607.c \ ao_adxl375.c \ ao_adc_samd21.c \ - ao_beep_stm.c \ + ao_beep_samd21.c \ ao_storage.c \ ao_m25.c \ ao_usb_samd21.c \ diff --git a/src/telemetrum-v4.0/ao_pins.h b/src/telemetrum-v4.0/ao_pins.h index d1573d58..2245a88f 100644 --- a/src/telemetrum-v4.0/ao_pins.h +++ b/src/telemetrum-v4.0/ao_pins.h @@ -38,8 +38,8 @@ #define HAS_EEPROM 1 #define USE_INTERNAL_FLASH 0 -#define USE_EEPROM_CONFIG 1 -#define USE_STORAGE_CONFIG 0 +#define USE_EEPROM_CONFIG 0 +#define USE_STORAGE_CONFIG 1 #define HAS_USB 1 #define USE_USB_STDIO 1 #define HAS_BEEP 1 diff --git a/src/telemetrum-v4.0/ao_telemetrum.c b/src/telemetrum-v4.0/ao_telemetrum.c index 51702cf8..db0fc6a6 100644 --- a/src/telemetrum-v4.0/ao_telemetrum.c +++ b/src/telemetrum-v4.0/ao_telemetrum.c @@ -59,8 +59,6 @@ main(void) ao_ms5607_init(); ao_adxl375_init(); - ao_eeprom_init(); - ao_storage_init(); ao_flight_init(); diff --git a/src/telemetrum-v4.0/telemetrum.c b/src/telemetrum-v4.0/telemetrum.c index 19f5975c..5ad225e9 100644 --- a/src/telemetrum-v4.0/telemetrum.c +++ b/src/telemetrum-v4.0/telemetrum.c @@ -14,6 +14,8 @@ #include #include +#include +#include int main(void) { @@ -21,6 +23,10 @@ int main(void) ao_clock_init(); ao_task_init(); ao_timer_init(); + ao_dma_init(); + ao_exti_init(); + ao_spi_init(); + ao_serial_init(); ao_usb_init(); ao_cmd_init(); ao_start_scheduler();