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

Changes from Northern Lights #4

Closed
wants to merge 105 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
d19aa03
good code on god
NorbyTMUR Mar 2, 2024
fecf9a2
Pushing because laptop is on deathbed
NorbyTMUR Mar 2, 2024
dd4298f
A tad bit of auto
JMalvin06 Mar 2, 2024
3ad72ac
end of NL & tuesday code
NorbyTMUR Mar 6, 2024
6ad45af
refactor shooter + OI, remove potential race condition
TotallyNotNero Mar 6, 2024
4278240
slight cleanup, implement shooter passing and other things
TotallyNotNero Mar 6, 2024
adc87a0
stuff
NorbyTMUR Mar 8, 2024
2778ddd
merge conflicts: everything worksTM
NorbyTMUR Mar 8, 2024
bbd3704
merge conflicts undid everything from yesterday so i fixed that
TotallyNotNero Mar 8, 2024
05bf2da
adding pose estimation. Couldn't test in sim because sim is brokey
fahgitaboutit Mar 12, 2024
076f273
exponentiation implemented, prints removed
fahgitaboutit Mar 12, 2024
9d4bf2a
might be a fix. Sim is too unreliable for me to know for sure
fahgitaboutit Mar 12, 2024
8437bff
saturday changes
NorbyTMUR Mar 12, 2024
7e8f70c
Merge branch 'good-code' of https://github.com/team3082/2024Crescendo…
NorbyTMUR Mar 12, 2024
a7ad2a0
bro if true is still in here
NorbyTMUR Mar 12, 2024
7d1480a
150hz odometry woo
fahgitaboutit Mar 12, 2024
176bf80
Merge branch 'good-code' of https://github.com/team3082/2024Crescendo…
NorbyTMUR Mar 12, 2024
7e58889
fixed
fahgitaboutit Mar 12, 2024
0b25bcc
Merge branch 'good-code' of https://github.com/team3082/2024Crescendo…
NorbyTMUR Mar 12, 2024
b97e202
4 note real good
NorbyTMUR Mar 13, 2024
a166fdc
cleaned up choreo trajectories a bit
fahgitaboutit Mar 13, 2024
af215ca
subsystems actually turn off in test mode(lol)
KadeJR Mar 13, 2024
905e62b
this is a better way of doing it
KadeJR Mar 13, 2024
7429c72
just absolutely destroyed(i won) a calc test, so fixing this before i…
KadeJR Mar 14, 2024
69db832
add intake current sensing for piece detection if beambreak breaks
TotallyNotNero Mar 15, 2024
531d00e
cleanups
TotallyNotNero Mar 15, 2024
f15f4a9
might make the shooter faster
TotallyNotNero Mar 15, 2024
9715a23
shooter cleanup
TotallyNotNero Mar 15, 2024
5bc5c6e
i would actually rather not go through this hassle
TotallyNotNero Mar 15, 2024
a8280d5
Interpolating should be good to roll, also cleaned up file structure
Mar 16, 2024
2fa0883
Okay, interpolating is ACTUALLY good rn
Mar 16, 2024
69e7964
tweaks n such
Mar 16, 2024
f21c5e4
lock the robot's angle to speaker when firing automatically
TotallyNotNero Mar 17, 2024
aa812c5
fix the logic that prevented ejecting the shooter
TotallyNotNero Mar 17, 2024
67f7613
lets get a default value in the shooter tables
TotallyNotNero Mar 17, 2024
7aab77b
remove the safety factor, will re-add after testing
TotallyNotNero Mar 17, 2024
530e295
one can only hope
fahgitaboutit Mar 18, 2024
2f5e937
java.util.Optional can father my children
fahgitaboutit Mar 18, 2024
e819549
shooting while moving math is finished. checks out in sim and my head
TotallyNotNero Mar 19, 2024
e4d830e
add a lower bound limit to the angle when shooting on the move
TotallyNotNero Mar 19, 2024
c916d73
swap between manual/auto shooter
TotallyNotNero Mar 19, 2024
442af6f
Merge branch 'good-code' of https://github.com/team3082/2024Crescendo…
TotallyNotNero Mar 19, 2024
1a503ef
this is more efficient
TotallyNotNero Mar 19, 2024
f2f349b
napkin math is better now
NorbyTMUR Mar 19, 2024
6b662a8
shooter tuning values
team3082-user Mar 19, 2024
4f7623c
Merge branch 'good-code' of https://github.com/team3082/2024Crescendo…
team3082-user Mar 19, 2024
81223ed
fixed a bug
NorbyTMUR Mar 19, 2024
fb056b0
vision goes hard
NorbyTMUR Mar 19, 2024
3d6fb26
Merge pull request #6 from team3082/boringvision
TotallyNotNero Mar 19, 2024
bd6e02c
amp: fixed, autos: faster, vision: fixed
NorbyTMUR Mar 19, 2024
689c701
Autos go faster now
fahgitaboutit Mar 20, 2024
a5e77f8
force fire command
fahgitaboutit Mar 20, 2024
0d0377a
missed this
fahgitaboutit Mar 20, 2024
ffd1c29
hopefully better 4 piece routine
fahgitaboutit Mar 20, 2024
042196b
tighten deadbands for shooter wheels and pivot motor
TotallyNotNero Mar 20, 2024
807f9ac
light tune
NorbyTMUR Mar 20, 2024
354beba
code from EP: red autos working, angles tuned, velocities tuned.... i…
NorbyTMUR Mar 21, 2024
9b8e7de
flipping should be working now
fahgitaboutit Mar 21, 2024
e107009
fixed initializing bug
fahgitaboutit Mar 21, 2024
49045e2
see why generics are so great now
fahgitaboutit Mar 21, 2024
0cdacb4
95% accuracy YOOOOOOOOO
NorbyTMUR Mar 21, 2024
feb2314
feedforward tuned
NorbyTMUR Mar 23, 2024
f217ae0
Telemetry trajectory states
JMalvin06 Mar 23, 2024
d87924d
merge issues
NorbyTMUR Mar 23, 2024
0d7b1cb
Merge branch 'good-code' of https://github.com/team3082/2024Crescendo…
NorbyTMUR Mar 23, 2024
59197c0
MOVE AND SHOOT AND INTERPOLATING
NorbyTMUR Mar 23, 2024
821c0f6
reorganized some stuff, actually used constants (wow ikr), and fixed …
TotallyNotNero Mar 24, 2024
5d0ecf4
WIP: autos that move and shoot
TotallyNotNero Mar 24, 2024
6529030
6 piece middle path (WIP WIP WIP WIP)
TotallyNotNero Mar 25, 2024
b7362c7
amp side autos
fahgitaboutit Mar 25, 2024
a89042e
tuned shooter pivot
NorbyTMUR Mar 25, 2024
9f55b9a
move and shoot tuning
NorbyTMUR Mar 25, 2024
51c370c
tuned shooter pivot
NorbyTMUR Mar 25, 2024
90ed8f6
move and shoot tuning
NorbyTMUR Mar 25, 2024
900dad9
comments n stuff n light tunez
NorbyTMUR Mar 25, 2024
d80fd9a
e
NorbyTMUR Mar 25, 2024
b6473d1
tuned way more w/ vision, auto-aim, etc
NorbyTMUR Mar 25, 2024
a3366d8
added some code to get rid of detections past a certain distance to f…
KadeJR Mar 27, 2024
6459d2c
comment or remove unused imports -kade
TotallyNotNero Mar 27, 2024
d4d79bc
weds code
NorbyTMUR Mar 28, 2024
6be6e6c
new intake code correctly branched off working code
NorbyTMUR Mar 28, 2024
8b85500
there is a lot of stuff in here so idk but its code from this week
team3082-user Mar 30, 2024
2785d48
intake part one
team3082-user Apr 3, 2024
1769003
intake should work now
TotallyNotNero Apr 3, 2024
792ff0a
parker's shooter angles
TotallyNotNero Apr 3, 2024
a2e5711
move and shoot more accurate
TotallyNotNero Apr 3, 2024
6b500e7
banner light good
TotallyNotNero Apr 3, 2024
d9511cb
banner light 2.0 (need to take home tho to make work better)
TotallyNotNero Apr 3, 2024
de24cf5
made the banner light great again - ayman
team3082-user Apr 4, 2024
5886da4
incorporate parker’s want of an angle offset fudge factor
TotallyNotNero Apr 4, 2024
e240a3e
end of thursday code
team3082-user Apr 4, 2024
e347ccf
fixing merge conflicts on god
team3082-user Apr 4, 2024
27ed369
Vision but cold ah
team3082-user Apr 5, 2024
52b2fde
flips for blue alliance now
team3082-user Apr 5, 2024
913867d
all 16 april tags at the same time got me feeling dangerous
team3082-user Apr 5, 2024
5306f35
Vision tested and good
team3082-user Apr 5, 2024
93cf8c2
Citrus Auto sets correctly now
team3082-user Apr 5, 2024
3671f93
friday code
team3082-user Apr 5, 2024
094623a
end of comp code
team3082-user Apr 16, 2024
47b9433
Merge pull request #9 from team3082/intake
TotallyNotNero Apr 16, 2024
498e825
Merge pull request #8 from team3082/move-and-shoot-autos
TotallyNotNero Apr 16, 2024
8c53270
rotation works now
NorbyTMUR Apr 23, 2024
411529b
Merge pull request #10 from team3082/rot-fix
TotallyNotNero Apr 23, 2024
430abeb
Realized in ChoreoTrajectoryGenrator there is dead code
EmilioMGithub May 26, 2024
d2a176c
compiles, builds, deploys, need to update PhotonVision on Mini PC. ne…
KadeJR Sep 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 28 additions & 9 deletions .Glass/glass.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
{
"NetworkTables": {
"Retained Values": {
"open": false
},
"retained": {
"Shuffleboard": {
"SmartDashboard": {
"open": true
},
"open": true
}
},
"transitory": {
"LiveWindow": {
"open": true
},
"Shuffleboard": {
"Positions": {
"open": true
Expand All @@ -22,8 +36,7 @@
},
"ApriltagCamera4": {
"open": true
},
"open": true
}
}
},
"types": {
Expand All @@ -33,6 +46,7 @@
"/Shuffleboard/SmartDashboard/Field View": "Field2d",
"/Shuffleboard/SmartDashboard/Subsystems": "Mechanism2d",
"/Shuffleboard/SmartDashboard/Swerve": "Mechanism2d",
"/Shuffleboard/SmartDashboard/Trajectory State": "Field2d",
"/SmartDashboard/Auto Choices": "String Chooser",
"/SmartDashboard/Auto choices": "String Chooser",
"/SmartDashboard/NAVX": "Gyro",
Expand All @@ -50,16 +64,20 @@
}
},
"/Shuffleboard/SmartDashboard/Field View": {
"bottom": 544,
"builtin": "2024 Crescendo",
"height": 8.013679504394531,
"left": 46,
"right": 1088,
"top": 36,
"bottom": 1476,
"height": 8.210550308227539,
"left": 150,
"right": 2961,
"top": 79,
"width": 16.541748046875,
"window": {
"visible": true
}
},
"/Shuffleboard/SmartDashboard/Swerve": {
"window": {
"visible": true
}
}
}
},
Expand All @@ -68,6 +86,7 @@
},
"NetworkTables Settings": {
"mode": "Client (NT4)",
"serverTeam": "3082"
"serverTeam": "3082",
"visible": false
}
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.2.1"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
}

java {
Expand Down
3 changes: 2 additions & 1 deletion simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"/Shuffleboard/SmartDashboard/Custom Field": "Mechanism2d",
"/Shuffleboard/SmartDashboard/Field View": "Field2d",
"/Shuffleboard/SmartDashboard/Subsystems": "Mechanism2d",
"/Shuffleboard/SmartDashboard/Swerve": "Mechanism2d"
"/Shuffleboard/SmartDashboard/Swerve": "Mechanism2d",
"/Shuffleboard/SmartDashboard/Trajectory State": "Field2d"
},
"windows": {
"/FMSInfo": {
Expand Down
Loading