boards/waspmote: Fix timer config #14799

maribu · 2020-08-19T19:23:54Z

Contribution description

Set XTIMER_HZ to something that is actually possible to generate with one of the available clock dividers from the core frequency
Use xtimer_on_ztimer if xtimer is used and not ztimer_xtimer_compat is used
- This is needed because xtimer is simply not compatible with any of the possible clock frequencies of this board

Testing procedure

The tests for periph_timer and xtimer in tests/ should now pass on the waspmote-pro

Issues/PRs references

Fixes #14750

Includes #14807

maribu · 2020-08-19T19:24:38Z

@jdavid: Could you test this PR and report back here? Thanks :-)

jdavid · 2020-08-20T10:59:25Z

tests/periph_timer fails with the same output:

$ git rev-parse --verify HEAD
10c6bccf6ccac6cd4800f04256e28bdf6395bcc1
$ make BOARD=waspmote-pro PORT=/dev/ttyUSB0 FFLAGS_EXTRA="-F" all flash -C tests/periph_timer
[...]
$ make BOARD=waspmote-pro BOOTLOADER_BAUD=115200 PORT=/dev/ttyUSB0 term -C tests/periph_timer
make: Entering directory '/home/jdavid/sandboxes/UiO/wsn_riot/RIOT/tests/periph_timer'
/home/jdavid/sandboxes/UiO/wsn_riot/RIOT/dist/tools/pyterm/pyterm -p "/dev/ttyUSB0" -b "9600"  
2020-08-20 12:45:39,616 # Connect to serial port /dev/ttyUSB0
Welcome to pyterm!
Type '/exit' to exit.
2020-08-20 12:45:41,007 # 

2020-08-20 12:45:41,055 # Help: Press s to start test, r to print it is ready
r
2020-08-20 12:45:42,542 # READY
s
2020-08-20 12:45:43,406 # START
2020-08-20 12:45:43,470 # main(): This is RIOT! (Version: 2020.10-devel-861-g10c6b-HEAD)
2020-08-20 12:45:43,470 # 
2020-08-20 12:45:43,502 # Test for peripheral TIMERs
2020-08-20 12:45:43,502 # 
2020-08-20 12:45:43,518 # Available timers: 2
2020-08-20 12:45:43,518 # 
2020-08-20 12:45:43,549 # Testing TIMER_0:
2020-08-20 12:45:43,582 # TIMER_0: ERROR on initialization - skipping
2020-08-20 12:45:43,583 # 
2020-08-20 12:45:43,597 # 
2020-08-20 12:45:43,613 # Testing TIMER_1:
2020-08-20 12:45:43,661 # TIMER_1: ERROR on initialization - skipping
2020-08-20 12:45:43,661 # 
2020-08-20 12:45:43,662 # 
2020-08-20 12:45:43,662 # TEST FAILED

USEMODULE=xtimer_on_ztimer doesn't make a difference, though I understand this does not affect the periph_timer test.

jdavid · 2020-08-20T11:03:17Z

but tests/xtimer_usleep works!!

2020-08-20 13:01:16,980 # START
2020-08-20 13:01:17,044 # main(): This is RIOT! (Version: 2020.10-devel-861-g10c6b-HEAD)
2020-08-20 13:01:17,092 # Running test 5 times with 7 distinct sleep times
2020-08-20 13:01:17,156 # Slept for 11011 us (expected: 10000 us) Offset: 1011 us
2020-08-20 13:01:17,268 # Slept for 50998 us (expected: 50000 us) Offset: 998 us
2020-08-20 13:01:17,332 # Slept for 11242 us (expected: 10234 us) Offset: 1008 us
2020-08-20 13:01:17,444 # Slept for 57778 us (expected: 56780 us) Offset: 998 us
2020-08-20 13:01:17,508 # Slept for 13130 us (expected: 12122 us) Offset: 1008 us
2020-08-20 13:01:17,668 # Slept for 99765 us (expected: 98765 us) Offset: 1000 us
[...]

maribu · 2020-08-20T11:46:07Z

tests/periph_timer fails with the same output:

Sorry, my bad. The test manually configured the timer frequency via the Makefile. I updated it to also abuse XTIMER_HZ for that, as all other timer tests do. Now it should work. Could you test again?

jdavid · 2020-08-20T12:06:16Z

tests/periph_timer still doesn't work, with the same output

aabadie · 2020-08-20T12:13:32Z

tests/periph_timer still doesn't work, with the same output

It's because this test expect the timer to run at 250kHZ and now it's set to 230400LU:

RIOT/tests/periph_timer/Makefile

Lines 5 to 13 in 6bf6b6b

    
           BOARDS_TIMER_25kHz := \ 
        
               arduino-duemilanove \ 
        
               arduino-leonardo \ 
        
               arduino-mega2560 \ 
        
               arduino-uno \ 
        
               atmega256rfr2-xpro \ 
        
               atmega328p \ 
        
               waspmote-pro \ 
        
               #

Can you try TIMER_SPEED=230400 make BOARD=waspmote-pro -C tests/periph_timer flash test ?

maribu · 2020-08-20T12:20:04Z

It's because this test expect the timer to run at 250kHZ and now it's set to 230400LU:

This should be changed by this commit: 9575ffd

maribu · 2020-08-20T12:22:20Z

Good that I took a second look. I sneaked in the drop of the volatile by accident. (That should have happend one commit later by using atomics.)

maribu · 2020-08-20T12:24:58Z

Arghh, and no I accidentially added a space :-/

aabadie · 2020-08-20T12:26:25Z

This PR seems to go a bit out of scope: the changes in test application affect several boards. Maybe that would deserve a separate PR ?

xtimer.h must not be included, when the xtimer module is not use. Otherwise compilation on the waspmote-pro with RIOT-OS#14799 will not longer work. gnrc_netif_pktq includes xtimer.h and uses xtimer, but gnrc_netif includes gnrc_netif_pktq.h regardless of whether gnrc_netif_pktq is used. This makes sure that gnrc_netif_pktq.h is only included when actually used.

maribu · 2020-09-23T15:26:13Z

It would be nice to get this bugfix into the next release. I just rebased on top of the now merged compilation fix.

@jdavid provided testing results, so that only needs a code review, a green Murdock and an ACK 😄 (And I have good reason to believe that the recently merged compilation fixes results in a green Murdock.)

fjmolinas

ACK, changes make sense and test output was provided.

boards/waspmote-pro/Makefile.dep

- Set XTIMER_HZ to something that is actually possible to generate with one of the available clock dividers from the core frequency - Use xtimer_on_ztimer if xtimer is used and not ztimer_xtimer_compat is used - This is needed because xtimer is simply not compatible with any of the possible clock frequencies of this board

The waspmote-pro cannot run at 250 kHz, as no available divider can divide its core frequency down to that. Instead, the board can be tested at its core clock frequency.

maribu · 2020-09-23T19:46:30Z

All green. make BOARD=waspmote-pro info-modules still should xtimer_on_ztimer getting pulled in when xtimer is used, so splitting the handling out introduced no issues.

fjmolinas · 2020-09-24T07:33:14Z

Still good IMO

maribu · 2020-09-24T07:38:47Z

Thanks everyone! Especially thanks to @jdavid for reporting the issue and testing the fix!

jdavid · 2020-09-28T07:33:36Z

Thank you very much!

maribu added Area: boards Area: Board ports Area: timers Area: timer subsystems Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Aug 19, 2020

maribu added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Aug 19, 2020

maribu requested review from cgundogan, haukepetersen, miri64, MrKevinWeiss and PeterKietzmann as code owners August 20, 2020 05:17

maribu requested review from aabadie, fjmolinas, leandrolanzieri, MichelRottleuthner and smlng as code owners August 20, 2020 11:44

aabadie mentioned this pull request Aug 20, 2020

tests/periph_timer: fix typo for boards using 250kHz timer #14807

Merged

maribu force-pushed the waspmote-pro branch from f3e6f81 to 3096647 Compare August 20, 2020 12:24

maribu force-pushed the waspmote-pro branch from 3096647 to 28f123b Compare August 20, 2020 12:26

maribu mentioned this pull request Aug 20, 2020

