Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
nvs_part_util: Fix Readme and disable multipage blob by default

See merge request idf/esp-idf!4631
This commit is contained in:
Angus Gratton 2019-04-02 14:35:38 +08:00
parent c278dcb707 abb114475f
commit 12a29f1a43
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/nvs_flash/nvs_partition_generator/README.rst
View file

@ -56,8 +56,8 @@ When a new namespace entry is encountered in the CSV file, each follow-up entrie
Multipage Blob Support
----------------------
By default, binary blobs are allowed to span over multiple pages and written in the format mentioned in section :ref:`structure_of_entry`.
If older format is intended to be used, the utility provides an option to disable this feature.
By default, binary blobs are not allowed to span over multiple pages as written in the format mentioned in section :ref:`structure_of_entry`.
If this format is intended to be used, the utility provides an option to enable this feature.
Encryption Support
-------------------
@ -123,8 +123,6 @@ A sample CSV file is provided with the utility::
+------------------------+----------------------------------------------------------------------------------------------+
| output | Path to output converted binary file. Will use stdout if omitted |
+------------------------+----------------------------------------------------------------------------------------------+
| size | Size of NVS Partition in KB. Eg. 12KB |
+------------------------+----------------------------------------------------------------------------------------------+
| --version {v1,v2} | Set version. Default: v2 |
+-------------------------------+---------------------------------------------------------------------------------------+
| --keygen {True,False} | Generate keys for encryption. Default: False |

2
components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
View file

@ -674,7 +674,7 @@ def main():
"--version",
help='Set version. Default: v2',
choices=['v1','v2'],
default='v2')
default='v1')
parser.add_argument(
"--keygen",

4
components/nvs_flash/test_nvs_host/test_nvs.cpp
View file

@ -2418,7 +2418,9 @@ TEST_CASE("test nvs apis for nvs partition generator utility with encryption ena
"--encrypt",
"True",
"--keyfile",
"../nvs_partition_generator/testdata/encryption_keys.txt",NULL));
"../nvs_partition_generator/testdata/encryption_keys.txt",
"--version",
"v2",NULL));
} else {
CHECK(childpid > 0);
int status;