Skip to content

[2020.07] cpu/stm32: use correct CMSIS header for stm32f103xe line#15044

Merged
miri64 merged 1 commit intoRIOT-OS:2020.07-branchfrom
aabadie:pr/cpu/stm32f103xe
Sep 21, 2020
Merged

[2020.07] cpu/stm32: use correct CMSIS header for stm32f103xe line#15044
miri64 merged 1 commit intoRIOT-OS:2020.07-branchfrom
aabadie:pr/cpu/stm32f103xe

Conversation

@aabadie
Copy link
Contributor

@aabadie aabadie commented Sep 18, 2020

Contribution description

This PR replace the CMSIS header used for stm32f103xe cpu line by the valid one. In 2020.07, the CMSIS for stm32f101xe was used by mistake in #14143.

Testing procedure

  • Green Murdock
  • Tests on iotlab-m3 should still work

Issues/PRs references

fixes #15041

@aabadie aabadie added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: cpu Area: CPU/MCU ports labels Sep 18, 2020
Copy link
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK, tested and it works. I'm somehow surprised this didn't break earlier:

2020-09-18 18:15:23,489 # help
2020-09-18 18:15:23,491 # Command              Description
2020-09-18 18:15:23,492 # ---------------------------------------
2020-09-18 18:15:23,494 # udp                  send data over UDP and listen on UDP ports
2020-09-18 18:15:23,495 # reboot               Reboot the node
2020-09-18 18:15:23,497 # version              Prints current RIOT_VERSION
2020-09-18 18:15:23,498 # pm                   interact with layered PM subsystem
2020-09-18 18:15:23,500 # ps                   Prints information about running threads.
2020-09-18 18:15:23,500 # ping6                Ping via ICMPv6
2020-09-18 18:15:23,500 # ping                 Ping via ICMPv6
2020-09-18 18:15:23,501 # random_init          initializes the PRNG
2020-09-18 18:15:23,505 # random_get           returns 32 bit of pseudo randomness
2020-09-18 18:15:23,506 # nib                  Configure neighbor information base
2020-09-18 18:15:23,506 # ifconfig             Configure network interfaces
2020-09-18 18:15:23,507 # rpl                  rpl configuration tool ('rpl help' for more information)
2020-09-18 18:15:23,508 # 6ctx                 6LoWPAN context configuration tool
>

@aabadie aabadie added State: waiting for other PR State: The PR requires another PR to be merged first and removed State: waiting for other PR State: The PR requires another PR to be merged first labels Sep 18, 2020
@miri64
Copy link
Member

miri64 commented Sep 21, 2020

I removed the check from the release branch. @bergzand, remind me to reactivate it, once the 2020.10-branch is there.

@miri64 miri64 merged commit e036eb7 into RIOT-OS:2020.07-branch Sep 21, 2020
@aabadie aabadie deleted the pr/cpu/stm32f103xe branch September 21, 2020 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: cpu Area: CPU/MCU ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants