From 7d74cc42556e3cf00c9f34ff8681b2fbff12d82e Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 20 Dec 2019 03:00:12 +0100 Subject: [PATCH] ttfw_idf: IDFApp: convert partition offset to int --- tools/ci/python_packages/ttfw_idf/IDFApp.py | 1 + tools/ci/python_packages/ttfw_idf/IDFDUT.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/ci/python_packages/ttfw_idf/IDFApp.py b/tools/ci/python_packages/ttfw_idf/IDFApp.py index 209cfcb07..70677437a 100644 --- a/tools/ci/python_packages/ttfw_idf/IDFApp.py +++ b/tools/ci/python_packages/ttfw_idf/IDFApp.py @@ -308,6 +308,7 @@ class IDFApp(App.BaseApp): _size = int(_size[:-1]) * 1024 * 1024 else: _size = int(_size) + _offset = int(_offset, 0) except ValueError: continue partition_table[_name] = { diff --git a/tools/ci/python_packages/ttfw_idf/IDFDUT.py b/tools/ci/python_packages/ttfw_idf/IDFDUT.py index 3a337b67c..99f7254ac 100644 --- a/tools/ci/python_packages/ttfw_idf/IDFDUT.py +++ b/tools/ci/python_packages/ttfw_idf/IDFDUT.py @@ -226,7 +226,9 @@ class IDFDUT(DUT.SerialDUT): nvs_file = tempfile.TemporaryFile() nvs_file.write(b'\xff' * size) nvs_file.seek(0) - flash_files.append((int(address, 0), nvs_file)) + if not isinstance(address, int): + address = int(address, 0) + flash_files.append((address, nvs_file)) # fake flasher args object, this is a hack until # esptool Python API is improved