X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_flight.c;fp=src%2Fkernel%2Fao_flight.c;h=cee8b2b8b38d008c16460b5c293b8c4b326c005d;hp=8553ccc5854f8f4d27569e1ae8928aaf7fef63da;hb=c49bd3cb0c31a51fae79ddc92237cc309be9a242;hpb=d225adc3af9e5726d436cbbdbf8dcc5837e50804 diff --git a/src/kernel/ao_flight.c b/src/kernel/ao_flight.c index 8553ccc5..cee8b2b8 100644 --- a/src/kernel/ao_flight.c +++ b/src/kernel/ao_flight.c @@ -63,7 +63,7 @@ uint8_t ao_sensor_errors; * track min/max data over a long interval to detect * resting */ -static uint16_t ao_interval_end; +static AO_TICK_TYPE ao_interval_end; #ifdef HAS_BARO static ao_v_t ao_interval_min_height; static ao_v_t ao_interval_max_height; @@ -272,7 +272,7 @@ ao_flight(void) * (15 seconds) has past. */ if ((ao_accel < AO_MSS_TO_ACCEL(-2.5)) || - (AO_TICK_SIGNED) (ao_sample_tick - ao_boost_tick) > BOOST_TICKS_MAX) + (AO_TICK_SIGNED) (ao_sample_tick - ao_boost_tick) > (AO_TICK_SIGNED) BOOST_TICKS_MAX) { #if HAS_ACCEL #if HAS_BARO @@ -320,7 +320,7 @@ ao_flight(void) */ if (ao_config.apogee_lockout) { if ((AO_TICK_SIGNED) (ao_sample_tick - ao_launch_tick) < - AO_SEC_TO_TICKS(ao_config.apogee_lockout)) + (AO_TICK_SIGNED) AO_SEC_TO_TICKS(ao_config.apogee_lockout)) break; }