Skip to content

Dev #35

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

Open
wants to merge 278 commits into
base: main
Choose a base branch
from
Open

Dev #35

Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
278 commits
Select commit Hold shift + click to select a range
8eda89f
Reordered
Strflightmight09 Sep 13, 2024
e0e6be5
Fixed?
Strflightmight09 Sep 13, 2024
c413fde
Renamed and converted degrees to radians
Strflightmight09 Sep 13, 2024
2ca71c9
Added javadoc
Strflightmight09 Sep 14, 2024
0ed359f
Made changing the best target if needed easier
Strflightmight09 Sep 14, 2024
8245c2c
Reordered
Strflightmight09 Sep 14, 2024
e588f20
Clean
Strflightmight09 Sep 14, 2024
73bb5ba
Fixed problem
Strflightmight09 Sep 14, 2024
eea45cd
Reformatted
Strflightmight09 Sep 14, 2024
59d92b2
Updated TRIGONLib
Strflightmight09 Sep 14, 2024
6fa239f
Fixed bug
Strflightmight09 Sep 14, 2024
10655c5
Removed PhotonPoseEstimator
Strflightmight09 Sep 14, 2024
5438a84
Reordered and renamed
Strflightmight09 Sep 15, 2024
e10c5f8
Fixed order and extensive logging
Strflightmight09 Sep 15, 2024
6293822
Removed redundant checks
Strflightmight09 Sep 15, 2024
7c4e721
Added changes from after testing (still more to do though)
Strflightmight09 Sep 24, 2024
9daaacb
Fixed logic problems and updated to new pose estimation method
Strflightmight09 Sep 24, 2024
2d5f521
Removed vars
Strflightmight09 Sep 24, 2024
85e4451
Reverted to only solvePNP 😢
Strflightmight09 Sep 30, 2024
1d582fa
Merge branch 'main' into vision-fixes
Strflightmight09 Sep 30, 2024
a408d1c
pitcher ff
Nummun14 Sep 30, 2024
c7f3f3c
Fixed pitcher (I think) and started shooter stuff
Strflightmight09 Sep 30, 2024
9af71d6
Calibrated shooter
Strflightmight09 Oct 1, 2024
b21eb8f
Updated pitcher constants. Still needs calibration
Strflightmight09 Oct 1, 2024
d67aa6b
Merge branch 'main' into calibrations
Nummun14 Oct 1, 2024
2344e02
updated gear ratio
Nummun14 Oct 1, 2024
871c0f9
pitcher is still overshooting by 2 degrees
Nummun14 Oct 5, 2024
309c178
added shooter FF
Nummun14 Oct 5, 2024
1295df8
Completed shooter PID
Strflightmight09 Oct 6, 2024
53105c3
Calibrated AmpAligner
Strflightmight09 Oct 6, 2024
4dabf6b
Updated amp shot values
Strflightmight09 Oct 6, 2024
800662f
Calibrated Pitcher
Strflightmight09 Oct 6, 2024
c6ac258
Calibrated software limits for pitcher
Strflightmight09 Oct 6, 2024
1a8ae30
Finished Pitcher calibrations
Strflightmight09 Oct 6, 2024
aa524bb
Actually finished pitcher calibrations
Strflightmight09 Oct 6, 2024
b409f93
Merge branch 'main' into calibrations
Strflightmight09 Oct 6, 2024
85ee672
Updated `RobotContainer`
Strflightmight09 Oct 6, 2024
78936ba
added DIstance Sensor Channel
Nummun14 Oct 6, 2024
983b1b4
readded LEDs default command
Nummun14 Oct 6, 2024
a61adb3
Removed error
Strflightmight09 Oct 7, 2024
56bf439
Fix
Strflightmight09 Oct 7, 2024
1c91765
Replaced deleted lines from vision fixes
Strflightmight09 Oct 7, 2024
ff25df5
Added camera constants (not pitch)
Strflightmight09 Oct 7, 2024
cbda21d
Updated camera heights
Strflightmight09 Oct 7, 2024
8f7743c
Updated Photon lib
Strflightmight09 Oct 7, 2024
4b4c39c
Merge branch 'main' into calibrations
Nummun14 Oct 7, 2024
8ed895e
Merge branch 'calibrations' of https://github.com/Programming-TRIGON/…
Nummun14 Oct 7, 2024
94d8996
Updated TRIGONLib
Strflightmight09 Oct 7, 2024
d05366f
huigch
Strflightmight09 Oct 7, 2024
f21ffd3
3 > 2.5
Strflightmight09 Oct 7, 2024
68d442b
corrected collection indication rumbling
Nummun14 Oct 7, 2024
5a3b2ce
Swerve Offsets
Strflightmight09 Oct 7, 2024
5521507
after first field test
Strflightmight09 Oct 8, 2024
50a6898
corrected scaling
Nummun14 Oct 8, 2024
5ea7977
Implemented amp fix (yay)
Strflightmight09 Oct 8, 2024
8ca44fe
Set some intake stuff
Strflightmight09 Oct 8, 2024
fdfec5c
fix
Strflightmight09 Oct 8, 2024
dfcb892
added missing bracket
Nummun14 Oct 8, 2024
f72c4e2
moved
Nummun14 Oct 8, 2024
1d22941
Intake works (yay)
Strflightmight09 Oct 8, 2024
3ad63ed
stuff
Nummun14 Oct 8, 2024
7be0131
cleaned up code
Strflightmight09 Oct 8, 2024
8e0d684
fix
Strflightmight09 Oct 8, 2024
64c09cb
Fixed camera error
Strflightmight09 Oct 9, 2024
a1ad05b
cameras and collection
Nummun14 Oct 9, 2024
9b82d06
quick commit
Strflightmight09 Oct 10, 2024
7641fbf
added SourceSide3NoteAutoRight
Nummun14 Oct 10, 2024
0957fa7
added 3NoteAutoThroughAmpLeft and cleaned up autos
Nummun14 Oct 11, 2024
89ab08d
changed folder name
Nummun14 Oct 11, 2024
4b840a3
things
Nummun14 Oct 11, 2024
623d946
corrected LEDStripConstants
Nummun14 Oct 11, 2024
1b70a19
fixes
Nummun14 Oct 12, 2024
d1986b7
Fixed stuff
Nummun14 Oct 12, 2024
7616324
Updated camera stuff
Strflightmight09 Oct 13, 2024
830be32
Camera stuff and leds idek
Nummun14 Oct 13, 2024
9916217
SysID'd climber
Nummun14 Oct 13, 2024
907fda6
commit
Nummun14 Oct 13, 2024
b6cb3a2
commit
Strflightmight09 Oct 13, 2024
e42c24b
Merge branch 'calibrations' of https://github.com/Programming-TRIGON/…
Strflightmight09 Oct 13, 2024
83109bf
Uncommented amp stuff
Nummun14 Oct 13, 2024
ad05aaf
Added amp without aligning
Nummun14 Oct 13, 2024
97b31c1
Merge branch 'autonomous-fixes' into calibrations
Nummun14 Oct 13, 2024
57758ff
first auto
Nummun14 Oct 13, 2024
1e670ac
cvty
Nummun14 Oct 13, 2024
28a6f40
Update 3NoteAutoThroughAmp.auto
Nummun14 Oct 13, 2024
0c134e2
right
Nummun14 Oct 13, 2024
3a2d6a5
FIXED front notes auto
Strflightmight09 Oct 13, 2024
b746247
Merge branch 'autonomous-fixes' into calibrations
Strflightmight09 Oct 13, 2024
4291365
fixed other autos though not completly
Strflightmight09 Oct 13, 2024
52e40b9
fixed soruce auto
Strflightmight09 Oct 13, 2024
7d8afa1
a bunch of random stuff idk
Nummun14 Oct 13, 2024
4463ee2
fixed 3NoteAutoThroughAmp
Strflightmight09 Oct 13, 2024
9482b9c
Merge branch 'calibrations' of https://github.com/Programming-TRIGON/…
Nummun14 Oct 13, 2024
ddb22c3
vfi
Nummun14 Oct 13, 2024
a911e6d
fctufv
Nummun14 Oct 13, 2024
676ab4a
around
Nummun14 Oct 13, 2024
54433d7
7
Nummun14 Oct 13, 2024
df4f128
h
Nummun14 Oct 13, 2024
6c0a78c
mrush
Nummun14 Oct 13, 2024
7c36cd5
zayde
Nummun14 Oct 13, 2024
42f6bef
fixed speaker auto
Nummun14 Oct 13, 2024
89580fb
added pid
Nummun14 Oct 13, 2024
e1fe7a9
removed redudnet
Nummun14 Oct 13, 2024
230f29f
Merge branch 'autonomous-fixes' into calibrations
Nummun14 Oct 13, 2024
8700c7f
fix error
Nummun14 Oct 13, 2024
fb583ac
changed climber inverted values
Nummun14 Oct 13, 2024
aba21e3
Made AlignToNoteCommand better
Strflightmight09 Oct 13, 2024
455c3d1
Reset for home speaker
Strflightmight09 Oct 13, 2024
e6adc58
climber stuff
Nummun14 Oct 14, 2024
7d34096
Amp calib + pose resetting fix
Nummun14 Oct 14, 2024
c190885
worked on LEDs
Nummun14 Oct 14, 2024
2575d62
SysID swerve
Nummun14 Oct 14, 2024
bcdc293
auto and other
Nummun14 Oct 14, 2024
513a29e
auto PID
Nummun14 Oct 14, 2024
adcf6ba
grtwfgsdtfc
Nummun14 Oct 14, 2024
faae107
Swerve offset update
Strflightmight09 Oct 15, 2024
f0729fc
Testing LED stuff
Strflightmight09 Oct 15, 2024
aeab094
Removed ugly thing
Nummun14 Oct 15, 2024
78872c8
fixed frontRowAuto
Strflightmight09 Oct 15, 2024
d6d851a
Removed SysID from `RobotContainer.java`
Nummun14 Oct 15, 2024
c3b39ea
fixed bb auto
Strflightmight09 Oct 15, 2024
cf242ca
fixed3NoteAytiKeftAuto
Strflightmight09 Oct 15, 2024
18ecadb
fixed 3noteAutoThroughAmp
Strflightmight09 Oct 15, 2024
29995c6
made autos slower
Strflightmight09 Oct 15, 2024
a6782e9
Merge branch 'autonomous-fixes' into calibrations
Strflightmight09 Oct 15, 2024
909fc72
fixed error
Strflightmight09 Oct 15, 2024
18a5b3c
fixed error
Strflightmight09 Oct 15, 2024
5fb6402
fix front row auto
Strflightmight09 Oct 15, 2024
bf5eaf9
stuff
Nummun14 Oct 15, 2024
19cbdbe
auto and auto align stuf
Nummun14 Oct 15, 2024
7058b3b
auto, alignment, and climb
Nummun14 Oct 15, 2024
319d7b6
`¯\_(ツ)_/¯`
Strflightmight09 Oct 15, 2024
86f8f48
Oops
Strflightmight09 Oct 15, 2024
6c03415
changed climber gains
Nummun14 Oct 15, 2024
07af26e
Small fix :)
Strflightmight09 Oct 15, 2024
5b0cdd9
Merge branch 'calibrations' of https://github.com/Programming-TRIGON/…
Strflightmight09 Oct 15, 2024
fef3b01
Why are these even here?
Strflightmight09 Oct 15, 2024
c003c82
Probably fixed LEDs
Strflightmight09 Oct 15, 2024
4698459
Small fixes (more coming)
Strflightmight09 Oct 15, 2024
8c8c604
Yay (LEDs working)
Strflightmight09 Oct 15, 2024
2bd437a
Final quick thingy for LEDs
Strflightmight09 Oct 15, 2024
7649608
I hope this doesn't break stuff (:
Strflightmight09 Oct 15, 2024
db43f54
Fixed command
Strflightmight09 Oct 15, 2024
cf132a3
auto changes and camera pitch
Nummun14 Oct 16, 2024
b0ad0c7
Intake fix + 1/2 std calib
Nummun14 Oct 16, 2024
bb01715
I had time so I did LED stuff
Nummun14 Oct 16, 2024
c4e4441
I'll check my changes laterrrrrr
Nummun14 Oct 16, 2024
75c6ee3
camera and shooting
Nummun14 Oct 17, 2024
ca3debb
The LED stuff works!
Strflightmight09 Oct 17, 2024
12f4b32
Climber single movement commands
Strflightmight09 Oct 17, 2024
71e420b
Possibly perfected intake stuff
Strflightmight09 Oct 17, 2024
94fbc71
Fixed stupid things
Strflightmight09 Oct 17, 2024
6d4874f
added lower amp trigger
Nummun14 Oct 17, 2024
1d9ee60
Merge branch 'calibrations' of https://github.com/Programming-TRIGON/…
Nummun14 Oct 17, 2024
33b560a
added blocking command
Strflightmight09 Oct 17, 2024
94e4cc2
Fixed block command
Strflightmight09 Oct 17, 2024
fd8d679
Fixed climber move stuffy
Strflightmight09 Oct 17, 2024
eb8fd4a
STOP PUTTING EVERYTHING ON 1!!!
Nummun14 Oct 17, 2024
931c398
New Swerve offset
Nummun14 Oct 17, 2024
ebb4102
Pretty sure calibrated
Nummun14 Oct 17, 2024
60a147b
Some stuff
Nummun14 Oct 18, 2024
0b658af
Finished shooting stuff
Nummun14 Oct 18, 2024
20813ee
auto stuff
Nummun14 Oct 18, 2024
09bfbb2
Maybe upgraded intake and added LEDAutoSetup
Strflightmight09 Oct 18, 2024
a4e2137
Possibly improved AlignToNoteCommand (BE READY TO REVERT THIS)
Strflightmight09 Oct 18, 2024
6d281ce
Fixed final LED stuff and cleaned `LEDStripCommands`
Strflightmight09 Oct 18, 2024
52cc111
added optimized auto and fixed LEDCommands Errror
Nummun14 Oct 18, 2024
58c2bce
updated 3Triumph and bb
Nummun14 Oct 18, 2024
84264f3
correted my auto
Nummun14 Oct 18, 2024
58a6270
ahhhhhhhhhhhhhhhhhhhhh
Nummun14 Oct 18, 2024
8c0833a
ahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
Nummun14 Oct 20, 2024
927d489
comp day
Nummun14 Oct 20, 2024
865e497
ahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh…
Nummun14 Oct 20, 2024
f5a89be
Yohay just broke a cable!!!!!!!!!!!!!!
Nummun14 Oct 20, 2024
4183255
frsda
Nummun14 Oct 20, 2024
cad1753
17
Nummun14 Oct 20, 2024
093f18a
After camera fix
Nummun14 Oct 20, 2024
c41c833
Switched driver amp button to indicate LEDs
Nummun14 Oct 20, 2024
d2adb53
added improved auto and minor fix for @Strflightmight09 :). FINALS T…
Nummun14 Oct 20, 2024
1dff2eb
FINAL COMP DAY
Nummun14 Oct 21, 2024
b732bf0
fix
Nummun14 Oct 21, 2024
a898571
Gave me (Ezra) manual delivery button
Nummun14 Oct 21, 2024
df013ee
first playoff game
Nummun14 Oct 21, 2024
ef09385
Soo closeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
Nummun14 Oct 21, 2024
ca1a994
Tiny cleaning stuff I just found
Strflightmight09 Oct 24, 2024
83ff106
LOTS of fixes (not enough)
Strflightmight09 Oct 27, 2024
a67827a
Thank you @Nummun14 <3
Strflightmight09 Oct 28, 2024
1c072e6
Minor LED fixes 🤷‍♂️
Strflightmight09 Oct 28, 2024
4f3c07c
Fixed `AlignToNoteCommand.java`
Strflightmight09 Oct 29, 2024
90f21c0
Not cleaner
Strflightmight09 Oct 29, 2024
2ad0e22
I hope this works (cleaned reset to solve pnp pose)
Strflightmight09 Oct 29, 2024
4281304
cleaned up autos
Nummun14 Oct 29, 2024
1d6e501
removed empty commands
Nummun14 Oct 29, 2024
72eeddf
Cleaned vision stuff
Strflightmight09 Oct 29, 2024
5a395bf
Merge branch 'calibrations' of https://github.com/Programming-TRIGON/…
Strflightmight09 Oct 29, 2024
75275fd
cleaned up stuff
Nummun14 Oct 29, 2024
0cb5f47
Simple cleaning
Strflightmight09 Oct 29, 2024
7355932
Merge branch 'calibrations' of https://github.com/Programming-TRIGON/…
Strflightmight09 Oct 29, 2024
7c62b0c
Fixed bug and removed one led for alignment
Strflightmight09 Oct 29, 2024
10cd720
Fixed LED stuff and made better intake LED commands and fixed intake …
Strflightmight09 Oct 29, 2024
ccbf53c
Fixed `AlignToNote.java`
Strflightmight09 Oct 30, 2024
c9be8c0
Made blink more versatile
Strflightmight09 Oct 30, 2024
0f84437
These didn't go with the previous commit for some reason
Strflightmight09 Oct 30, 2024
7c1e11b
Consistency is key
Strflightmight09 Oct 30, 2024
9e5b4c4
Minor cleaning to LEDs
Strflightmight09 Oct 30, 2024
126be5b
Changes to LED stuff
Strflightmight09 Oct 30, 2024
0ef7dfe
Implemented clean breathe transitions
Strflightmight09 Oct 30, 2024
6537ef5
Added inverted for breathe LED command
Strflightmight09 Oct 30, 2024
d68fb49
Fixed amp simulation animation
Strflightmight09 Oct 31, 2024
f76c74e
added sectionColorCommand. Didn't test it yet though. Will do that later
Nummun14 Nov 1, 2024
45f97a3
fixes sectionColor index and inverted
Nummun14 Nov 2, 2024
6d268e0
simplified sectionColor
Nummun14 Nov 3, 2024
2cd1d76
fixed 7NoteAuto and SourceSide3NoteAuto
Nummun14 Nov 3, 2024
39c3ccd
fixed speakerSide3NoteAuto
Nummun14 Nov 3, 2024
2bab78b
fixed middleRush auto
Nummun14 Nov 5, 2024
15173c8
Update Zayde3NoteAuto.auto
Nummun14 Nov 5, 2024
b56a12a
fixed around stage autos
Nummun14 Nov 5, 2024
57d04e6
fixed breath inverted and removed unnecacery auto commands
Nummun14 Nov 5, 2024
e365f0d
fixed
Nummun14 Nov 5, 2024
38257b5
fixed stupid error
Nummun14 Nov 5, 2024
02b910d
accidently commited this
Nummun14 Nov 5, 2024
ebd561d
added alternateColor because I was bored
Nummun14 Nov 7, 2024
ac8ee7e
added inverted for rainbow command
Nummun14 Nov 7, 2024
be3bc37
cleaned up led command usages
Nummun14 Nov 7, 2024
86c17b2
cleaned leds a bit
Nummun14 Nov 8, 2024
59fb728
added colorFlow command
Nummun14 Nov 9, 2024
84c6e57
Lots of random stuff idek
Strflightmight09 Nov 10, 2024
7ad48df
cleaned LEDs a bit.
Nummun14 Nov 11, 2024
173c1d8
Changes
Strflightmight09 Nov 11, 2024
0b47b10
Stuff works 💪
Strflightmight09 Nov 11, 2024
11b846d
Camera sim is working + fixed Front Camera problem (Thanks to the sim…
Strflightmight09 Nov 11, 2024
d104869
Removed LoggedDashboardNumber
Strflightmight09 Nov 11, 2024
fa0fe7c
Added sim camera properties stuff
Strflightmight09 Nov 13, 2024
f851563
Minor sim camera clean
Strflightmight09 Nov 13, 2024
6238e48
Better camera IO stuffies idk
Strflightmight09 Nov 13, 2024
aae3f2c
Merge branch 'main' into calibrations
Strflightmight09 Nov 14, 2024
4ec3a0b
Added IO for sim camera
Strflightmight09 Nov 14, 2024
7580fab
Updated TRIGONLib
Strflightmight09 Nov 14, 2024
45f4d0d
Updated PhotonLib
Strflightmight09 Nov 14, 2024
99afb9b
Fixed reset auto pose
Strflightmight09 Nov 15, 2024
c90e257
`getLatestPipelineResult` returns null
Strflightmight09 Nov 17, 2024
586dcf2
Minor cleaning
Strflightmight09 Nov 17, 2024
a7b6d64
It still needs debugging...
Strflightmight09 Nov 18, 2024
5e3fd2d
Fixed camera rotation logic
Strflightmight09 Nov 18, 2024
7137725
Renamed
Strflightmight09 Nov 18, 2024
38685d5
Cleaned and almost fixed
Strflightmight09 Nov 19, 2024
28b5981
Changed sim logic (still not working)
Nov 21, 2024
aa36000
It was the units...
Nov 21, 2024
7a52176
Minor cleaning stuff
Strflightmight09 Nov 23, 2024
b9e9659
Logic fixes + cleaning for sim cams
Strflightmight09 Nov 25, 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
18 changes: 15 additions & 3 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,30 @@
"holonomicMode": true,
"pathFolders": [
"3NoteAutoThroughAmp",
"3NoteAutoThroughAmpLeft",
"5NoteAutoAroundStage",
"7NoteAuto",
"FrontRow4NoteAuto",
"MiddleRush3NoteAuto",
"FrontRow4NoteAutoFarShoot",
"SourceSide3NoteAuto",
"SourceSide3NoteAutoFront",
"SourceSide3NoteAutoRight",
"SpeakerSide3NoteAuto",
"Zayde3NoteAuto"
"Zayde3NoteAuto",
"test"
],
"autoFolders": [
"3NoteAutoThroughAmpVarients",
"frontRow",
"FarNotesAroundStageVarients",
"OtherAutos",
"SourceSide3NoteAutoVarients",
"misc"
],
"autoFolders": [],
"defaultMaxVel": 4.0,
"defaultMaxAccel": 4.0,
"defaultMaxAngVel": 400.0,
"defaultMaxAngAccel": 600.0,
"defaultMaxAngAccel": 400.0,
"maxModuleSpeed": 4.5
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies {
simulationRelease wpi.sim.enableRelease()

implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.github.Programming-TRIGON:TRIGONLib:2024.2.10'
implementation 'com.github.Programming-TRIGON:TRIGONLib:debugging-SNAPSHOT'

def akitJson = new groovy.json.JsonSlurper().parseText(new File(projectDir.getAbsolutePath() + "/vendordeps/AdvantageKit.json").text)
annotationProcessor "org.littletonrobotics.akit.junction:junction-autolog:$akitJson.version"
Expand Down
Loading
Loading