refactory: flash var naming and calculation

Author: jasonyang-ee

Application/Inc/Flash.hpp

@@ -24,10 +24,10 @@ class Flash {
     bool Init();
 
    private:
-    static constexpr uint8_t page_total = 63;
+    static constexpr uint8_t last_page{63};
     static constexpr uint32_t page_size{0x800};
     static constexpr uint32_t user_pages{3};
-    static constexpr uint32_t address_end{0x08020000 - page_size};
+    static constexpr uint32_t last_page_address{0x08000000 + (last_page * page_size)};
 
     bool Write(Payload payload);
     Payload Read(uint32_t address);

Application/Src/Flash.cpp

@@ -23,14 +23,14 @@ bool Flash::Save() {
 void Flash::Load() {
     std::array<uint32_t, user_pages> write_level{};
     for (uint8_t page = 0; page < user_pages; page++) {
-        write_level[page] = Read(address_end - (page * page_size)).write_counts;
+        write_level[page] = Read(last_page_address - (page * page_size)).write_counts;
     }
 
     // find the (last save) max write count
     auto max_iter = std::max_element(write_level.rbegin(), write_level.rend());
     auto max_index = std::distance(write_level.begin(), max_iter.base()) - 1;
 
-    Payload payload = Read(address_end - (max_index * page_size));
+    Payload payload = Read(last_page_address - (max_index * page_size));
 
     serial.sendString("\nDAC Level: ");
     serial.sendNumber(payload.dac_level);
@@ -51,7 +51,7 @@ bool Flash::Write(Payload payload) {
     // read the write_level of each user page
     std::array<uint32_t, user_pages> write_level{};
     for (uint8_t page = 0; page < user_pages; page++) {
-        write_level[page] = Read(address_end - (page * page_size)).write_counts;
+        write_level[page] = Read(last_page_address - (page * page_size)).write_counts;
     }
 
     // find the min & max write count and the element location
@@ -65,7 +65,7 @@ bool Flash::Write(Payload payload) {
     FLASH_EraseInitTypeDef EraseInitStruct{0};
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.NbPages = 1;
-    EraseInitStruct.Page = page_total - min_index;
+    EraseInitStruct.Page = last_page - min_index;
     EraseInitStruct.Banks = FLASH_BANK_1;
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_SR_ERRORS);
     HAL_FLASH_Unlock();
@@ -76,7 +76,7 @@ bool Flash::Write(Payload payload) {
     }
 
     // write the data to the page
-    uint32_t address = address_end - (min_index * page_size);
+    uint32_t address = last_page_address - (min_index * page_size);
     uint32_t size{sizeof(Payload) / sizeof(uint64_t)};
     uint64_t *data_ptr = reinterpret_cast<uint64_t *>(&payload);
     for (size_t i = 0; i < size; i++) {
@@ -106,7 +106,7 @@ bool Flash::Purge() {
     FLASH_EraseInitTypeDef EraseInitStruct{0};
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.NbPages = user_pages;
-    EraseInitStruct.Page = page_total - user_pages + 1;
+    EraseInitStruct.Page = last_page - user_pages + 1;
     EraseInitStruct.Banks = FLASH_BANK_1;
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_SR_ERRORS);
     HAL_FLASH_Unlock();
@@ -127,7 +127,7 @@ bool Flash::Init() {
     FLASH_EraseInitTypeDef EraseInitStruct{0};
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.NbPages = user_pages;
-    EraseInitStruct.Page = page_total - user_pages + 1;
+    EraseInitStruct.Page = last_page - user_pages + 1;
     EraseInitStruct.Banks = FLASH_BANK_1;
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_SR_ERRORS);
     HAL_FLASH_Unlock();
@@ -142,7 +142,7 @@ bool Flash::Init() {
     uint32_t size{sizeof(Payload) / sizeof(uint64_t)};
     uint64_t *data_ptr = reinterpret_cast<uint64_t *>(&payload);
     for (uint8_t page = 0; page < user_pages; page++) {
-        uint32_t address = address_end - (page * page_size);
+        uint32_t address = last_page_address - (page * page_size);
         for (size_t i = 0; i < size; i++) {
             if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data_ptr[i]) != HAL_OK) {
                 HAL_FLASH_Lock();