Skip to content

makefiles/usb_board_reset.mk: declare term-delay target with test target#19878

Merged
bors[bot] merged 1 commit intoRIOT-OS:masterfrom
aabadie:pr/make/term-delay-test-fix
Aug 21, 2023
Merged

makefiles/usb_board_reset.mk: declare term-delay target with test target#19878
bors[bot] merged 1 commit intoRIOT-OS:masterfrom
aabadie:pr/make/term-delay-test-fix

Conversation

@aabadie
Copy link
Copy Markdown
Contributor

@aabadie aabadie commented Aug 11, 2023

Contribution description

While testing #19726 on adafruit-clue I noticed that the test target was broken because on this kind of board (with an integrated bootloader and stdio over usb) it expects the term-delay to be defined and without this PR it fails.

Testing procedure

make test works on adafruit-clue and similar boards.

master: 
$ BUILD_IN_DOCKER=1 RIOT_CI_BUILD=1 BOARD=adafruit-clue make -C tests/periph/cpuid/ flash test --no-print-directory 
Launching build container using image "docker.io/riot/riotbuild:latest".
docker run --rm --tty --user $(id -u) -v '/usr/share/zoneinfo/Europe/Paris:/etc/localtime:ro' -v '/work/riot/RIOT:/data/riotbuild/riotbase:delegated' -v '/home/aabadie/.cargo/registry:/data/riotbuild/.cargo/registry:delegated' -v '/home/aabadie/.cargo/git:/data/riotbuild/.cargo/git:delegated' -e 'RIOTBASE=/data/riotbuild/riotbase' -e 'CCACHE_BASEDIR=/data/riotbuild/riotbase' -e 'BUILD_DIR=/data/riotbuild/riotbase/build' -e 'RIOTPROJECT=/data/riotbuild/riotbase' -e 'RIOTCPU=/data/riotbuild/riotbase/cpu' -e 'RIOTBOARD=/data/riotbuild/riotbase/boards' -e 'RIOTMAKE=/data/riotbuild/riotbase/makefiles'      -e 'BOARD=adafruit-clue' -e 'RIOT_CI_BUILD=1' -e 'DISABLE_MODULE=' -e 'DEFAULT_MODULE=test_utils_interactive_sync test_utils_print_stack_usage' -e 'FEATURES_REQUIRED=periph_cpuid' -e 'FEATURES_BLACKLIST=' -e 'FEATURES_OPTIONAL=' -e 'USEMODULE=' -e 'USEPKG='  -w '/data/riotbuild/riotbase/tests/periph/cpuid/' 'docker.io/riot/riotbuild:latest' make     
Building application "tests_cpuid" for "adafruit-clue" with MCU "nrf52".

   text	   data	    bss	    dec	    hex	filename
  17300	    128	   4580	  22008	   55f8	/data/riotbuild/riotbase/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.elf
stty -F /dev/ttyACM0 raw ispeed 1200 ospeed 1200 cs8 -cstopb ignpar eol 255 eof 255
sleep 1
adafruit-nrfutil dfu genpkg --dev-type 0x0052 --sd-req 0x00B6 --application /work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex /work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex.zip
Zip created at /work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex.zip
adafruit-nrfutil dfu serial --port=/dev/ttyACM0 --baudrate=115200 --touch=1200 --package=/work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex.zip --singlebank
Upgrading target on /dev/ttyACM0 with DFU package /work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex.zip. Flow control is disabled, Single bank, Touch 1200
###################################
Activating new firmware
Device programmed.
make: *** No rule to make target 'term-delay', needed by 'test'.  Stop.
this PR: 
$ BUILD_IN_DOCKER=1 RIOT_CI_BUILD=1 BOARD=adafruit-clue make -C tests/periph/cpuid/ flash test --no-print-directory 
Launching build container using image "docker.io/riot/riotbuild:latest".
docker run --rm --tty --user $(id -u) -v '/usr/share/zoneinfo/Europe/Paris:/etc/localtime:ro' -v '/work/riot/RIOT:/data/riotbuild/riotbase:delegated' -v '/home/aabadie/.cargo/registry:/data/riotbuild/.cargo/registry:delegated' -v '/home/aabadie/.cargo/git:/data/riotbuild/.cargo/git:delegated' -e 'RIOTBASE=/data/riotbuild/riotbase' -e 'CCACHE_BASEDIR=/data/riotbuild/riotbase' -e 'BUILD_DIR=/data/riotbuild/riotbase/build' -e 'RIOTPROJECT=/data/riotbuild/riotbase' -e 'RIOTCPU=/data/riotbuild/riotbase/cpu' -e 'RIOTBOARD=/data/riotbuild/riotbase/boards' -e 'RIOTMAKE=/data/riotbuild/riotbase/makefiles'      -e 'BOARD=adafruit-clue' -e 'RIOT_CI_BUILD=1' -e 'DISABLE_MODULE=' -e 'DEFAULT_MODULE=test_utils_interactive_sync test_utils_print_stack_usage' -e 'FEATURES_REQUIRED=periph_cpuid' -e 'FEATURES_BLACKLIST=' -e 'FEATURES_OPTIONAL=' -e 'USEMODULE=' -e 'USEPKG='  -w '/data/riotbuild/riotbase/tests/periph/cpuid/' 'docker.io/riot/riotbuild:latest' make     
Building application "tests_cpuid" for "adafruit-clue" with MCU "nrf52".

   text	   data	    bss	    dec	    hex	filename
  17300	    128	   4580	  22008	   55f8	/data/riotbuild/riotbase/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.elf
