From 0b870641ff0299b973de815523bdfd3db5be8bbf Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 28 Jan 2022 15:11:07 -0800 Subject: [PATCH] ao_log: Fix sensor time triggers to use AO_TICK_TYPE These values were used to determine when various log information would be recorded. Using the wrong type meant that they would always trigger, causing the log to fill up rapidly with data that should be sampled at a lower rate. Signed-off-by: Keith Packard --- src/kernel/ao_log_metrum.c | 2 +- src/kernel/ao_log_mini.c | 2 +- src/kernel/ao_log_motor.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kernel/ao_log_metrum.c b/src/kernel/ao_log_metrum.c index ae96bd63..915b48ac 100644 --- 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(); diff --git a/src/kernel/ao_log_mini.c b/src/kernel/ao_log_mini.c index 02de1f8a..4bbbe0cb 100644 --- a/src/kernel/ao_log_mini.c +++ b/src/kernel/ao_log_mini.c @@ -34,7 +34,7 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_mini))] ; void ao_log(void) { - uint16_t next_sensor; + AO_TICK_TYPE next_sensor; ao_storage_setup(); diff --git a/src/kernel/ao_log_motor.c b/src/kernel/ao_log_motor.c index 7c866d7e..376cb229 100644 --- a/src/kernel/ao_log_motor.c +++ b/src/kernel/ao_log_motor.c @@ -36,7 +36,7 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_mega))] ; void ao_log(void) { - uint16_t next_sensor; + AO_TICK_TYPE next_sensor; ao_storage_setup(); @@ -67,8 +67,8 @@ ao_log(void) ao_log_data.tick = (uint16_t) tick; if ((AO_TICK_SIGNED) (tick - next_sensor) >= 0) { ao_log_data.type = AO_LOG_SENSOR; - ao_log_data.u.sensor.pressure = ao_data_motor_pressure(&ao_data_ring[ao_log_data_pos]); - ao_log_data.u.sensor.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt; + ao_log_data.u.sensor.pressure = (uint16_t) ao_data_motor_pressure(&ao_data_ring[ao_log_data_pos]); + ao_log_data.u.sensor.v_batt = (uint16_t) ao_data_ring[ao_log_data_pos].adc.v_batt; ao_log_data.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]); ao_log_data.u.sensor.accel_across = ao_data_across(&ao_data_ring[ao_log_data_pos]); ao_log_data.u.sensor.accel_along = ao_data_along(&ao_data_ring[ao_log_data_pos]); -- 2.30.2