Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: Upgrade CMSIS from 4.5.0 to 5.7.0 #715

Merged
merged 3 commits into from
Mar 5, 2021

Conversation

concatime
Copy link
Contributor

@concatime concatime commented Mar 3, 2021

CMSIS 4 is a legacy version and as @whoenig told me in #708 (comment):

I don't see a reason for not upgrading CMSIS.

The only difference I found in code between CMSIS 4 and 5 is that the latter offers two versions of arm_bitreversal2:
https://github.com/ARM-software/CMSIS/blob/master/CMSIS/DSP_Lib/Source/TransformFunctions/arm_bitreversal2.S
https://github.com/ARM-software/CMSIS_5/blob/develop/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal2.S
https://github.com/ARM-software/CMSIS_5/blob/develop/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal2.c

The Makefile would automatically pick the C version when the target is solely DSP_OBJ += arm_bitreversal2.o: https://github.com/bitcraze/crazyflie-firmware/blob/master/tools/make/cmsis_dsp/obj.mk#L273. That’s why CSFLAGS is not required anymore. I removed __TARGET_FPU_VFP like #709. I also removed the unused includes $(CRAZYFLIE_BASE)/src/utils/interface/clockCorrection and $(CRAZYFLIE_BASE)/src. Finally, I sorted the targets.

With #713 and this, this repo. would be buildable with Clang.

I need reviews of this PR.
Thank you in advance.

@concatime
Copy link
Contributor Author

concatime commented Mar 3, 2021

There is something off with the CI. I have no issues on my end.

UPDATE: make unit fails in my machine too. Working on it.

@ataffanel
Copy link
Member

Looks good to me! i had to run git submodule sync to be able to pull the new submodule, but except for that everything work including the unit tests.

The PR is still marked [WIP] but if you have nothing to add to it, I can merge it.

@concatime
Copy link
Contributor Author

concatime commented Mar 4, 2021

I was waiting for #714 to get merged. All conflits are now resolved.

@concatime concatime changed the title [WIP] vendor: Upgrade CMSIS from 4.5.0 to 5.7.0 vendor: Upgrade CMSIS from 4.5.0 to 5.7.0 Mar 4, 2021
@ataffanel
Copy link
Member

Merging, thanks!

@ataffanel ataffanel merged commit f883f29 into bitcraze:master Mar 5, 2021
@concatime concatime deleted the cmsis-5 branch March 5, 2021 13:37
@jonasdn jonasdn added this to the next-release milestone Mar 17, 2021
cafeciaojoe pushed a commit to cafeciaojoe/crazyflie-firmware that referenced this pull request Sep 27, 2024
Implement x axis manipulation in plotting tab
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants