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 <keithp@keithp.com>

diff --git a/src/telemetrum-v4.0/Makefile b/src/telemetrum-v4.0/Makefile
index 4113bd420bbbd0a12eb0b9763ff0cfbea1bc61c1..5191640754ef55da8be8a4430fb74d16b84a2bf8 100644 (file)
--- 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 d1573d58f20dc01bb8295d830f267e8af6a5247e..2245a88ffcdb07f9111ee7f08a54d3cde79c0819 100644 (file)
--- 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 51702cf8e4eedf26409441499e0568c3bb552d89..db0fc6a60ab2fde42a6b799cda10569472e9e02a 100644 (file)
--- 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 19f5975cb3cafb586f887d1092dabb84b702948d..5ad225e970cd0f47be42a4c3d57463869dc634ad 100644 (file)
--- a/src/telemetrum-v4.0/telemetrum.c
+++ b/src/telemetrum-v4.0/telemetrum.c
@@ -14,6 +14,8 @@
 
 #include <ao.h>
 #include <ao_led.h>
+#include <ao_dma_samd21.h>
+#include <ao_exti.h>
 
 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();