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

stable_20.3.x.FOME: merge upstream ChibiOS stable_20.3.x branch #6

Open
wants to merge 54 commits into
base: stable_20.3.x.FOME
Choose a base branch
from

Conversation

nmschulte
Copy link

@nmschulte nmschulte commented Jan 16, 2025

for FOME-Tech/fome-fw#532

https://github.com/FOME-Tech/ChibiOS/tree/stable_21.11.x.FOME is just https://github.com/FOME-Tech/ChibiOS/tree/stable_21.11.x.rusefi at the moment.

FOME-Tech/fome-fw#533 moves to use this repository; I anticipate another (after some testing) to move to use the stable_20.3.x.FOME branch (with the likes of #4, #5, etc.).


deconflict a few things ...

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15787 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15788 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15789 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15790 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15825 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15842 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15843 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15844 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15852 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15857 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15858 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15859 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15868 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15879 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16122 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16123 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16124 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16126 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16127 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16130 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16198 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16204 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16213 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
…than 62.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16214 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16219 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16230 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16232 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16235 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16267 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16269 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
gdisirio added 23 commits May 28, 2023 07:41
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16271 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16296 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16309 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
…x@16310 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16312 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
…x@16313 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
…x@16314 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
…x@16341 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
…x@16342 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16428 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16430 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16436 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16437 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16439 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16533 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
…rlying port supports the capability.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16538 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16554 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16633 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16635 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16636 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16637 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16761 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@16812 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
@nmschulte nmschulte changed the base branch from stable_21.11.x.FOME to stable_20.3.x.FOME January 16, 2025 14:15
@nmschulte nmschulte changed the title Merge upstream ChibiOS stable_20.3.x branch stable_20.3.x.FOME: merge upstream ChibiOS stable_20.3.x branch Jan 17, 2025
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.

2 participants