From 66e38e9bac44e2d4dad071844e78c973405d658d Mon Sep 17 00:00:00 2001 From: Shivani Tipnis Date: Mon, 1 Apr 2019 15:25:20 +0530 Subject: [PATCH] nvs_util: Add support to include comments in csv file Closes https://github.com/espressif/esp-idf/issues/2965 --- .../nvs_flash/nvs_partition_generator/nvs_partition_gen.py | 2 +- .../nvs_flash/nvs_partition_generator/sample_multipage_blob.csv | 1 + .../nvs_partition_generator/sample_singlepage_blob.csv | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 be50d4608..07c9af49e 100755 --- 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 384ac6919..e9546cb41 100644 --- 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 c99f513cf..10d3cc635 100644 --- 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