From 8db2fd303a78771b150ee8c4b048102ce5716d66 Mon Sep 17 00:00:00 2001 From: Joe Date: Mon, 8 Jul 2024 16:05:21 -0400 Subject: [PATCH] Fix altitude data typing --- STM32Cube/Tasks/trajectory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/STM32Cube/Tasks/trajectory.c b/STM32Cube/Tasks/trajectory.c index 782194a..2a22df7 100644 --- a/STM32Cube/Tasks/trajectory.c +++ b/STM32Cube/Tasks/trajectory.c @@ -268,8 +268,8 @@ Otits_Result_t test_apogeeQueue() { } void trajectory_task(void * argument){ - float prev_time = -1; - uint16_t prev_alt = 0xFFFF; + float prev_time; + int32_t prev_alt = INT_MAX; for(;;) { @@ -279,7 +279,7 @@ void trajectory_task(void * argument){ if(xQueueReceive(altQueue, &altTime, 10) == pdTRUE) { if(xQueuePeek(extQueue, &ext, 10)== pdTRUE) { if(xQueuePeek(angleQueue, &angles, 100) == pdTRUE) { - if(prev_alt != 0xFFFF) { + if(prev_alt != INT_MAX) { float vely = (altTime.alt-prev_alt)*1000.0/(altTime.time-prev_time); float velx = vely*tan(angles.angle.pitch); float apogee = get_max_altitude(vely,velx, altTime.alt, ext, ROCKET_BURNOUT_MASS);