Update all MCUs to ChibiOS 21.11.x/master #310

zykrah · 2022-01-01T13:45:30Z

This PR updates ChibiOS-Contrib to be up to date with ChibiOS 21.11.x (the master branch, because there is no separate branch for 21.11.x currently). Additionally, I believe this is the first build to include the new Raspberry Pi Pico RP2040 MCU.

This is in response to qmk/qmk_firmware#14877. I assume by merging this PR, development on getting RP2040 officially supported by QMK (without having to use sekigon_gonnoc's RP2040 VIAL fork) will be allowed to continue

From @tzarc in the QMK discord:

Changes:

Modified build.yml to use master branch of ChibiOS. Also fixed a minor bug that didn't allow extension packages to export.
Updated chconf.h files of MCUs, adding new required definintions going from ChibiOS 20.3.x -> ChibiOS 21.11.x
Some halconf.h files were also updated
Updated some mcuconf.h files (mainly STM32F4xx)
Updated missing MCU definitions from some files (mainly some STM mcuconf.h files)
Updated some STM ffconf.h files
Updated some old/deprecated method names
Updated some other minor code deprecations
I have removed PACKED_VAR from some typedef structs in a file because of redefinition errors. I don't know if this is the correct way of resolving this.

Notes:

I actually do not have much experience with C. Pretty much all of this was trial and error, so I may have done some things wrong.
These changes will have to be merged into a new branch, ie chibios-21.11.x
MCUs may all need to be individually tested in real life to see if everything functions properly. All support is currently theoretical.
There are a lot of commits because I still don't actually know how to build locally. (A heads up on how to do this would be nice)
I chose the master branch of ChibiOS because no branch for 21.11.x (stable) yet exists (This will have to change in the future)
~~I'll have to remove some of those vscode files.~~
Some STM32F4XX mcuconf.h files may still need slight updating + checking (check against the ChibiOS demos)
I'm unsure if some of the changes made to some chconf.h files using ChibiOS NIL are necessary.
I did not go over any of the warnings/notes presented when building CI, i only fixed any errors that prevented CI from building. Hence, there may still be some glaring issues that may have to be fixed additionally.
RP2040 is still untested afaik. @hanya may have already tested their code before it was merged though.
After making this PR, I have looked and many of these changes mirror other PRs regarding updating MCUs to 21.6.x (However this PR seeks to update to master branch/21.11.x rather than just 21.6.x)
I forgot to add myself to AUTHORS.txt
Thank you to all who helped me out, both on the ChibiOS discord and the AusKeys discord server

…ariable

…identally removed

…aster branch of Chibios

…onf.h files to include missing definitions. Still a few more things to add.

testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/Makefile

zykrah · 2022-01-02T03:38:41Z

testhal/NUMICRO/NUC123/NUTINY-SDK-NUC123-V2.0/USB_HID/main.c

@@ -56,7 +55,7 @@ int main(void)
   */
  OnboardLED_Off();

-  chDbgSuspendTrace(CH_DBG_TRACE_MASK_SWITCH);
+  chTraceSuspend(CH_DBG_TRACE_MASK_SWITCH);


Just to change to an updated method

Snipeye · 2022-01-22T17:05:52Z

Hello! I've got a CS minor (and done plenty of C/C++) but I've got next to no familiarity with this library - that said, I'm a keyboard nerd and would love to see this PR completed so the RP2040 would be useable in QMK. Is there anything that I can do to help?

zykrah · 2022-01-22T23:38:10Z

Hello! I've got a CS minor (and done plenty of C/C++) but I've got next to no familiarity with this library - that said, I'm a keyboard nerd and would love to see this PR completed so the RP2040 would be useable in QMK. Is there anything that I can do to help?

Hey thanks for the expression of interest! As far as I know, all the work has already been done for the PR to be merged, however it's just waiting on a review from a maintainer. But feel free to go over the code and review it yourself if you want to check. I've already gone over all the file changes myself and everything looked good to me, apart from the few things i mentioned in the Notes section in the original PR message.

rusefillc · 2022-02-01T20:13:27Z

@fpoussin poke :)

