From e51293d319c6b04ed73bd0c245c938ade5862dd7 Mon Sep 17 00:00:00 2001 From: jaenrig-ifx Date: Thu, 27 Nov 2025 17:55:15 +0100 Subject: [PATCH 1/5] psoc6/Makefile: Using etdevs-query pip installed tool. Signed-off-by: jaenrig-ifx --- ports/psoc6/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/psoc6/Makefile b/ports/psoc6/Makefile index 9d535e95dabbd..4cdaafb0af51a 100644 --- a/ports/psoc6/Makefile +++ b/ports/psoc6/Makefile @@ -223,7 +223,7 @@ endif attached_devs: @: - $(eval ATTACHED_TARGET_LIST = $(shell $(PYTHON) $(TOP)/lib/mpy-test-ext/devs_query.py serial_number $(MULTI_BOARD_DEVS_OPTS))) + $(eval ATTACHED_TARGET_LIST = $(shell etdevs-query serial_number $(MULTI_BOARD_DEVS_OPTS))) $(eval ATTACHED_TARGETS_NUMBER = $(words $(ATTACHED_TARGET_LIST))) $(info Number of attached targets : $(ATTACHED_TARGETS_NUMBER)) $(info List of attached targets : $(ATTACHED_TARGET_LIST)) From 645b5ea067a370587e8c4d9568b1b445f2a90cd2 Mon Sep 17 00:00:00 2001 From: jaenrig-ifx Date: Thu, 27 Nov 2025 17:55:39 +0100 Subject: [PATCH 2/5] tools/ci.sh: Added etdevs pip lib installation. Signed-off-by: jaenrig-ifx --- tools/ci.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci.sh b/tools/ci.sh index 1df1b0c0aa6cf..1d75a4f24a5a4 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -390,6 +390,7 @@ function ci_psoc6_setup { # Required dependency by mpremote.py sudo pip install platformdirs>=4.3.7 + sudo pip install etdevs } function ci_psoc6_build { From 6534f23680040fd3a6303f10f768205ff2deef0b Mon Sep 17 00:00:00 2001 From: jaenrig-ifx Date: Thu, 27 Nov 2025 17:56:18 +0100 Subject: [PATCH 3/5] lib/mpy-test-ext: Updated mpy-test-ext lib. Signed-off-by: jaenrig-ifx --- lib/mpy-test-ext | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mpy-test-ext b/lib/mpy-test-ext index a68c7f43dd94d..14d01cc3fd814 160000 --- a/lib/mpy-test-ext +++ b/lib/mpy-test-ext @@ -1 +1 @@ -Subproject commit a68c7f43dd94d4865564c44256f88e515217ef09 +Subproject commit 14d01cc3fd8142d2432d18be85f6c9854138425c From 59dd93f115f4ded4ddf2f43e7e9355275f041ddb Mon Sep 17 00:00:00 2001 From: jaenrig-ifx Date: Fri, 28 Nov 2025 11:20:36 +0100 Subject: [PATCH 4/5] tools/ci.sh: Install etdevs in psoc6 ci funcs. Signed-off-by: jaenrig-ifx --- tools/ci.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/ci.sh b/tools/ci.sh index 1d75a4f24a5a4..be7202dc0b199 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -389,8 +389,8 @@ function ci_psoc6_setup { docker exec mtb-ci make submodules # Required dependency by mpremote.py - sudo pip install platformdirs>=4.3.7 - sudo pip install etdevs + sudo pip install --updgrade platformdirs>=4.3.7 + sudo pip install --updgrade etdevs } function ci_psoc6_build { @@ -408,6 +408,9 @@ function ci_psoc6_flash_multiple_devices { hex_file=$2 devs_file=$3 + # etdevs will be later directly available in the docker + # As this will be updated frequently currently, we install it each time + docker exec mtb-ci /bin/bash -c "pip install etdevs" docker exec mtb-ci make qdeploy_multi BOARD=${board} EXT_HEX_FILE=../../${hex_file} DEVS_FILE=../../${devs_file} } From c836a08cca56b984ead9cfbc98c78c36f05b8bd9 Mon Sep 17 00:00:00 2001 From: jaenrig-ifx Date: Fri, 28 Nov 2025 11:30:16 +0100 Subject: [PATCH 5/5] tools/ci.sh: Install etdevs in psoc6 ci funcs. Signed-off-by: jaenrig-ifx --- tools/ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci.sh b/tools/ci.sh index be7202dc0b199..c73adca6b0bb7 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -389,8 +389,8 @@ function ci_psoc6_setup { docker exec mtb-ci make submodules # Required dependency by mpremote.py - sudo pip install --updgrade platformdirs>=4.3.7 - sudo pip install --updgrade etdevs + sudo pip install --upgrade platformdirs>=4.3.7 + sudo pip install --upgrade etdevs } function ci_psoc6_build {