stty -F /dev/ttyACM0 raw ispeed 1200 ospeed 1200 cs8 -cstopb ignpar eol 255 eof 255
sleep 1
adafruit-nrfutil dfu genpkg --dev-type 0x0052 --sd-req 0x00B6 --application /work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex /work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex.zip
Zip created at /work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex.zip
adafruit-nrfutil dfu serial --port=/dev/ttyACM0 --baudrate=115200 --touch=1200 --package=/work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex.zip --singlebank
Upgrading target on /dev/ttyACM0 with DFU package /work/riot/RIOT/tests/periph/cpuid/bin/adafruit-clue/tests_cpuid.hex.zip. Flow control is disabled, Single bank, Touch 1200
###################################
Activating new firmware
Device programmed.
sleep 2
r
/work/riot/RIOT/dist/tools/pyterm/pyterm -p "/dev/ttyACM0" -b "115200" --no-reconnect --noprefix --no-repeat-command-on-empty-line 
Twisted not available, please install it if you want to use pyterm's JSON capabilities
Connect to serial port /dev/ttyACM0
Welcome to pyterm!
Type '/exit' to exit.
READY
s
START
main(): This is RIOT! (Version: buildtest)
Test for the CPUID driver
This test is reading out the CPUID of the platforms CPU

CPUID_LEN: 8
CPUID: 0x1b 0xb1 0xc6 0x92 0xf2 0xcb 0xad 0x3c

Issues/PRs references

Found while testing #19726

@aabadie aabadie added the Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) label Aug 11, 2023
@github-actions github-actions bot added Area: build system Area: Build system Area: tools Area: Supplementary tools labels Aug 11, 2023
@aabadie aabadie added Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Aug 11, 2023
@riot-ci
Copy link
Copy Markdown

riot-ci commented Aug 11, 2023 •
edited
Loading

Murdock results

✔️ PASSED

d296bab makefiles/usb_board_reset.mk: declare term-delay target with test target

Success Failures Total Runtime
1 0 1 52s

Artifacts

@aabadie aabadie added CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Aug 11, 2023
@benpicco
Copy link
Copy Markdown
Contributor

benpicco commented Aug 21, 2023

bors merge

bors bot added a commit that referenced this pull request Aug 21, 2023
@bors @fabian18
@JKRhb @Enoch247 @aabadie @gschorcht
Merge #19387 #19874 #19875 #19876 #19878 #19886 #19888
6b4f04f 
19387: drivers/atwinc15x0: support dynamic scanning and connection to AP r=benpicco a=fabian18



19874: coap: add missing option numbers r=benpicco a=JKRhb



19875: coap: add missing Content-Format definitions r=benpicco a=JKRhb



19876: sys/net/ipv4/addr: fix typos r=benpicco a=Enoch247

### Contribution description

This patch fixes some typos in the doxygen doc.

### Testing procedure

Nothing to test. No change to code.

### Issues/PRs references

- None known


19878: makefiles/usb_board_reset.mk: declare term-delay target with test target r=benpicco a=aabadie



19886: cpu/efm32: fix DAC configuration r=benpicco a=gschorcht

### Contribution description

The EFM32 MCU allows the reference voltage to be configured per DAC device, not per DAC channel. Also, the DAC reference voltage was defined in the configuration but not used anywhere.

At the moment we have only defined one board (`stwstk6220a`) that uses the DAC, so changing the configuration interface shouldn't be critical.

### Testing procedure

`tests/periph/dac` should still work for the `stwstk6220a`
```
BOARD=slwstk6220a make -j8 -C tests/periph/dac flash
```
I don't have a `stwstk6220a` board (EFM32 Series 0) so that I can't test it. I could only test it for the `sltb009a` board (EFM32 Series 1) with the change for VDAC in PR #19887.

### Issues/PRs references


19888: boards/sltb009a: complete and fix documentation r=benpicco a=gschorcht

### Contribution description

This PR completes and fixes the documentation which was still in the state as generated automatically by `efm2riot`.

The PR also includes a fix of the configuration of the second UART device that was find out while completing the documentation.

### Testing procedure

Green CI

### Issues/PRs references


Co-authored-by: Fabian Hüßler <[email protected]@MLPA-NB119.(none)>
Co-authored-by: Fabian Hüßler <[email protected]>
Co-authored-by: Jan Romann <[email protected]>
Co-authored-by: Joshua DeWeese <[email protected]>
Co-authored-by: Alexandre Abadie <[email protected]>
Co-authored-by: Gunar Schorcht <[email protected]>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Aug 21, 2023

Build failed (retrying...):

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Aug 21, 2023

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot merged commit f30f7b7 into RIOT-OS:master Aug 21, 2023
@aabadie aabadie deleted the pr/make/term-delay-test-fix branch August 23, 2023 19:28
@MrKevinWeiss MrKevinWeiss added this to the Release 2023.10 milestone Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@benpicco benpicco benpicco approved these changes

Assignees

No one assigned

Labels

Area: build system Area: Build system Area: tools Area: Supplementary tools CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

Release 2023.10

Development

Successfully merging this pull request may close these issues.

4 participants

@aabadie @riot-ci @benpicco @MrKevinWeiss