feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'contrib/github_pr_14159' into 'master'

Browse Source 
fix(tool/mfg_gen) allow encodings u64 and i64 (GitHub PR)

Closes IDFGH-13224
Closes https://github.com/espressif/esp-idf/pull/14159

See merge request espressif/esp-idf!32175
This commit is contained in:
Mahavir Jain
2024-07-19 13:58:41 +08:00
parent 7042068519 5f1916f8e7
commit 1c351e5194
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/mass_mfg/mfg_gen.py
View File

@@ -3,13 +3,12 @@
# SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
import argparse import argparse
import csv import csv
import distutils.dir_util
import os import os
from itertools import zip_longest from itertools import zip_longest
import distutils.dir_util
import esp_idf_nvs_partition_gen.nvs_partition_gen as nvs_partition_gen import esp_idf_nvs_partition_gen.nvs_partition_gen as nvs_partition_gen
@@ -72,7 +71,7 @@ def verify_keys_exist(values_file_keys, input_config_file):
def verify_datatype_encoding(input_config_file): def verify_datatype_encoding(input_config_file):
""" Verify datatype and encodings from config file is valid """ Verify datatype and encodings from config file is valid
""" """
valid_encodings = {'string', 'binary', 'hex2bin','u8', 'i8', 'u16', 'u32', 'i32','base64'} valid_encodings = {'string', 'binary', 'hex2bin','u8', 'i8', 'u16', 'u32', 'i32', 'u64', 'i64','base64'}
valid_datatypes = {'file','data','namespace'} valid_datatypes = {'file','data','namespace'}
with open(input_config_file,'r') as config_file: with open(input_config_file,'r') as config_file:

2
tools/mass_mfg/samples/sample_config.csv
View File

@@ -4,6 +4,8 @@ dummyI8Key,data,i8
dummyU16Key,data,u16 dummyU16Key,data,u16
dummyU32Key,data,u32 dummyU32Key,data,u32
dummyI32Key,data,i32,REPEAT dummyI32Key,data,i32,REPEAT
dummyU64Key,data,u64
dummyI64Key,data,i64
dummyStringKey,data,string dummyStringKey,data,string
dummyHex2BinKey,data,hex2bin dummyHex2BinKey,data,hex2bin
dummyBase64Key,data,base64 dummyBase64Key,data,base64
1 dummyNamespace,namespace,
4 dummyU16Key,data,u16
5 dummyU32Key,data,u32
6 dummyI32Key,data,i32,REPEAT
7 dummyU64Key,data,u64
8 dummyI64Key,data,i64
9 dummyStringKey,data,string
10 dummyHex2BinKey,data,hex2bin
11 dummyBase64Key,data,base64

8
tools/mass_mfg/samples/sample_values_multipage_blob.csv
View File

@@ -1,4 +1,4 @@
id,dummyU8Key,dummyI8Key,dummyU16Key,dummyU32Key,dummyI32Key,dummyStringKey,dummyHex2BinKey,dummyBase64Key,hexFileKey,base64FileKey,stringFileKey,blobFileAKey,blobFileBKey,binFileKey id,dummyU8Key,dummyI8Key,dummyU16Key,dummyU32Key,dummyI32Key,dummyU64Key,dummyI64Key,dummyStringKey,dummyHex2BinKey,dummyBase64Key,hexFileKey,base64FileKey,stringFileKey,blobFileAKey,blobFileBKey,binFileKey
1,127,-128,32768,4294967295,-2147483648,0A:0B:0C:0D:0E:0F,010203abcdef,MTIzYWJj,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_multipage_blob.bin 1,127,-128,32768,4294967295,-2147483648,1125899906842624,1125899906842624,0A:0B:0C:0D:0E:0F,010203abcdef,MTIzYWJj,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_multipage_blob.bin
2,126,-127,32767,4294967294,,A0:B0:C0:D0:E0:F0,102030abcdef,MTIzYWFh,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_multipage_blob.bin 2,126,-127,32767,4294967294,,1125899906842624,-1125899906842624,A0:B0:C0:D0:E0:F0,102030abcdef,MTIzYWFh,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_multipage_blob.bin
3,125,-126,32766,4294967293,,00:B3:C4:BD:E2:0F,010203efcdab,MTIzYmJi,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_multipage_blob.bin 3,125,-126,32766,4294967293,,1125899906842624,-1125899906842624,00:B3:C4:BD:E2:0F,010203efcdab,MTIzYmJi,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_multipage_blob.bin
1 id dummyU8Key dummyI8Key dummyU16Key dummyU32Key dummyI32Key dummyU64Key dummyI64Key dummyStringKey dummyHex2BinKey dummyBase64Key hexFileKey base64FileKey stringFileKey blobFileAKey blobFileBKey binFileKey
2 1 127 -128 32768 4294967295 -2147483648 1125899906842624 1125899906842624 0A:0B:0C:0D:0E:0F 010203abcdef MTIzYWJj testdata/sample.hex testdata/sample.base64 testdata/sample.txt testdata/sample_blob.bin testdata/sample_blob.bin testdata/sample_multipage_blob.bin
3 2 126 -127 32767 4294967294 1125899906842624 -1125899906842624 A0:B0:C0:D0:E0:F0 102030abcdef MTIzYWFh testdata/sample.hex testdata/sample.base64 testdata/sample.txt testdata/sample_blob.bin testdata/sample_blob.bin testdata/sample_multipage_blob.bin
4 3 125 -126 32766 4294967293 1125899906842624 -1125899906842624 00:B3:C4:BD:E2:0F 010203efcdab MTIzYmJi testdata/sample.hex testdata/sample.base64 testdata/sample.txt testdata/sample_blob.bin testdata/sample_blob.bin testdata/sample_multipage_blob.bin

