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.

Sign up for GitHub

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

Jump to bottom

bring the latest dev branch from comp into master #4

Merged
merged 113 commits into from
Dec 3, 2024
Merged

bring the latest dev branch from comp into master #4

merged 113 commits into from
Dec 3, 2024

Conversation

team204frc
Copy link
Member

close out 2024 season stuff

nevadex and others added 30 commits January 20, 2024 02:37
@nevadex
auton is close to working, just pid work now
2390f66
@nevadex
bring in mr coynes changes once again
9d74e0c
@xorbotz
Receieve code
e2a7804
@xorbotz
maybe intake
87ccf2e
@xorbotz
bump motor
9b281d6
@xorbotz
bump code
5b17c0c
@nevadex
linear actuator with sparkmax brushed mode
c30ef9d
@xorbotz
40 amp limit
75538e1
@xorbotz
Merge branch 'MrCoyne' of https://github.com/vikings204/crescendo2024 …
375b874 
…into MrCoyne
@xorbotz
126changes
f277cb2
@nevadex
dual controller mode, constant adjustments
8660b58
@xorbotz
amp update
dc8c481
@TJbots15
Added new Constants, fixed errors from HookSubsystem that I brought d…
a222eed 
…irectly out of my GrappleHook branch, and currently working on the new ShuffleboardSubsystem
@xorbotz
robot update
815a147
@xorbotz
Merge branch 'MrCoyne' of https://github.com/vikings204/crescendo2024 …
3cd9d75 
…into MrCoyne
@TJbots15
Worked on Shuffleboard
fa6d15f
@TJbots15
Merge branches 'MrCoyne' and 'MrCoyne' of https://github.com/vikings2…
e8755a0 
…04/crescendo2024 into MrCoyne
@TJbots15
Added new entry Distance to Target, + Drive Encoder tabs have doubles…
73745ab 
… to get data now
@nevadex
auto work
544bba2
@nevadex
Merge remote-tracking branch 'origin/MrCoyne' into MrCoyne
dfa209a
@xorbotz
back to correct
9488f86
@xorbotz
pathplanner updates
3a12ed9
@xorbotz
more pathplanner updates
53cee99
@xorbotz
pathplannerupdates
58fcc68
@xorbotz
Path planner Working
675517e
@nevadex
clean up
e34e60b
@nevadex
fix deprecation error?
e941884
@xorbotz
path updated
16cab7c
@nevadex
intake auto working
73bd282
@nevadex
Merge remote-tracking branch 'origin/MrCoyne' into MrCoyne
56ce583
xorbotz and others added 24 commits March 12, 2024 13:18
@xorbotz
attempting to get abs encoders working
1d76ee3
@xorbotz
added flapsubsystem
ab191d2
@xorbotz
Reverted to Comp Code
f4184dd
@xorbotz
Mostly reverted to stuff
62c0ad6
@xorbotz
Updated some autos
8602830
@xorbotz
removed a silly print
e23ba67
@xorbotz
removeflap code and update auto
58351c3
@xorbotz
added methods for using analog sensore - will check later
c08c0eb
@nevadex
smol linear actuator
64a6f61
@xorbotz
don't know
bf74af6
@nevadex
flap accuracy
15895cf
@nevadex
Merge remote-tracking branch 'origin/CompWeekMrCoyne' into CompWeekMr…
8fc9e29 
…Coyne
@xorbotz
changed back to old zero
1056ffa
@nevadex
flap accuracy
8952aec
@nevadex
Merge remote-tracking branch 'origin/CompWeekMrCoyne' into CompWeekMr…
10f1a4c 
…Coyne
@nevadex
fix autoshoot to have no movement, disable flap
d33d282
@nevadex
potential alternate blinkin operation
d80e30a
@nevadex
its the small things
f495669
@nevadex
final speed limiter
33ab00a
@nevadex
final speed limiter works now
bbd84cd
@nevadex
clean up before 2025, should build now
408347c
@nevadex
update ci action according to wpilib docs since it didnt seem to be w…
3099621 
…orking
@nevadex
revert ci action, turns out the issue came from pathplanner not distr…
1d0c8f2 
…ibuting the version of its library that this was using. now updated
@nevadex
remove container dep for ci
43ec413
nevadex
nevadex previously approved these changes Dec 3, 2024
View reviewed changes
Copy link
Member

@nevadex nevadex left a comment

Choose a reason for hiding this comment

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

lets get this bread

nevadex
nevadex approved these changes Dec 3, 2024
View reviewed changes
Copy link
Member

@nevadex nevadex left a comment

Choose a reason for hiding this comment

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

okay now lets get this money cuz i was too restrictive in repo access controls

@team204frc team204frc merged commit 36914b5 into master Dec 3, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nevadex nevadex nevadex approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@team204frc @nevadex @xorbotz @TJbots15