Revert page index changes (wrong calculation)

lab11 · Dec 21, 2023 · 0848242 · 0848242
1 parent 650c4ed
commit 0848242
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/software/firmware/src/peripherals/src/storage.c b/software/firmware/src/peripherals/src/storage.c
@@ -462,15 +462,15 @@ void storage_init(void)
                   uint16_t len = *(uint16_t*)(transfer_buffer+2);
                   if (len < MEMORY_NUM_DATA_BYTES_PER_PAGE)
                   {
-                     current_page += i;
+                     current_page = (current_page - MEMORY_PAGES_PER_BLOCK) + i;
                      cache_index = len;
                      memcpy(cache, transfer_buffer + 4, len);
                      break;
                   }
                }
                else
                {
-                  current_page += i;
+                  current_page = (current_page - MEMORY_PAGES_PER_BLOCK) + i;
                   break;
                }
          }

diff --git a/software/firmware/src/tasks/app_task_maintenance.c b/software/firmware/src/tasks/app_task_maintenance.c
@@ -37,6 +37,7 @@ static void handle_notification(app_notification_t notification)
 static void battery_event_handler(battery_event_t battery_event)
 {
    // Notify the app of a change in the plugged-in status of the device
+   print("INFO: Battery event occurred: %d\n", (uint32_t)battery_event);
    if ((battery_event == BATTERY_PLUGGED) || (battery_event == BATTERY_UNPLUGGED))
    {
       BaseType_t xHigherPriorityTaskWoken = pdFALSE;

diff --git a/software/firmware/src/tasks/app_task_ranging.c b/software/firmware/src/tasks/app_task_ranging.c
@@ -164,6 +164,7 @@ static void battery_event_handler(battery_event_t battery_event)
 {
    // Store the battery event to non-volatile memory and notify the app
    storage_write_charging_event(battery_event);
+   print("INFO: Battery event occurred: %d\n", (uint32_t)battery_event);
    if ((battery_event == BATTERY_PLUGGED) || (battery_event == BATTERY_UNPLUGGED))
       app_notify(APP_NOTIFY_BATTERY_EVENT, true);
 }