tests/periph_timer: Cleanup #14808

Closed

maribu added the State: waiting for other PR State: The PR requires another PR to be merged first label Aug 20, 2020

maribu force-pushed the waspmote-pro branch from 28f123b to 9c9fdd3 Compare August 20, 2020 18:37

maribu mentioned this pull request Sep 16, 2020

tests/xtimer_{rmutex,mutex}_lock_timeout: Fix compilation #15034

Merged

maribu added the State: waiting for other PR State: The PR requires another PR to be merged first label Sep 16, 2020

maribu mentioned this pull request Sep 16, 2020

tests/periph_timer_{periodic, short_relative_set}: Drop include of xtimer.h #15035

Merged

maribu force-pushed the waspmote-pro branch from f9c8ae1 to d674511 Compare September 17, 2020 18:10

maribu removed the State: waiting for other PR State: The PR requires another PR to be merged first label Sep 17, 2020

benpicco added 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 Sep 17, 2020

maribu mentioned this pull request Sep 18, 2020

sys/net/gnrc/netif: Fix compilation on waspmote-pro #15042

Merged

maribu force-pushed the waspmote-pro branch from d674511 to 46f0f9c Compare September 23, 2020 15:16

maribu added this to the Release 2020.10 milestone Sep 23, 2020

fjmolinas approved these changes Sep 23, 2020

View reviewed changes

benpicco reviewed Sep 23, 2020

View reviewed changes

boards/waspmote-pro/Makefile.dep Outdated Show resolved Hide resolved

maribu added 3 commits September 23, 2020 20:12

tests/periph_timer: Fix frequency for waspmote-pro

bf5cebb

The waspmote-pro cannot run at 250 kHz, as no available divider can divide its core frequency down to that. Instead, the board can be tested at its core clock frequency.

boards/waspmote: Update XTIMER{,_ISR}_BACKOFF

f465ada

maribu force-pushed the waspmote-pro branch from 46f0f9c to f465ada Compare September 23, 2020 18:12

maribu added 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 Sep 23, 2020

fjmolinas merged commit 2cfb4f4 into RIOT-OS:master Sep 24, 2020

maribu deleted the waspmote-pro branch September 24, 2020 07:38

benpicco mentioned this pull request Dec 14, 2020

gnrc_sixlowpan_frag: initial import of Selective Fragment Recovery #12648

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

boards/waspmote: Fix timer config #14799

boards/waspmote: Fix timer config #14799

maribu commented Aug 19, 2020 •

edited

Loading

maribu commented Aug 19, 2020

jdavid commented Aug 20, 2020

jdavid commented Aug 20, 2020

maribu commented Aug 20, 2020

jdavid commented Aug 20, 2020

aabadie commented Aug 20, 2020 •

edited

Loading

maribu commented Aug 20, 2020

maribu commented Aug 20, 2020

maribu commented Aug 20, 2020

aabadie commented Aug 20, 2020

maribu commented Sep 23, 2020

fjmolinas left a comment

maribu commented Sep 23, 2020

fjmolinas commented Sep 24, 2020

maribu commented Sep 24, 2020

jdavid commented Sep 28, 2020

boards/waspmote: Fix timer config #14799

boards/waspmote: Fix timer config #14799

Conversation

maribu commented Aug 19, 2020 • edited Loading

Contribution description

Testing procedure

Issues/PRs references

maribu commented Aug 19, 2020

jdavid commented Aug 20, 2020

jdavid commented Aug 20, 2020

maribu commented Aug 20, 2020

jdavid commented Aug 20, 2020

aabadie commented Aug 20, 2020 • edited Loading

maribu commented Aug 20, 2020

maribu commented Aug 20, 2020

maribu commented Aug 20, 2020

aabadie commented Aug 20, 2020

maribu commented Sep 23, 2020

fjmolinas left a comment

Choose a reason for hiding this comment

maribu commented Sep 23, 2020

fjmolinas commented Sep 24, 2020

maribu commented Sep 24, 2020

jdavid commented Sep 28, 2020

maribu commented Aug 19, 2020 •

edited

Loading

aabadie commented Aug 20, 2020 •

edited

Loading