altos: Make telemini-v1.0 compile with new ao_data structure

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

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 1e3d8cabc7b94359645ad1594221f5c7923cc27e..f34bc04227e35996d4d48c1970d18d2cad9c9cb1 100644 (file)
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -83,7 +83,7 @@ ao_adc_isr(void) __interrupt 1
 
 #if IGNITE_ON_P0
        /* TeleMini readings */
-       a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].pres);
+       a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.pres);
 #ifdef TELEMINI_V_1_0
        switch (sequence) {
        case 0:

diff --git a/src/core/ao_log_tiny.c b/src/core/ao_log_tiny.c
index d5a3b99f903e111f7058eb9ebb7e4defe5a9dab1..492658ea2d05502aaebe2606ae4a843678964190 100644 (file)
--- a/src/core/ao_log_tiny.c
+++ b/src/core/ao_log_tiny.c
@@ -85,7 +85,7 @@ ao_log(void)
        enum ao_flight_state    ao_log_tiny_state;
        int32_t                 sum;
        int16_t                 count;
-       uint8_t                 ao_log_adc;
+       uint8_t                 ao_log_data;
        uint8_t                 ao_log_started = 0;
 
        ao_storage_setup();
@@ -96,18 +96,18 @@ ao_log(void)
        ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_ASCENT;
        sum = 0;
        count = 0;
-       ao_log_adc = ao_sample_adc;
+       ao_log_data = ao_sample_data;
        last_time = ao_time();
        for (;;) {
 
                /*
                 * Add in pending sample data
                 */
-               ao_sleep(DATA_TO_XDATA(&ao_sample_adc));
-               while (ao_log_adc != ao_sample_adc) {
-                       sum += ao_adc_ring[ao_log_adc].pres;
+               ao_sleep(DATA_TO_XDATA(&ao_sample_data));
+               while (ao_log_data != ao_sample_data) {
+                       sum += ao_data_ring[ao_log_data].adc.pres;
                        count++;
-                       ao_log_adc = ao_adc_ring_next(ao_log_adc);
+                       ao_log_data = ao_data_ring_next(ao_log_data);
                }
                if (ao_log_running) {
                        if (!ao_log_started) {

diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 82ec42a2c0279ce0483ac54e9dc21472c0cbb939..9506eb65319fb3b9fcbc01da1feb3e1b3c5e6593 100644 (file)
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -22,14 +22,14 @@ CORE_SRC = \
        ao_cmd.c \
        ao_config.c \
        ao_convert.c \
-       ao_flight.c \
+       ao_flight_mm.c \
        ao_kalman.c \
        ao_log.c \
        ao_log_tiny.c \
        ao_mutex.c \
        ao_panic.c \
        ao_report.c \
-       ao_sample.c \
+       ao_sample_mm.c \
        ao_stdio.c \
        ao_storage.c \
        ao_task.c \