-
-
Notifications
You must be signed in to change notification settings - Fork 19.3k
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
Improve STM32 timer conflict messages #20544
Improve STM32 timer conflict messages #20544
Conversation
Hi, @sjasonsmith
|
@DrumClock I think that means you broke something in a merge somewhere. It is right there in timers.h, and I have built this for nearly every STM32 board in Marlin and our automatics checks build many STM32 boards, including the GTR. |
Hi @sjasonsmith There are more mistakes than before ... I don't know what happened. |
You're recycling old files like This Issue Queue is for Marlin bug reports and development-related issues, and we prefer not to handle user-support questions here. (As noted on this page.) For best results getting help with configuration and troubleshooting, please use the following resources:
|
Hi @sjasonsmith |
@DrumClock try including |
I don't understand .... how should I do it (please printscreen) |
@DrumClock I just looked at your branch, and all its differences from upstream/bugfix-2.0.x. This is what I looked at: You have MANY merge errors. You are missing MANY upstream changes. You need to start with a clean version of bugfix-2.0.x and re-apply your configuration to it. Here is a patch file of all your changes from the upstream branch. If you search you will see that your branch deletes NUM_HARDWARE_TIMERS from |
Description
The STM32 HAL does build-time timer conflict detection for the 5 non-PWM uses of the timer in Marlin: STEP, TEMP, SERVO, TONE, and SERIAL.
This change updates
constexpr
mechanisms to improve the debugging process when an error occurs.The implementation is entirely
constexpr
. I verified that there is no change to either RAM or Flash usage caused by this change.I derived this from my prototype that automatically selects timers at compile time. I decided not to pursue that at this time, but it will likely reappear after some consolidation of our variant practices for this platform.
#20514
Benefits
With these changes, Visual Studio code is able to resolve a very readable list of timers in use. Conflicts can then be easily spotted.
Old popup:
New popup, key differences:
(The purposes are prefixed with
TP_
to avoid name collisions with existing macros/constants)Configurations
N/A
Related Issues
N/A