nodupe · 2022-02-06T17:23:28Z

Hi, kindly, can we have some updates on this? Thank you!

fpoussin · 2022-02-06T18:03:46Z

Having a look

fpoussin · 2022-02-06T18:07:10Z

.github/workflows/build.yml

@@ -25,11 +25,11 @@ jobs:
    - name: decompress ChibiOS ext resources
      run: |
        cd $CH_PATH/ext
-        for i in *.7z; do 7z x -y $i; done
+        for i in *.7z; do 7z x -y "$i"; done


fpoussin · 2022-02-06T18:10:41Z

.github/workflows/build.yml

  pull_request:
-    branches: [ chibios-21.6.x ]
+    branches: [ chibios-21.11.x-dev ]


I've pushed a chibios-21.11.x branch, you can use that

fpoussin · 2022-02-06T18:17:21Z

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
        release: '10-2020-q4'
    - name: setup vars
      run: |
-        echo "CH_VER=stable_20.3.x" >> $GITHUB_ENV
+        echo "CH_VER=master" >> $GITHUB_ENV


I've added stable_21.11.x, please use that, master is a no go

fpoussin · 2022-02-06T18:18:23Z

os/common/ports/ARMCMx/compilers/GCC/utils/fault_handlers_v7m.c

@@ -15,7 +15,7 @@
 */

 #include "fault_handlers.h"
-#include <hal.h>
+#include "hal.h"


fpoussin · 2022-02-06T18:31:03Z

New stable branch added to ChibiOS repo, you can add the requested changes now:
https://github.com/ChibiOS/ChibiOS/tree/stable_21.11.x

fpoussin · 2022-02-06T18:38:10Z

I've changed the merge branch to 21.11.x

Changed some branches

zykrah · 2022-02-06T20:37:50Z

Thanks for that @fpoussin, requested changes implemented. ~~I forgot to rename my branch before pushing so CI didn't run, but I only changed the build.yml as is evident in the commit. Do you want me to still run a test CI?~~

EDIT: Nevermind I just renamed the branch now. CI is running as I type this.

EDIT 2: Looks like my lack of git experience has put this in a tricky spot. Oops. Restored the branch but the CI should still be running in the 21.11.x branch in my fork. Hope that's okay.

EDIT 3: Looks like CI passed :) 🎉

fpoussin · 2022-02-06T20:45:42Z

Yes that's fine, CI should pass then I'll merge.
We can do more cleanup in another PR.

zykrah · 2022-02-06T20:49:37Z

Yes that's fine, CI should pass then I'll merge. We can do more cleanup in another PR.

CI passed 👍 Thanks for the review fpoussin

fpoussin · 2022-02-06T20:51:08Z

It's done :)

zykrah added 30 commits December 30, 2021 10:47

Empty test commit

407a762

Testing changes: declared unsigned integer and commented out unused v…

d4f07e0

…ariable

remove pico-sdk from makefiles, just testing

3714f94

Commented out all other/optional files in Makefiles for Pico

8680848

Added separate chibios for pico, reverted some changes

6307c5f

seperate chbuild.sh for pico

48f40ac

updated permissions

2d38b8a

Updated RP2040 chconf.h files

f1f8ac5

Updated chibios version in chconf.h, readded some lines that were acc…

45f4545

…identally removed

Modified Chibios HAL and RT versions

288e6a1

Forgot to modify one file

a1ea0a7

Fix wrong size passed to calculate buffer offset (as in hanya@72f62dc)

da3127b

Empty test commit

588de0b

Reversed extra chibios build files for pico, now all MCUs are using m…

adad56d

…aster branch of Chibios

Fixed whitespace in ext package causing error by using quotation marks

d624a42

Update Makefiles to use new test library

a2a9fc5

Updated Makefiles to use newer ARM ports

42bc000

Updated Makefiles to use new ChibiOS HAL and RT versions. Updated chc…

2cc8ba6

…onf.h files to include missing definitions. Still a few more things to add.

Further updates to chconf.h files

f3f4b4f

Even more updates to chconf.h files

7014bc0

Fixed HAL version in halconf.h files

0aa26e0

Even more more changes to chconf.h files

