Merge branch 'bug_fix/multipage_blob_support' into 'master'

nvs_util: Fix generation of multipage blob data format

See merge request idf/esp-idf!3349
This commit is contained in:
Angus Gratton 2018-09-25 08:01:57 +08:00
commit 6ed00f50be

View File

@ -285,7 +285,7 @@ class Page(object):
elif encoding in ["hex2bin", "binary", "base64"]: elif encoding in ["hex2bin", "binary", "base64"]:
entry_struct[1] = Page.BLOB entry_struct[1] = Page.BLOB
if version == Page.VERSION2 and encoding == "binary" or encoding == "hex2bin" or encoding == "base64": if version == Page.VERSION2 and (encoding in ["hex2bin", "binary", "base64"]):
entry_struct = self.write_varlen_binary_data(entry_struct,ns_index,key,data,\ entry_struct = self.write_varlen_binary_data(entry_struct,ns_index,key,data,\
datalen,total_entry_count, nvs_obj) datalen,total_entry_count, nvs_obj)
else: else: