mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'feature/oocd_ver_upgrade' into 'master' 

tools: Updates OpenOCD version to 'v0.10.0-esp32-20210902'

See merge request espressif/esp-idf!15054
pull/7554/head
Roland Dobai 2021-09-08 07:34:24 +00:00
rodzic a885c42cda 41ee7738f3
commit 02b6436644
3 zmienionych plików z 28 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
examples/system/app_trace_to_host/example_test.py
Wyświetl plik

@ -12,8 +12,9 @@ def test_examples_app_trace_to_host(env, extra_data):
dut = env.get_dut('app_trace_to_host', rel_project_path)
idf_path = dut.app.get_sdk_path()
proj_path = os.path.join(idf_path, rel_project_path)
oocd_log_path = os.path.join(proj_path, 'openocd.log')
with ttfw_idf.OCDBackend(os.path.join(proj_path, 'openocd.log'), dut.app.target) as ocd:
with ttfw_idf.OCDBackend(oocd_log_path, dut.app.target) as ocd:
dut.start_app()
dut.expect_all('example: Enabling ADC1 on channel 6 / GPIO34.',
'example: Enabling CW generator on DAC channel 1',
@ -27,6 +28,15 @@ def test_examples_app_trace_to_host(env, extra_data):
ocd.apptrace_start('file://adc.log 0 9000 5 0 0')
ocd.apptrace_wait_stop(tmo=30)
with open(oocd_log_path) as oocd_log:
cores = 1 if dut.app.get_sdkconfig().get('CONFIG_FREERTOS_UNICORE', '').replace('"','') == 'y' else 2
params_str = 'App trace params: from {} cores'.format(cores)
for line in oocd_log:
if params_str in line:
break
else:
raise RuntimeError('"{}" could not be found in {}'.format(params_str, oocd_log_path))
with ttfw_idf.CustomProcess(' '.join([os.path.join(idf_path, 'tools/esp_app_trace/logtrace_proc.py'),
'adc.log',
os.path.join(dut.app.binary_path, 'app_trace_to_host.elf')]),

2
tools/test_idf_tools/test_idf_tools.py
Wyświetl plik

@ -58,7 +58,7 @@ XTENSA_ESP32S3_ELF = 'xtensa-esp32s3-elf'
ESP32ULP_VERSION = '2.28.51-esp-20191205'
ESP32S2ULP_VERSION = '2.28.51-esp-20191205'
OPENOCD_VERSION = 'v0.10.0-esp32-20210721'
OPENOCD_VERSION = 'v0.10.0-esp32-20210902'
RISCV_ELF_VERSION = 'esp-2021r1-8.4.0'
XTENSA_ESP32_ELF_VERSION = 'esp-2021r1-8.4.0'
XTENSA_ESP32S2_ELF_VERSION = 'esp-2021r1-8.4.0'

32
tools/tools.json
Wyświetl plik

@ -464,31 +464,31 @@
"versions": [
{
"linux-amd64": {
"sha256": "4a47edaa77c9593856f394a129f5969b786ea0a78a089c11fccb3f2f4cd3ba19",
"size": 1801109,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210721/openocd-esp32-linux64-0.10.0-esp32-20210721.tar.gz"
"sha256": "bd7364b8bf4fa03eebbac7f8aba8632029c34946ee67d451c02182aae8bc38e0",
"size": 1802447,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-linux64-0.10.0-esp32-20210902.tar.gz"
},
"linux-armel": {
"sha256": "5e20031e1df2efd0a4f41925c6a8afda43ddb2327c353e352d5b8eed1e2d836b",
"size": 1833373,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210721/openocd-esp32-armel-0.10.0-esp32-20210721.tar.gz"
"sha256": "32aa83aa815666bdd442751c75d3826132ecd1bf1ac56f8b2a195e28f0ee2128",
"size": 1801394,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-armel-0.10.0-esp32-20210902.tar.gz"
},
"macos": {
"sha256": "2315202693aa35efc78d41bb2db48dd14ae1821a5fd2bb8c2c044908f170648a",
"size": 1909600,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210721/openocd-esp32-macos-0.10.0-esp32-20210721.tar.gz"
"sha256": "0c32e4400edf6c725eb24af8d9ea9395f799c06333db2b87bbd22831467aba54",
"size": 1909909,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-macos-0.10.0-esp32-20210902.tar.gz"
},
"name": "v0.10.0-esp32-20210721",
"name": "v0.10.0-esp32-20210902",
"status": "recommended",
"win32": {
"sha256": "ea9859004f49d7a192f65efa3e3c2ca2434454d5a7834485273673086f18e012",
"size": 2280686,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210721/openocd-esp32-win32-0.10.0-esp32-20210721.zip"
"sha256": "9ad2a5031f498bae20291f3a81f2eb2371b79a1e5b81a2119d911b27a8a7a2e5",
"size": 2281243,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-win32-0.10.0-esp32-20210902.zip"
},
"win64": {
"sha256": "ea9859004f49d7a192f65efa3e3c2ca2434454d5a7834485273673086f18e012",
"size": 2280686,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210721/openocd-esp32-win32-0.10.0-esp32-20210721.zip"
"sha256": "9ad2a5031f498bae20291f3a81f2eb2371b79a1e5b81a2119d911b27a8a7a2e5",
"size": 2281243,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20210902/openocd-esp32-win32-0.10.0-esp32-20210902.zip"
}
}
]