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-20200709'

See merge request espressif/esp-idf!8926
pull/5688/head
Ivan Grokhotkov 2020-07-23 04:02:52 +08:00
rodzic 8b819a8de8 0e3c7918e4
commit 31bcdfffc4
3 zmienionych plików z 27 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -16,7 +16,6 @@ def test_examples_app_trace_to_host(env, extra_data):
dut.start_app()
dut.expect_all('example: Enabling ADC1 on channel 6 / GPIO34.',
'example: Enabling CW generator on DAC channel 1',
'example: Custom divider of RTC 8 MHz clock has been set.',
'example: Sampling ADC and sending data to the host...',
re.compile(r'example: Collected \d+ samples in 20 ms.'),
'example: Sampling ADC and sending data to the UART...',
@ -24,10 +23,8 @@ def test_examples_app_trace_to_host(env, extra_data):
re.compile(r'example: Collected \d+ samples in 20 ms.'),
timeout=20)
response = ocd.cmd_exec('esp apptrace start file://adc.log 0 9000 5 0 0')
with open(os.path.join(proj_path, 'telnet.log'), 'w') as f:
f.write(response)
assert('Data: blocks incomplete 0, lost bytes: 0' in response)
ocd.apptrace_start("file://adc.log 0 9000 5 0 0")
ocd.apptrace_wait_stop(tmo=30)
with ttfw_idf.CustomProcess(' '.join([os.path.join(idf_path, 'tools/esp_app_trace/logtrace_proc.py'),
'adc.log',

9
tools/ci/python_packages/ttfw_idf/DebugUtils.py
Wyświetl plik

@ -82,6 +82,15 @@ class OCDBackend(object):
def cmd_exec(self, cmd):
return self.oocd.cmd_exec(cmd)
def apptrace_start(self, trace_args):
self.oocd.apptrace_start(trace_args)
def apptrace_stop(self):
self.oocd.apptrace_stop()
def apptrace_wait_stop(self, tmo=10):
self.oocd.apptrace_wait_stop(tmo=tmo)
class GDBBackend(object):
def __init__(self, logfile_path, elffile_path, target, gdbinit_path=None, working_dir=None):

32
tools/tools.json
Wyświetl plik

@ -378,31 +378,31 @@
"versions": [
{
"linux-amd64": {
"sha256": "55755f03ed76cbd2fddb4bc2d85327b95e1a5c728bfacb77af08bf26e65a3628",
"size": 1728177,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-linux64-0.10.0-esp32-20200420.tar.gz"
"sha256": "77a232510625c23489d9bf1b17bdadf56e95acf8f50ef8ebff51477f23c21ef0",
"size": 1729401,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-linux64-0.10.0-esp32-20200709.tar.gz"
},
"linux-armel": {
"sha256": "dbe2f78be0f15c5e5ff9ac9e445c9cf6a9a6be31f0038c4e1822960fcd8ad615",
"size": 1777775,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-armel-0.10.0-esp32-20200420.tar.gz"
"sha256": "b2cc6b7837f3cac23a752a8c43c6e0b19701ee0ec1eca4896833f0e82746062e",
"size": 1778274,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-armel-0.10.0-esp32-20200709.tar.gz"
},
"macos": {
"sha256": "a5bb0389e355c58f593a460aea2e41f0c07f9f1bb2bc08101914bb37017271c9",
"size": 1811349,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-macos-0.10.0-esp32-20200420.tar.gz"
"sha256": "97cf84dd3dfb129a7d4842599870a3b0dbb40b2713d3c5153738c44907e85d6e",
"size": 1811755,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-macos-0.10.0-esp32-20200709.tar.gz"
},
"name": "v0.10.0-esp32-20200420",
"name": "v0.10.0-esp32-20200709",
"status": "recommended",
"win32": {
"sha256": "3d13feca3e7e16b8442069aec8267e6bf12de489a29647df760a1da6c33d7f2e",
"size": 2150749,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-win32-0.10.0-esp32-20200420.zip"
"sha256": "b96b95607ca0c5899427f5b88cda7389da11f53ac857d3d2fe467e571af5137e",
"size": 2152463,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-win32-0.10.0-esp32-20200709.zip"
},
"win64": {
"sha256": "3d13feca3e7e16b8442069aec8267e6bf12de489a29647df760a1da6c33d7f2e",
"size": 2150749,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200420/openocd-esp32-win32-0.10.0-esp32-20200420.zip"
"sha256": "b96b95607ca0c5899427f5b88cda7389da11f53ac857d3d2fe467e571af5137e",
"size": 2152463,
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.10.0-esp32-20200709/openocd-esp32-win32-0.10.0-esp32-20200709.zip"
}
}
]