e898157

Updated ffconf.h version, Attempting to fix redefinition of structs

29da390

Attempting to fix PACKED_VAR redefinition.

e66ea30

Defined IRQ USART Priorities

9309bb4

Defined IRQ Priorities

b3e24e4

Attempting to fix IRQ Priorities again

2d44a5a

Once again trying to fix IRQ Priorities

05378da

Attempting to fix mcuconf.h IRQ priorities again

56b7db2

Attempting to fix IRQ priorities in mcuconf.h again

969f0d1

zykrah commented Jan 2, 2022

View reviewed changes

testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/Makefile Outdated Show resolved Hide resolved

Revert uneccessary changes to RP2040 files

38c01bd

zykrah commented Jan 2, 2022

View reviewed changes

Trigger Build

9f4768a

zykrah mentioned this pull request Jan 10, 2022

[Feature Request] Support for Raspberry Pi Pico qmk/qmk_firmware#11649

Closed

fpoussin self-assigned this Jan 11, 2022

fpoussin added enhancement hal platform labels Jan 11, 2022

zykrah mentioned this pull request Feb 1, 2022

So many failing branches? #313

Closed

fpoussin requested changes Feb 6, 2022

View reviewed changes

fpoussin changed the base branch from chibios-21.6.x to chibios-21.11.x February 6, 2022 18:37

Update build.yml

8c93606

Changed some branches

zykrah closed this Feb 6, 2022

zykrah deleted the chibios-21.11.x-dev branch February 6, 2022 20:38

zykrah restored the chibios-21.11.x-dev branch February 6, 2022 20:40

zykrah reopened this Feb 6, 2022

fpoussin approved these changes Feb 6, 2022

View reviewed changes

fpoussin merged commit 47b1ce6 into ChibiOS:chibios-21.11.x Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update all MCUs to ChibiOS 21.11.x/master #310

Update all MCUs to ChibiOS 21.11.x/master #310

zykrah commented Jan 1, 2022 •

edited

Loading

zykrah Jan 2, 2022 •

edited

Loading

Snipeye commented Jan 22, 2022

zykrah commented Jan 22, 2022

rusefillc commented Feb 1, 2022

nodupe commented Feb 6, 2022

fpoussin commented Feb 6, 2022

fpoussin Feb 6, 2022

fpoussin Feb 6, 2022 •

edited

Loading

fpoussin Feb 6, 2022 •

edited

Loading

fpoussin Feb 6, 2022

fpoussin commented Feb 6, 2022

fpoussin commented Feb 6, 2022

zykrah commented Feb 6, 2022 •

edited

Loading

fpoussin commented Feb 6, 2022

zykrah commented Feb 6, 2022

fpoussin commented Feb 6, 2022

Update all MCUs to ChibiOS 21.11.x/master #310

Update all MCUs to ChibiOS 21.11.x/master #310

Conversation

zykrah commented Jan 1, 2022 • edited Loading

zykrah Jan 2, 2022 • edited Loading

Choose a reason for hiding this comment

Snipeye commented Jan 22, 2022

zykrah commented Jan 22, 2022

rusefillc commented Feb 1, 2022

nodupe commented Feb 6, 2022

fpoussin commented Feb 6, 2022

fpoussin Feb 6, 2022

Choose a reason for hiding this comment

fpoussin Feb 6, 2022 • edited Loading

Choose a reason for hiding this comment

fpoussin Feb 6, 2022 • edited Loading

Choose a reason for hiding this comment

fpoussin Feb 6, 2022

Choose a reason for hiding this comment

fpoussin commented Feb 6, 2022

fpoussin commented Feb 6, 2022

zykrah commented Feb 6, 2022 • edited Loading

fpoussin commented Feb 6, 2022

zykrah commented Feb 6, 2022

fpoussin commented Feb 6, 2022

zykrah commented Jan 1, 2022 •

edited

Loading

zykrah Jan 2, 2022 •

edited

Loading

fpoussin Feb 6, 2022 •

edited

Loading

fpoussin Feb 6, 2022 •

edited

Loading

zykrah commented Feb 6, 2022 •

edited

Loading