From 1f25533a3c370b484ee38be848129000a7e3686f Mon Sep 17 00:00:00 2001 From: Will Hedgecock Date: Thu, 27 Jun 2024 09:42:09 -0500 Subject: [PATCH] Re-order storage stubs same as header file --- software/firmware/src/peripherals/src/storage.c | 9 ++++----- software/firmware/src/tasks/app_task_ranging.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/software/firmware/src/peripherals/src/storage.c b/software/firmware/src/peripherals/src/storage.c index 9e291db9..308e2a83 100644 --- a/software/firmware/src/peripherals/src/storage.c +++ b/software/firmware/src/peripherals/src/storage.c @@ -780,16 +780,15 @@ void storage_init(void) {} void storage_deinit(void) {} void storage_disable(bool disable) {} void storage_store_experiment_details(const experiment_details_t *details) {} +void storage_retrieve_experiment_details(experiment_details_t *details) { memset(details, 0, sizeof(*details)); }; void storage_store(const void *data, uint32_t data_length) {} void storage_flush(bool write_partial_pages) {} -void storage_retrieve_experiment_details(experiment_details_t *details) { memset(details, 0, sizeof(*details)); }; -void storage_begin_reading(uint32_t) {} +void storage_begin_reading(uint32_t starting_timestamp) {} void storage_end_reading(void) {} void storage_enter_maintenance_mode(void){} void storage_exit_maintenance_mode(void) {} -uint32_t storage_retrieve_data_length(void) { return 0; } +uint32_t storage_retrieve_num_data_chunks(uint32_t ending_timestamp) { return 0; } +uint32_t storage_retrieve_num_data_bytes(void) { return 0; } uint32_t storage_retrieve_next_data_chunk(uint8_t *buffer) { return 0; } -uint32_t storage_retrieve_num_data_chunks(uint32_t) {return 0; } -uint32_t storage_retrieve_num_data_bytes(void) {return 0;} #endif // #if REVISION_ID != REVISION_APOLLO4_EVB && !defined(_TEST_NO_STORAGE) diff --git a/software/firmware/src/tasks/app_task_ranging.c b/software/firmware/src/tasks/app_task_ranging.c index fa8b1be4..c361b11c 100644 --- a/software/firmware/src/tasks/app_task_ranging.c +++ b/software/firmware/src/tasks/app_task_ranging.c @@ -178,7 +178,7 @@ static void handle_notification(app_notification_t notification) buzzer_indicate_location(); vTaskDelay(pdMS_TO_TICKS(1000)); } - #ifdef __USE_SEGGER__ +#ifdef __USE_SEGGER__ if ((notification & APP_NOTIFY_DOWNLOAD_SEGGER_LOG)) { // Define log file transmission variables