8
tools/mass_mfg/samples/sample_values_singlepage_blob.csv
View File

@@ -1,4 +1,4 @@
id,dummyU8Key,dummyI8Key,dummyU16Key,dummyU32Key,dummyI32Key,dummyStringKey,dummyHex2BinKey,dummyBase64Key,hexFileKey,base64FileKey,stringFileKey,blobFileAKey,blobFileBKey,binFileKey id,dummyU8Key,dummyI8Key,dummyU16Key,dummyU32Key,dummyI32Key,dummyU64Key,dummyI64Key,dummyStringKey,dummyHex2BinKey,dummyBase64Key,hexFileKey,base64FileKey,stringFileKey,blobFileAKey,blobFileBKey,binFileKey
1,127,-128,32768,4294967295,-2147483648,0A:0B:0C:0D:0E:0F,010203abcdef,MTIzYWJj,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_singlepage_blob.bin 1,127,-128,32768,4294967295,-2147483648,1125899905842624,-1125899906742624,0A:0B:0C:0D:0E:0F,010203abcdef,MTIzYWJj,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_singlepage_blob.bin
2,126,-127,32767,4294967294,,A0:B0:C0:D0:E0:F0,102030abcdef,MTIzYWFh,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_singlepage_blob.bin 2,126,-127,32767,4294967294,,1125899906842600,-1125899906842614,A0:B0:C0:D0:E0:F0,102030abcdef,MTIzYWFh,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_singlepage_blob.bin
3,125,-126,32766,4294967293,,00:B3:C4:BD:E2:0F,010203efcdab,MTIzYmJi,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_singlepage_blob.bin 3,125,-126,32766,4294967293,,1125899906842624,-1125899906843524,00:B3:C4:BD:E2:0F,010203efcdab,MTIzYmJi,testdata/sample.hex,testdata/sample.base64,testdata/sample.txt,testdata/sample_blob.bin,testdata/sample_blob.bin,testdata/sample_singlepage_blob.bin
1 id dummyU8Key dummyI8Key dummyU16Key dummyU32Key dummyI32Key dummyU64Key dummyI64Key dummyStringKey dummyHex2BinKey dummyBase64Key hexFileKey base64FileKey stringFileKey blobFileAKey blobFileBKey binFileKey
2 1 127 -128 32768 4294967295 -2147483648 1125899905842624 -1125899906742624 0A:0B:0C:0D:0E:0F 010203abcdef MTIzYWJj testdata/sample.hex testdata/sample.base64 testdata/sample.txt testdata/sample_blob.bin testdata/sample_blob.bin testdata/sample_singlepage_blob.bin
3 2 126 -127 32767 4294967294 1125899906842600 -1125899906842614 A0:B0:C0:D0:E0:F0 102030abcdef MTIzYWFh testdata/sample.hex testdata/sample.base64 testdata/sample.txt testdata/sample_blob.bin testdata/sample_blob.bin testdata/sample_singlepage_blob.bin
4 3 125 -126 32766 4294967293 1125899906842624 -1125899906843524 00:B3:C4:BD:E2:0F 010203efcdab MTIzYmJi testdata/sample.hex testdata/sample.base64 testdata/sample.txt testdata/sample_blob.bin testdata/sample_blob.bin testdata/sample_singlepage_blob.bin