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

Changes from Northern Lights #4

Closed
wants to merge 105 commits into from
Closed

Changes from Northern Lights #4

wants to merge 105 commits into from

Conversation

TotallyNotNero
Copy link
Member

Merge fixed changes from Northern Lights into master.

Fixes:

  • Autos
  • Unnecessary field flips
  • OI(?)

@TotallyNotNero
Copy link
Member Author

These conflicts are going to be impossible to resolve

@TotallyNotNero TotallyNotNero requested a review from KadeJR March 5, 2024 04:23
NorbyTMUR and others added 25 commits March 5, 2024 18:35
@NorbyTMUR
end of NL & tuesday code
3ad72ac
@TotallyNotNero
refactor shooter + OI, remove potential race condition
6ad45af
@TotallyNotNero
slight cleanup, implement shooter passing and other things
4278240
@NorbyTMUR
stuff
adc87a0
@NorbyTMUR
merge conflicts: everything worksTM
2778ddd
@TotallyNotNero
merge conflicts undid everything from yesterday so i fixed that
bbd3704
@fahgitaboutit
adding pose estimation. Couldn't test in sim because sim is brokey
05bf2da
@fahgitaboutit
exponentiation implemented, prints removed
076f273
@fahgitaboutit
might be a fix. Sim is too unreliable for me to know for sure
9d4bf2a
@NorbyTMUR
saturday changes
8437bff
@NorbyTMUR
Merge branch 'good-code' of https://github.com/team3082/2024Crescendo …
7e8f70c 
…into good-code
@NorbyTMUR
bro if true is still in here
a7ad2a0
@fahgitaboutit
150hz odometry woo
7d1480a
@NorbyTMUR
Merge branch 'good-code' of https://github.com/team3082/2024Crescendo …
176bf80 
…into good-code
@fahgitaboutit
fixed
7e58889
@NorbyTMUR
Merge branch 'good-code' of https://github.com/team3082/2024Crescendo …
0b25bcc 
…into good-code
@NorbyTMUR
4 note real good
b97e202
@fahgitaboutit
cleaned up choreo trajectories a bit
a166fdc
@KadeJR
subsystems actually turn off in test mode(lol)
af215ca
@KadeJR
this is a better way of doing it
905e62b
@KadeJR
just absolutely destroyed(i won) a calc test, so fixing this before i…
7429c72 
… forget
@TotallyNotNero
add intake current sensing for piece detection if beambreak breaks
69db832
@TotallyNotNero
cleanups
531d00e
@TotallyNotNero
might make the shooter faster
f15f4a9
@TotallyNotNero
shooter cleanup
9715a23
NorbyTMUR and others added 29 commits March 25, 2024 18:46
@NorbyTMUR
tuned way more w/ vision, auto-aim, etc
b6473d1
@KadeJR
added some code to get rid of detections past a certain distance to f…
a3366d8 
…ilter out bad detection, gonna change it to use the pigeon for detections next
@TotallyNotNero
comment or remove unused imports -kade
6459d2c
@NorbyTMUR
weds code
d4d79bc
@NorbyTMUR
new intake code correctly branched off working code
6be6e6c
@team3082-user
there is a lot of stuff in here so idk but its code from this week
8b85500
@team3082-user
intake part one
2785d48
@TotallyNotNero
intake should work now
1769003
@TotallyNotNero
parker's shooter angles
792ff0a
@TotallyNotNero
move and shoot more accurate
a2e5711
@TotallyNotNero
banner light good
6b500e7
@TotallyNotNero
banner light 2.0 (need to take home tho to make work better)
d9511cb
@team3082-user
made the banner light great again - ayman
de24cf5
@TotallyNotNero
incorporate parker’s want of an angle offset fudge factor
5886da4
@team3082-user
end of thursday code
e240a3e
@team3082-user
fixing merge conflicts on god
e347ccf
@team3082-user
Vision but cold ah
27ed369
@team3082-user
flips for blue alliance now
52b2fde
@team3082-user
all 16 april tags at the same time got me feeling dangerous
913867d
@team3082-user
Vision tested and good
5306f35
@team3082-user
Citrus Auto sets correctly now
93cf8c2
@team3082-user
friday code
3671f93
@team3082-user
end of comp code
094623a
@TotallyNotNero
Merge pull request #9 from team3082/intake
47b9433 
new intake code
@TotallyNotNero
Merge pull request #8 from team3082/move-and-shoot-autos
498e825 
Move and Shoot Autos
@NorbyTMUR
rotation works now
8c53270
@TotallyNotNero
Merge pull request #10 from team3082/rot-fix
411529b 
rotation works now
@EmilioMGithub
Realized in ChoreoTrajectoryGenrator there is dead code
430abeb 
This code has no effect on the program so I figured I would just comment it out.
@KadeJR
compiles, builds, deploys, need to update PhotonVision on Mini PC. ne…
d2a176c 
…ed to merge with MRI branch
@JMalvin06 JMalvin06 closed this Feb 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KadeJR KadeJR Awaiting requested review from KadeJR

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

Successfully merging this pull request may close these issues.
7 participants
@TotallyNotNero @JMalvin06 @NorbyTMUR @fahgitaboutit @KadeJR @team3082-user @EmilioMGithub