boards/stm32: introduce common timer configurations and use them where possible by aabadie · Pull Request #11809 · RIOT-OS/RIOT

aabadie · 2019-07-05T17:47:13Z

Contribution description

While working on some of my STM32 boards addition, I noticed the timer configuration were very often the same, certainly due to copy-paste. Some uses TIM2, some uses TIM5.

This PR is introducing 2 new common STM32 timer configurations: one with TIM2, which is adapted for several families (L0, L1 and L4) and one with TIM5, mostly used by F4 boards.

I tried to adapt all boards with these configuration.

The results is a lot of duplicated code in peripheral configurations being removed.

Testing procedure

Verify xtimer test applications still works
A green Murdock should also be a good indicator
Verify no obvious mistake is done in the code changes

Issues/PRs references

None

fjmolinas · 2019-08-05T12:41:17Z

@aabadie please rebase.

This also requires to include the STM32 shared include directory

This requires including STM32 common include directoy as well

fjmolinas

Code looks good. I'm running tests to verify nothing has been broken.

fjmolinas · 2019-08-06T15:04:49Z

I ran the tests, seem like only expected to fail tests are failing, see details:

nucleo-f207zg/failuresummary.md

Failures during test:
- [tests/gnrc_ipv6_ext](tests/gnrc_ipv6_ext/test.failed)
- [tests/gnrc_rpl_srh](tests/gnrc_rpl_srh/test.failed)
- [tests/gnrc_sock_dns](tests/gnrc_sock_dns/test.failed)
- [tests/pkg_fatfs_vfs](tests/pkg_fatfs_vfs/test.failed)

nucleo-f303k8/failuresummary.md

Failures during test:
- [tests/cpp11_condition_variable](tests/cpp11_condition_variable/test.failed)
- [tests/driver_grove_ledbar](tests/driver_grove_ledbar/test.failed)
- [tests/driver_my9221](tests/driver_my9221/test.failed)
- [tests/pkg_fatfs_vfs](tests/pkg_fatfs_vfs/test.failed)
- [tests/pthread_cooperation](tests/pthread_cooperation/test.failed)

nucleo-f446re/failuresummary.md

Failures during test:
- [tests/driver_grove_ledbar](tests/driver_grove_ledbar/test.failed)
- [tests/driver_my9221](tests/driver_my9221/test.failed)
- [tests/gnrc_ipv6_ext](tests/gnrc_ipv6_ext/test.failed)
- [tests/gnrc_rpl_srh](tests/gnrc_rpl_srh/test.failed)
- [tests/gnrc_sock_dns](tests/gnrc_sock_dns/test.failed)
- [tests/pkg_fatfs_vfs](tests/pkg_fatfs_vfs/test.failed)

nucleo-l073rz/failuresummary.md

Failures during test:
- [tests/driver_grove_ledbar](tests/driver_grove_ledbar/test.failed)
- [tests/driver_my9221](tests/driver_my9221/test.failed)
- [tests/gnrc_ipv6_ext](tests/gnrc_ipv6_ext/test.failed)
- [tests/gnrc_rpl_srh](tests/gnrc_rpl_srh/test.failed)
- [tests/gnrc_sock_dns](tests/gnrc_sock_dns/test.failed)
- [tests/pkg_fatfs_vfs](tests/pkg_fatfs_vfs/test.failed)

nucleo-l152re/failuresummary.md

Failures during test:
- [tests/driver_grove_ledbar](tests/driver_grove_ledbar/test.failed)
- [tests/driver_my9221](tests/driver_my9221/test.failed)
- [tests/gnrc_ipv6_ext](tests/gnrc_ipv6_ext/test.failed)
- [tests/gnrc_rpl_srh](tests/gnrc_rpl_srh/test.failed)
- [tests/gnrc_sock_dns](tests/gnrc_sock_dns/test.failed)
- [tests/pkg_fatfs_vfs](tests/pkg_fatfs_vfs/test.failed)
- [tests/pkg_qdsa](tests/pkg_qdsa/test.failed)

nucleo-l432kc/failuresummary.md

Failures during test:
- [tests/driver_grove_ledbar](tests/driver_grove_ledbar/test.failed)
- [tests/driver_hd44780](tests/driver_hd44780/test.failed)
- [tests/driver_my9221](tests/driver_my9221/test.failed)
- [tests/gnrc_ipv6_ext](tests/gnrc_ipv6_ext/test.failed)
- [tests/gnrc_rpl_srh](tests/gnrc_rpl_srh/test.failed)
- [tests/gnrc_sock_dns](tests/gnrc_sock_dns/test.failed)
- [tests/pkg_fatfs_vfs](tests/pkg_fatfs_vfs/test.failed)

nucleo-f103rb/failuresummary.md

ERROR:nucleo-f103rb:Tests failed: 9
Failures during test:
- [tests/driver_grove_ledbar](tests/driver_grove_ledbar/test.failed)
- [tests/driver_hd44780](tests/driver_hd44780/test.failed)
- [tests/driver_my9221](tests/driver_my9221/test.failed)
- [tests/gnrc_ipv6_ext](tests/gnrc_ipv6_ext/test.failed)
- [tests/gnrc_rpl_srh](tests/gnrc_rpl_srh/test.failed)
- [tests/gnrc_sock_dns](tests/gnrc_sock_dns/test.failed)
- [tests/pkg_fatfs_vfs](tests/pkg_fatfs_vfs/test.failed)
- [tests/xtimer_periodic_wakeup](tests/xtimer_periodic_wakeup/test.failed)
- [tests/xtimer_usleep_short](tests/xtimer_usleep_short/test.failed)

These fail because of XTIMER_BACKOFF, unrelated to this PR, also fails in master.

- [tests/xtimer_periodic_wakeup](tests/xtimer_periodic_wakeup/test.failed)
- [tests/xtimer_usleep_short](tests/xtimer_usleep_short/test.failed)

nucleo-f091rc/failuresummary.md

Failures during test:
- [tests/driver_grove_ledbar](tests/driver_grove_ledbar/test.failed)
- [tests/driver_hd44780](tests/driver_hd44780/test.failed)
- [tests/driver_my9221](tests/driver_my9221/test.failed)
- [tests/gnrc_ipv6_ext](tests/gnrc_ipv6_ext/test.failed)
- [tests/gnrc_rpl_srh](tests/gnrc_rpl_srh/test.failed)
- [tests/gnrc_sock_dns](tests/gnrc_sock_dns/test.failed)
- [tests/pkg_fatfs_vfs](tests/pkg_fatfs_vfs/test.failed)

[tests/ssp]: puts board in un-flashable state but succeeds

For stm32f7 is seems that there are a lot failing test same one as shown in #11800. Although a big issue, it isn't related to this PR.

nucleo-f7/failuresummary.md

Failures during test: ``` - [tests/bloom_bytes](tests/bloom_bytes/test.failed) - [tests/float](tests/float/test.failed) - [tests/gnrc_ipv6_ext](tests/gnrc_ipv6_ext/test.failed) - [tests/gnrc_rpl_srh](tests/gnrc_rpl_srh/test.failed) - [tests/gnrc_sock_dns](tests/gnrc_sock_dns/test.failed) - [tests/libfixmath_unittests](tests/libfixmath_unittests/test.failed) - [tests/pkg_cn-cbor](tests/pkg_cn-cbor/test.failed) - [tests/pkg_lora-serialization](tests/pkg_lora-serialization/test.failed) - [tests/pkg_ubasic](tests/pkg_ubasic/test.failed) - [tests/rng](tests/rng/test.failed) - [tests/unittests](tests/unittests/test.failed) ```

fjmolinas

Although I found out there are some failing tests with nucleo-boards. These are unrelated to the PR. ACK

fjmolinas · 2019-08-07T07:23:18Z

boards/common/stm32/include/cfg_timer_tim2.h

+
+#define TIMER_0_ISR         isr_tim2
+
+#define TIMER_NUMOF         (sizeof(timer_config) / sizeof(timer_config[0]))


@aabadie I didn't realize #11865 had been merged, could you provide a PR to replace this by ARRAY_SIZE

It was addressed in #11865 :)

aabadie added Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: boards Area: Board ports labels Jul 5, 2019

aabadie requested review from fjmolinas and haukepetersen July 5, 2019 17:47

aabadie force-pushed the pr/boards/stm32_timer_conf_common branch 2 times, most recently from af7f0d3 to 96dee3c Compare July 5, 2019 18:55

aabadie added 10 commits August 5, 2019 15:00

boards/stm32: introduce common timer config with TIM2

94a9e2c

boards/nucleo-f0/3/7: use common timer configuration

e7e3f15

boards/stm32l0: use common timer configuration

7ee7315

boards/nucleo-l4*: use common timer configuration

564686f

boards/stm32: introduce common timer config with TIM5

6b5a977

boards/stm32f4: use common timer configuration

27230c7

boards/ublox-c030-u201: use common timer configuration

3c00d41

This also requires to include the STM32 shared include directory

boards/lobaro-lorabox: use common timer configuration

b710cda

boards/nucleo-l152re: use TIM5 common timer configuration

b1fa4fb

boards/nz32-sc151: use TIM5 common timer configuration

927f283

This requires including STM32 common include directoy as well

aabadie force-pushed the pr/boards/stm32_timer_conf_common branch from 96dee3c to 927f283 Compare August 5, 2019 13:01

fjmolinas mentioned this pull request Aug 6, 2019

tests: fix tests for nucleo-f303k8 #11969

Merged

fjmolinas reviewed Aug 6, 2019

View reviewed changes

fjmolinas added the Reviewed: 3-testing The PR was tested according to the maintainer guidelines label Aug 6, 2019

fjmolinas approved these changes Aug 6, 2019

View reviewed changes

fjmolinas merged commit b8cd3c0 into RIOT-OS:master Aug 6, 2019

aabadie deleted the pr/boards/stm32_timer_conf_common branch August 6, 2019 17:04

fjmolinas mentioned this pull request Aug 7, 2019

boards/common/nucleo: increase XTIMER_BACKOFF for STM32F103 #11975

Merged

fjmolinas reviewed Aug 7, 2019

View reviewed changes

fjmolinas mentioned this pull request Aug 7, 2019

dist/tools/openocd: add OPENOCD_EXTRA_INIT_RESET use for nucleo-f091rc #11976

Merged

kb2ma added this to the Release 2019.10 milestone Sep 16, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

boards/stm32: introduce common timer configurations and use them where possible#11809

boards/stm32: introduce common timer configurations and use them where possible#11809
fjmolinas merged 10 commits intoRIOT-OS:masterfrom
aabadie:pr/boards/stm32_timer_conf_common

aabadie commented Jul 5, 2019

Uh oh!

fjmolinas commented Aug 5, 2019

Uh oh!

fjmolinas left a comment

Uh oh!

fjmolinas commented Aug 6, 2019

Uh oh!

fjmolinas left a comment

Uh oh!

fjmolinas Aug 7, 2019

Uh oh!

aabadie Aug 7, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants


		#define TIMER_0_ISR isr_tim2

		#define TIMER_NUMOF (sizeof(timer_config) / sizeof(timer_config[0]))

Conversation

aabadie commented Jul 5, 2019

Contribution description

Testing procedure

Issues/PRs references

Uh oh!

fjmolinas commented Aug 5, 2019

Uh oh!

fjmolinas left a comment

Choose a reason for hiding this comment

Uh oh!

fjmolinas commented Aug 6, 2019

Uh oh!

fjmolinas left a comment

Choose a reason for hiding this comment

Uh oh!

fjmolinas Aug 7, 2019

Choose a reason for hiding this comment

Uh oh!

aabadie Aug 7, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants