Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

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

diff --git a/src/kernel/ao_log_metrum.c b/src/kernel/ao_log_metrum.c
index 8091e6c63ccd5b9a504f77f2ad7a4ce646d695b1..915b48acb349b4c7a78a69e2d3aebbd6a25b4381 100644 (file)
--- a/src/kernel/ao_log_metrum.c
+++ b/src/kernel/ao_log_metrum.c
@@ -36,7 +36,7 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_metrum))] ;
 void
 ao_log(void)
 {
-       uint16_t        next_sensor, next_other;
+       AO_TICK_TYPE    next_sensor, next_other;
 
        ao_storage_setup();
 
@@ -47,7 +47,7 @@ ao_log(void)
 
 #if HAS_FLIGHT
        ao_log_data.type = AO_LOG_FLIGHT;
-       ao_log_data.tick = ao_sample_tick;
+       ao_log_data.tick = (uint16_t) ao_sample_tick;
 #if HAS_ACCEL
        ao_log_data.u.flight.ground_accel = ao_ground_accel;
 #endif
@@ -66,7 +66,7 @@ ao_log(void)
                /* Write samples to EEPROM */
                while (ao_log_data_pos != ao_data_head) {
                        AO_TICK_TYPE tick = ao_data_ring[ao_log_data_pos].tick;
-                       ao_log_data.tick = tick;
+                       ao_log_data.tick = (uint16_t) tick;
                        if ((AO_TICK_SIGNED) (tick - next_sensor) >= 0) {
                                ao_log_data.type = AO_LOG_SENSOR;
 #if HAS_MS5607
@@ -97,7 +97,7 @@ ao_log(void)
                if (ao_flight_state != ao_log_state) {
                        ao_log_state = ao_flight_state;
                        ao_log_data.type = AO_LOG_STATE;
-                       ao_log_data.tick = ao_time();
+                       ao_log_data.tick = (uint16_t) ao_time();
                        ao_log_data.u.state.state = ao_log_state;
                        ao_log_data.u.state.reason = 0;
                        ao_log_write(&ao_log_data);