From 52f077568dcbff0b96e9920f40af4b83f4ee8cbc Mon Sep 17 00:00:00 2001 From: pmoegenburg Date: Tue, 4 Jun 2024 16:40:17 -0400 Subject: [PATCH] merge issue fix --- include/sensors/core/tasks/pressure_driver.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sensors/core/tasks/pressure_driver.hpp b/include/sensors/core/tasks/pressure_driver.hpp index cea4cc8d2..d77f2651f 100644 --- a/include/sensors/core/tasks/pressure_driver.hpp +++ b/include/sensors/core/tasks/pressure_driver.hpp @@ -361,9 +361,9 @@ class MMR920 { if (echo_this_time) { auto response_pressure = pressure - current_pressure_baseline_pa; #ifdef USE_SENSOR_MOVE - if (pressure_buffer_index < SENSOR_BUFFER_SIZE) { - (*p_buff).at(pressure_buffer_index) = response_pressure; - pressure_buffer_index++; + if (sensor_buffer_index < SENSOR_BUFFER_SIZE) { + (*p_buff).at(sensor_buffer_index) = response_pressure; + sensor_buffer_index++; } #else can_client.send_can_message(