altos: Fix remaining SPI users to initialize SPI in main

Any product using SPI must initialize the SPI bus along with the
SPI-based drivers.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/ao_ee.c b/src/ao_ee.c
index a67ca12da18dc86a9e052f2b09d4434dc70be88d..36c8a1000c2c582c5dbd2963100723566e2bafe3 100644 (file)
--- a/src/ao_ee.c
+++ b/src/ao_ee.c
@@ -340,6 +340,5 @@ ao_ee_init(void)
        P1DIR |= (1 << EE_CS_INDEX);
        P1SEL &= ~(1 << EE_CS_INDEX);
 
-       ao_spi_init();
        ao_cmd_register(&ao_ee_cmds[0]);
 }

diff --git a/src/ao_flash.c b/src/ao_flash.c
index c3f45ee32c79e9d3e5abb6b8bfd6ba62823e1c93..4f3618ee1ca3214286c00f1230302a8577ca8b31 100644 (file)
--- a/src/ao_flash.c
+++ b/src/ao_flash.c
@@ -455,7 +455,5 @@ ao_ee_init(void)
        FLASH_CS = 1;
        P1DIR |= (1 << FLASH_CS_INDEX);
        P1SEL &= ~(1 << FLASH_CS_INDEX);
-
-       ao_spi_init();
        ao_cmd_register(&ao_flash_cmds[0]);
 }

diff --git a/src/ao_telemetrum.c b/src/ao_telemetrum.c
index fd0adae8f419abd7489ea761dca584be64a32439..1209c820ff3f9f42b49312492ef73d3940f96d9a 100644 (file)
--- a/src/ao_telemetrum.c
+++ b/src/ao_telemetrum.c
@@ -48,6 +48,7 @@ main(void)
        ao_adc_init();
        ao_beep_init();
        ao_cmd_init();
+       ao_spi_init();
        ao_ee_init();
        ao_flight_init();
        ao_log_init();