nvs_util: Add support to include comments in csv file

Closes https://github.com/espressif/esp-idf/issues/2965

(cherry picked from commit 66e38e9bac44e2d4dad071844e78c973405d658d)

diff --git a/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py b/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
index be50d460808a33a0c95735b20d48f0ed4a3b7b05..07c9af49eeba2de5103a268b026272b2372373e6 100755 (executable)
--- a/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
+++ b/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
@@ -752,7 +752,7 @@ def nvs_part_gen(input_filename=None, output_filename=None, input_part_size=None
         output_file = open(output_filename, 'wb')
 
         with nvs_open(output_file, input_size) as nvs_obj:
-            reader = csv.DictReader(input_file, delimiter=',')
+            reader = csv.DictReader(filter(lambda row: row[0] != '#',input_file), delimiter=',')
             for row in reader:
                 try:
                     write_entry(nvs_obj, row["key"], row["type"], row["encoding"], row["value"])

diff --git a/components/nvs_flash/nvs_partition_generator/sample_multipage_blob.csv b/components/nvs_flash/nvs_partition_generator/sample_multipage_blob.csv
index 384ac6919ead0a2bfd12b2d104700a574c4f5734..e9546cb41239622424d0addac38d142415cef07d 100644 (file)
--- a/components/nvs_flash/nvs_partition_generator/sample_multipage_blob.csv
+++ b/components/nvs_flash/nvs_partition_generator/sample_multipage_blob.csv
@@ -1,3 +1,4 @@
+# Sample csv file
 key,type,encoding,value
 dummyNamespace,namespace,,
 dummyU8Key,data,u8,127

diff --git a/components/nvs_flash/nvs_partition_generator/sample_singlepage_blob.csv b/components/nvs_flash/nvs_partition_generator/sample_singlepage_blob.csv
index c99f513cf2595e0c0911d2994f2b8073e6e549f6..10d3cc635e71756635a1f617eaa214d875cb61b5 100644 (file)
--- a/components/nvs_flash/nvs_partition_generator/sample_singlepage_blob.csv
+++ b/components/nvs_flash/nvs_partition_generator/sample_singlepage_blob.csv
@@ -1,3 +1,4 @@
+# Sample csv file
 key,type,encoding,value
 dummyNamespace,namespace,,
 dummyU8Key,data,u8,127