Merge branch 'fix/update_curr_page_state_3.1' into 'release/v3.1'

nvs_util: Set previous page state to FULL before creating new page (v3.1)

See merge request idf/esp-idf!5329

Author: projectgus

components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py

@@ -282,9 +282,6 @@ def write_varlen_binary_data(self, entry_struct, ns_index, key, data, data_size,
             chunk_count = chunk_count + 1
 
             if remaining_size or (tailroom - chunk_size) < Page.SINGLE_ENTRY_SIZE:
-                if page_header[0:4] != Page.FULL:
-                    page_state_full_seq = Page.FULL
-                    struct.pack_into('<I', page_header, 0, page_state_full_seq)
                 nvs_obj.create_new_page()
                 self = nvs_obj.cur_page
 
@@ -463,6 +460,12 @@ def __exit__(self, exc_type, exc_value, traceback):
             self.fout.write(result)
 
     def create_new_page(self):
+        # Set previous page state to FULL before creating new page
+        if self.pages:
+            curr_page_state = struct.unpack('<I', self.cur_page.page_buf[0:4])[0]
+            if curr_page_state == Page.ACTIVE:
+                page_state_full_seq = Page.FULL
+                struct.pack_into('<I', self.cur_page.page_buf, 0, page_state_full_seq)
         self.page_num += 1
         new_page = Page(self.page_num)
         new_page.version = version