Skip to content

2025 - draft#107

Merged
timtogan merged 72 commits intomasterfrom
2025
Jan 15, 2026
Merged

2025 - draft#107
timtogan merged 72 commits intomasterfrom
2025

Conversation

@FriedLongJohns
Copy link
Contributor

@brettle pls review
also @CoolSpy3 thanks!!

sobbing
sim is still broken
tests are still broken
also I probably broke some functionality somewhere
@FriedLongJohns FriedLongJohns requested a review from a team as a code owner January 15, 2025 01:16
sofiebudman and others added 8 commits February 7, 2025 17:30
#107 (comment)

Co-authored-by: CoolSpy3 <55305038+CoolSpy3@users.noreply.github.com>
#107 (comment)

Co-authored-by: CoolSpy3 <55305038+CoolSpy3@users.noreply.github.com>
1. duplicatestrategy to fail
2. no more CachedSparkMax
2. motorcontrollerfactory now configures sparks!!
3. motorErrors checks for null faults
4. swap from smartMotion to MAXmotion in mockedsparkmaxpidcontroller.java
5. cleaner builder pid configs in sparkvelocitypidcontroller.java
6. change from deprecated calculate(double, double) to calculateWithVelocities() in swervemodule and don't persist configs
@timtogan
Copy link
Member

timtogan commented Jan 1, 2026

@CoolSpy3 Alr I am pretty sure I addresed pretty much all your comments if you could if you check everything that would be awesome :D

Copy link
Member

@CoolSpy3 CoolSpy3 left a comment

Choose a reason for hiding this comment

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

Awesome! I think all of the major stuff has been addressed. Just two more minor comments. I'll start re-reading everything for anything else that should be fixed before this merges.

Copy link
Member

@CoolSpy3 CoolSpy3 left a comment

Choose a reason for hiding this comment

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

Alright, here's the last batch of changes. After this, I might just run through and fix some formatting things, and then this should be good to merge!

@timtogan
Copy link
Member

Ok, I basically finished on this batch! Just need to get back to you on this: #107 (comment) I'll prob do it today or tommorow morning. (Also fyi the javadoc doesn't build rn only because ctre javadocs are down)

Copy link
Member

@CoolSpy3 CoolSpy3 left a comment

Choose a reason for hiding this comment

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

Sounds good! Here are a couple of additional notes on the past two commits. Also, this comment still appears unresolved.

@CoolSpy3
Copy link
Member

CoolSpy3 commented Jan 15, 2026

Alright, this looks good! Just pending on the last couple threads.

CoolSpy3 and others added 2 commits January 15, 2026 00:01
(and make SwerveModule.moduleString global)
@timtogan
Copy link
Member

Just resolved the remaining threads!

Copy link
Member

@CoolSpy3 CoolSpy3 left a comment

Choose a reason for hiding this comment

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

Alright, that's all my comments addressed! Normally, I'd recommend testing this on a robot before merging, but given that we just updated everything to 2026 and dismantled Leviathan, that might be difficult, so I'm fine with just merging this in 🚀

Thank you for all the work you put into polishing this up (and working around all of the REV changes 👀 ) :D
LEZZGO 2025!!! 🎉 🤖 🥳

@timtogan
Copy link
Member

Amazing 🎉 Thanks for reviewing all the code!!! :D. Just as a quick question how should I merge it should I just merge it directly or should I squash everything given the amount of commits?

@CoolSpy3
Copy link
Member

General practice for lib199 has been to just merge normally. (And, in fact, it looks like the other options have been disabled.) Normally, the PRs are small-enough/our commit messages are descriptive enough that it's not an issue. (That is to say, we benefit more from the commit history than the cleanliness of squashed merges.) Ultimately, you're programming lead, so afaik, it's your call to make, but unless you have a good reason, I'd just do a normal merge.

@timtogan timtogan merged commit 87145e6 into master Jan 15, 2026
3 checks passed
@timtogan timtogan deleted the 2025 branch January 15, 2026 09:00
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.

7 participants