altoslib: Missed a couple of easy mini voltage API changes

[fw/altos] / src / core / ao_log_metrum.c

diff --git a/src/core/ao_log_metrum.c b/src/core/ao_log_metrum.c
index 9c17eeedb46f699da182b609a8dda5a6d5f29c49..9b17adc2d7c66a45057bbd2348945ff39d5cb9cd 100644 (file)
--- a/src/core/ao_log_metrum.c
+++ b/src/core/ao_log_metrum.c
@@ -81,7 +81,6 @@ void
 ao_log(void)
 {
        __pdata uint16_t        next_sensor, next_other;
-       uint8_t                 i;
 
        ao_storage_setup();
 
@@ -117,7 +116,9 @@ ao_log(void)
                                log.u.sensor.pres = ao_data_ring[ao_log_data_pos].ms5607_raw.pres;
                                log.u.sensor.temp = ao_data_ring[ao_log_data_pos].ms5607_raw.temp;
 #endif
+#if HAS_ACCEL
                                log.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]);
+#endif
                                ao_log_metrum(&log);
                                if (ao_log_state <= ao_flight_coast)
                                        next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT;
@@ -127,8 +128,8 @@ ao_log(void)
                        if ((int16_t) (log.tick - next_other) >= 0) {
                                log.type = AO_LOG_TEMP_VOLT;
                                log.u.volt.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt;
-                               log.u.volt.sense_a = ao_data_ring[ao_log_data_pos].adc.sense[0];
-                               log.u.volt.sense_m = ao_data_ring[ao_log_data_pos].adc.sense[1];
+                               log.u.volt.sense_a = ao_data_ring[ao_log_data_pos].adc.sense_a;
+                               log.u.volt.sense_m = ao_data_ring[ao_log_data_pos].adc.sense_m;
                                ao_log_metrum(&log);
                                next_other = log.tick + AO_OTHER_INTERVAL;
                        }