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

Monotonic rewrite #874

Merged
merged 5 commits into from
Apr 10, 2024
Merged

Monotonic rewrite #874

merged 5 commits into from
Apr 10, 2024

Conversation

Finomnis
Copy link
Contributor

See #873.

@korken89
Copy link
Collaborator

Hi @Finomnis , sorry for the delay on this!

Overall it looks like a very nice improvement of the monotonics. Would you like to cleanup the PR to get tests to start passing?
And please give us a ping when we can test it more :D

@Finomnis
Copy link
Contributor Author

@korken89 Hey! Sorry for the delay, I was kinda busy with family and stuff. I'll start working on this now again, looking forward to your feedback.

@Finomnis Finomnis marked this pull request as ready for review February 28, 2024 16:33
@Finomnis
Copy link
Contributor Author

Finomnis commented Mar 4, 2024

@korken89 Bump :)

@AfoHT AfoHT linked an issue Mar 6, 2024 that may be closed by this pull request
@misterinterrupt
Copy link

Is this planned for merging or is there still discussion or more to do?

@Finomnis
Copy link
Contributor Author

Is this planned for merging or is there still discussion or more to do?

Planned for merging, waiting for a review.

@misterinterrupt
Copy link

Awesome, I like what you've done and looking forward to it

Is this planned for merging or is there still discussion or more to do?

Planned for merging, waiting for a review.

@korken89
Copy link
Collaborator

We just merged a large RISC-V support PR that has minor clashes with this PR, could you rebase?

Copy link
Collaborator

@korken89 korken89 left a comment

Choose a reason for hiding this comment

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

Some minor comments

@Finomnis
Copy link
Contributor Author

Some minor comments

Busy at work RN, might take a look later :)

@Finomnis
Copy link
Contributor Author

@korken89 Fixed

Copy link
Contributor

@AfoHT AfoHT left a comment

Choose a reason for hiding this comment

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

This is really impressive :)

There's a lot to like here, but in particular how clean the actual usage of monotonics became, awesome!

I know @korken89 got much more experience with monotonics/timer queues so he'll get the last word, but I'm happy to see this PR landing :)

@AfoHT
Copy link
Contributor

AfoHT commented Apr 4, 2024

@Finomnis Could you please rebase on latest master branch and while doing that remove all merge commits?

Might also be a good opportunity to tidy a bit in the commit log 😇

If unsure how, I'm happy to help 👍

@Finomnis
Copy link
Contributor Author

Finomnis commented Apr 5, 2024

@Finomnis Could you please rebase on latest master branch and while doing that remove all merge commits?

Might also be a good opportunity to tidy a bit in the commit log 😇

If unsure how, I'm happy to help 👍

I planned to do a squash merge, if that's allright. I'm too lazy to clean them up :D

@burrbull
Copy link
Contributor

burrbull commented Apr 7, 2024

Why have you downgrade esp32c3 version?

@Finomnis
Copy link
Contributor Author

Finomnis commented Apr 7, 2024

Why have you downgrade esp32c3 version?

My bad. Merging gets out of hand with these kind of huge merge requests. I hope it is merged soon.

@Finomnis
Copy link
Contributor Author

Finomnis commented Apr 7, 2024

@AfoHT Is it alright with you if we squash merge, instead of me cleaning up the commit history?

@Finomnis
Copy link
Contributor Author

Finomnis commented Apr 9, 2024

@korken89 Did some minor fixes after merging the main branch, should be stable again

@Finomnis Finomnis requested a review from korken89 April 9, 2024 14:37
@AfoHT AfoHT linked an issue Apr 10, 2024 that may be closed by this pull request
@AfoHT
Copy link
Contributor

AfoHT commented Apr 10, 2024

@Finomnis don't worry about the esp32c3 QEMU run :)

I'm in the process of squashing/tidying the PR which is about to be merged

But if you got more commits coming I can hold off a little, or we just create another PR. What do you think?

I'll bring in the 986f959 onto the squashed/rebased WIP I got :)

Finomnis and others added 4 commits April 10, 2024 23:34
Goals:
 * make Monotonic purely internal
 * make Monotonic purely tick passed, no fugit involved
 * create a wrapper struct in the user's code via a macro that then
   converts the "now" from the tick based monotonic to a fugit based
   timestamp

We need to proxy the delay functions of the timer queue anyway,
so we could simply perform the conversion in those proxy functions.
@AfoHT AfoHT force-pushed the monotonic_rewrite branch from 986f959 to 8edd4c3 Compare April 10, 2024 21:35
@AfoHT
Copy link
Contributor

AfoHT commented Apr 10, 2024

I took the liberty of tacking on a tiny CI fix, to get CI happy enough for a merge :)

Copy link
Contributor

@AfoHT AfoHT left a comment

Choose a reason for hiding this comment

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

Awesome work! 🎉 Thank you!

I hope I didn't miss anything while squashing, but if that is the case that's on me and we can follow up 👍

@AfoHT AfoHT added this pull request to the merge queue Apr 10, 2024
Merged via the queue into rtic-rs:master with commit 8c23e17 Apr 10, 2024
55 checks passed
@Finomnis Finomnis deleted the monotonic_rewrite branch April 10, 2024 22:30
@SpinFast
Copy link

Very nice

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.

Monotonics: non-hardcoded tick rate Higher resolution monotonic timer (on stm32)
6 participants