Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/twai_ci_job_pollution_v5.5' into 'release/v5.5'

Browse Source 
fix(ci): twai test close board to fixed ci jobs pullotion (v5.5)

See merge request espressif/esp-idf!49921
This commit is contained in:
morris
2026-07-18 15:51:55 +08:00
parent 15558ba694 436d44260f
commit 502fb705a2
13 changed files with 277 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/driver/test_apps/legacy_twai/pytest_twai.py
+38 -35
View File
@@ -97,22 +97,24 @@ def fixture_create_socket_can() -> Bus:
'target', ['esp32', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32s2', 'esp32s3', 'esp32p4'], indirect=['target']
)
def test_legacy_twai_listen_only(dut: Dut, socket_can: Bus) -> None:
esp_reset_and_wait_ready(dut)
try:
esp_reset_and_wait_ready(dut)
# TEST_CASE("twai_listen_only", "[twai]")
dut.write('"twai_listen_only"')
# TEST_CASE("twai_listen_only", "[twai]")
dut.write('"twai_listen_only"')
# wait the DUT to start listening
time.sleep(0.1)
# wait the DUT to start listening
time.sleep(0.1)
message = Message(
arbitration_id=0x123,
is_extended_id=False,
data=[0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88],
)
socket_can.send(message, timeout=0.2)
dut.expect_unity_test_output()
esp_enter_flash_mode(dut)
message = Message(
arbitration_id=0x123,
is_extended_id=False,
data=[0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88],
)
socket_can.send(message, timeout=0.2)
dut.expect_unity_test_output()
finally:
esp_enter_flash_mode(dut)
@pytest.mark.twai_adapter
@@ -127,30 +129,31 @@ def test_legacy_twai_listen_only(dut: Dut, socket_can: Bus) -> None:
'target', ['esp32', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32s2', 'esp32s3', 'esp32p4'], indirect=['target']
)
def test_legacy_twai_remote_request(dut: Dut, socket_can: Bus) -> None:
esp_reset_and_wait_ready(dut)
try:
esp_reset_and_wait_ready(dut)
# TEST_CASE("twai_remote_request", "[twai]")
dut.write('"twai_remote_request"')
# TEST_CASE("twai_remote_request", "[twai]")
dut.write('"twai_remote_request"')
deadline = time.time() + 2.0
req = None
while time.time() < deadline:
req = socket_can.recv(timeout=0.2)
if req is not None and req.is_remote_frame:
break
deadline = time.time() + 2.0
req = None
while time.time() < deadline:
req = socket_can.recv(timeout=0.2)
if req is not None and req.is_remote_frame:
break
if req is None:
raise Exception('Remote frame not received')
if req is None:
raise Exception('Remote frame not received')
logging.info(f'Received message: {req}')
logging.info(f'Received message: {req}')
reply = Message(
arbitration_id=req.arbitration_id,
is_extended_id=req.is_extended_id,
data=[0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80],
)
socket_can.send(reply, timeout=0.2)
print('send', reply)
reply = Message(
arbitration_id=req.arbitration_id,
is_extended_id=req.is_extended_id,
data=[0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80],
)
socket_can.send(reply, timeout=0.2)
print('send', reply)
dut.expect_unity_test_output()
esp_enter_flash_mode(dut)
dut.expect_unity_test_output()
finally:
esp_enter_flash_mode(dut)
components/driver/twai/twai.c
+2 -1
View File
@@ -818,7 +818,8 @@ esp_err_t twai_receive_v2(twai_handle_t handle, twai_message_t *message, TickTyp
message->extd = header.ide;
message->rtr = header.rtr;
//Set remaining bytes of data to 0
memset(message->data + message->data_length_code, 0, TWAI_FRAME_MAX_LEN - message->data_length_code);
uint8_t data_length = (header.dlc > TWAI_FRAME_MAX_LEN) ? TWAI_FRAME_MAX_LEN : header.dlc;
memset(message->data + data_length, 0, TWAI_FRAME_MAX_LEN - data_length);
return ESP_OK;
}