From 3dd1a63d40af392515073cdb3ab16849fd4d7903 Mon Sep 17 00:00:00 2001 From: Will Hedgecock Date: Wed, 30 Oct 2024 17:20:09 -0500 Subject: [PATCH] More timestamp search updates --- software/firmware/src/peripherals/src/storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/firmware/src/peripherals/src/storage.c b/software/firmware/src/peripherals/src/storage.c index 6628cb3b..e935a5cd 100644 --- a/software/firmware/src/peripherals/src/storage.c +++ b/software/firmware/src/peripherals/src/storage.c @@ -619,7 +619,7 @@ void storage_begin_reading(uint32_t starting_timestamp, uint32_t ending_timestam { const uint32_t potential_timestamp1 = *(uint32_t*)(transfer_buffer + 5 + i); const uint32_t potential_timestamp2 = *(uint32_t*)(transfer_buffer + 14 + i); - if ((transfer_buffer[4 + i] == STORAGE_TYPE_VOLTAGE) && ((potential_timestamp1 % 500) == 0) && transfer_buffer[13 + i] && (transfer_buffer[13 + i] < STORAGE_NUM_TYPES) && ((potential_timestamp2 % 500) == 0) && (potential_timestamp1 < ending_timestamp)) + if ((transfer_buffer[4 + i] == STORAGE_TYPE_VOLTAGE) && ((potential_timestamp1 % 500) == 0) && transfer_buffer[13 + i] && (transfer_buffer[13 + i] < STORAGE_NUM_TYPES) && ((potential_timestamp2 % 500) == 0) && (potential_timestamp1 < ending_timestamp) && ((potential_timestamp2 - potential_timestamp1) <= 600000)) { found_valid_timestamp = true; if (potential_timestamp1 >= starting_timestamp) @@ -692,7 +692,7 @@ uint32_t storage_retrieve_num_data_chunks(uint32_t ending_timestamp) { const uint32_t potential_timestamp1 = *(uint32_t*)(transfer_buffer + 5 + i); const uint32_t potential_timestamp2 = *(uint32_t*)(transfer_buffer + 14 + i); - if ((transfer_buffer[4 + i] == STORAGE_TYPE_VOLTAGE) && ((potential_timestamp1 % 500) == 0) && transfer_buffer[13 + i] && (transfer_buffer[13 + i] < STORAGE_NUM_TYPES) && ((potential_timestamp2 % 500) == 0)) + if ((transfer_buffer[4 + i] == STORAGE_TYPE_VOLTAGE) && ((potential_timestamp1 % 500) == 0) && transfer_buffer[13 + i] && (transfer_buffer[13 + i] < STORAGE_NUM_TYPES) && ((potential_timestamp2 % 500) == 0) && ((potential_timestamp2 - potential_timestamp1) <= 600000)) { found_valid_timestamp = true; if (potential_timestamp1 > ending_timestamp)