Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
4dac50f
Broke Auto?
abuddies0 Jan 31, 2024
52cb942
Shooter ff structure, swerve auto turn code that doesnt work
Slimjim42 Jan 31, 2024
f8bd819
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
Slimjim42 Jan 31, 2024
d913841
Working turn auto, speed adjustments, reorganized swerve subsystem to…
Slimjim42 Feb 2, 2024
98e1ce8
Made +x Forwards and +y Left in Swerve
abuddies0 Feb 3, 2024
cf4d7d9
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Feb 3, 2024
2de083e
Merge LED branches
ehc12345678 Feb 3, 2024
4ee1450
Squashed commit of the following:
ehc12345678 Feb 3, 2024
af47f90
Code cleanup
ehc12345678 Feb 3, 2024
e407466
Worked on Path Planner
abuddies0 Feb 4, 2024
ec7b275
Fixed Path Planner!
abuddies0 Feb 6, 2024
ca4baec
Map actions to commands
ehc12345678 Feb 7, 2024
f7dfdbf
Merge branch 'LED-stuff'
Justin-Dana Feb 8, 2024
a0a2834
fixed a silly little compile bug
Justin-Dana Feb 8, 2024
836f104
Fixed couple of errors
Justin-Dana Feb 8, 2024
14c44a2
Mostly Working now
Justin-Dana Feb 8, 2024
f3ad2ed
Overhauled Shooter, PathPlanner, and Shuffleboard.
abuddies0 Feb 10, 2024
4a5fceb
Separated the controller into two controllers.
abuddies0 Feb 10, 2024
7162a61
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Feb 10, 2024
9e7e542
Merge Issues "Fixed"
abuddies0 Feb 10, 2024
71d6312
Heavily commented code and added Intake rotatability
abuddies0 Feb 11, 2024
75e9cb7
Added Climber Code.
abuddies0 Feb 11, 2024
c777031
Added control support for the climber.
abuddies0 Feb 11, 2024
a742819
Added a FullIntake command.
abuddies0 Feb 11, 2024
1ad3f91
Added some potential feedforward values for the shooter and intake.
abuddies0 Feb 11, 2024
3e4bbac
Added commands for testing to the shuffleboard.
abuddies0 Feb 11, 2024
ed27837
Fixed issue with LEDs
abuddies0 Feb 11, 2024
0aa014f
Added Pose Estimation and tag tracking code
Mguarr Feb 13, 2024
9bfa69a
Mildly fixed Intake, Shooter, and Robot.java
abuddies0 Feb 15, 2024
cd548fd
Mildly fixed Shooter
abuddies0 Feb 15, 2024
16fe31d
Updated Ports and Motor Types
abuddies0 Feb 16, 2024
dc6e6e0
Fixed All The Ports.
abuddies0 Feb 16, 2024
c55cfd1
Updated gyro, made a few other adjustments
Slimjim42 Feb 16, 2024
1ee0b3d
fixed merge issue
Slimjim42 Feb 16, 2024
d4e260b
Did small changes.
abuddies0 Feb 17, 2024
aac90e2
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Feb 17, 2024
0593ecb
Fixed charge up
ehc12345678 Feb 17, 2024
465cb37
Added Pose Estimator Subsystem, got intake comp ready, some auto
Mguarr Feb 17, 2024
cb67ad2
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
Mguarr Feb 17, 2024
4b34f80
FIXED SWERVE
abuddies0 Feb 17, 2024
2e577a0
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Feb 17, 2024
33d6ace
Workingish shooter speed and shooter intake, basic shooter angling
Slimjim42 Feb 17, 2024
f6e07c3
merge issue
Slimjim42 Feb 17, 2024
0eac5b3
Swerve Auto Should Work
abuddies0 Feb 17, 2024
41def1d
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Feb 17, 2024
a62d416
Added untested shooter commands
Slimjim42 Feb 17, 2024
3699647
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
Slimjim42 Feb 17, 2024
87090bc
Working shooter angling
Slimjim42 Feb 17, 2024
8e40311
Changed Auto and Controllers
abuddies0 Feb 17, 2024
96ad71c
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Feb 17, 2024
ec74a85
Added a ton of commands.
abuddies0 Feb 17, 2024
56ffb8e
Competition Code
abuddies0 Feb 17, 2024
36a58a4
Code to turn to tag UNTESTED
Mguarr Feb 18, 2024
0defe50
Added Distance to tag command UNTESTED
Mguarr Feb 18, 2024
efd1e04
Updated Distance To Tag UNTESTED
Mguarr Feb 18, 2024
68a7d06
Fixed Swerve Offsets and Such
abuddies0 Feb 19, 2024
679ee9a
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Feb 19, 2024
8ebae88
Driverstation Code
Slimjim42 Mar 2, 2024
c21bdbb
Added Auto Commands
abuddies0 Mar 2, 2024
8d8147c
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Mar 2, 2024
e3aa2de
Relatively working code
Slimjim42 Mar 2, 2024
e292363
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
Slimjim42 Mar 2, 2024
7f7c9e7
removed unnecary robot map arguments
Justin-Dana Mar 6, 2024
21b9d01
Intake and Shooter Changes
abuddies0 Mar 6, 2024
600c841
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Mar 6, 2024
30623fe
Mostly working swerve
Slimjim42 Mar 6, 2024
1897758
Update SwerveDriveSubsystem.java
Slimjim42 Mar 6, 2024
9b1a145
Fixed some swerve
Slimjim42 Mar 7, 2024
7252749
Shooter and Intake?
abuddies0 Mar 8, 2024
17e0fc1
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Mar 8, 2024
612c8a7
Small swerve adjustments
Slimjim42 Mar 8, 2024
1071e68
Good working code
Slimjim42 Mar 10, 2024
50cf107
Fixed some stuff
Slimjim42 Mar 10, 2024
071500f
Added A Fun Auto
abuddies0 Mar 10, 2024
348d039
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Mar 10, 2024
a1085f0
The Big Merge
abuddies0 Mar 10, 2024
31e3bd3
Fixed Some Commands
abuddies0 Mar 13, 2024
fec8eca
Updated code
Slimjim42 Mar 14, 2024
612b24d
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
Slimjim42 Mar 14, 2024
eb52b83
Fixed controller imports
Slimjim42 Mar 14, 2024
57df69a
updated code
Slimjim42 Mar 15, 2024
c3285b5
working code!!!!!
Slimjim42 Mar 16, 2024
3b64663
Small fixes
Slimjim42 Mar 16, 2024
f0954b8
Starting angle fixed
Slimjim42 Mar 16, 2024
454b5bb
shuffleboard layout for driverstation
Slimjim42 Mar 16, 2024
4de62a9
Competition - Vision and LEDs
abuddies0 Mar 16, 2024
e219917
Re-enabled Stuff in RobotMap
abuddies0 Mar 16, 2024
566e07f
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Mar 16, 2024
a66772f
Updated auto sequences
Slimjim42 Mar 16, 2024
36c6087
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
Slimjim42 Mar 16, 2024
987c805
Added Diagonal Option for Auto WIP
abuddies0 Mar 16, 2024
c9b461f
Commeted out Evil method of DOOM
Justin-Dana Mar 16, 2024
f529622
Removed Excisve Argumnets
Justin-Dana Mar 16, 2024
61f8453
adjustments
Slimjim42 Mar 17, 2024
6186c78
Moved Note Incation ino seprate command
Justin-Dana Mar 17, 2024
af53b02
Commeted out old note indcator code
Justin-Dana Mar 17, 2024
4ab8f63
Added and Changed Auto
abuddies0 Mar 17, 2024
893ce49
LEDs? UNTESTED
abuddies0 Mar 17, 2024
9e5e3c9
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Mar 17, 2024
ced79d6
Cleaning
Slimjim42 Mar 17, 2024
3c2cfca
Refactored psoe estimation
Mguarr Mar 18, 2024
edf3689
Compteition Code
abuddies0 Mar 19, 2024
0ccb2ef
Code
Slimjim42 Mar 19, 2024
49dd2ba
Added command
Justin-Dana Mar 19, 2024
4b3f72e
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
Justin-Dana Mar 19, 2024
b1f1ef4
Working 2 note auto
Slimjim42 Mar 20, 2024
a973b3c
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
Slimjim42 Mar 20, 2024
bb07d03
Working swerve turnto
Slimjim42 Mar 21, 2024
83f64d2
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Mar 21, 2024
212a695
Magic code where everything works
Slimjim42 Mar 22, 2024
bec817a
fournoteauto
Slimjim42 Mar 22, 2024
dca6ca0
auto adjustments
Slimjim42 Mar 22, 2024
f68d906
four note auto!!!
Slimjim42 Mar 23, 2024
51882ed
Better 4 note auto code and stuff
Slimjim42 Mar 24, 2024
2d77801
Fix binary team numbers
ehc12345678 Mar 25, 2024
39f4f8b
leds
ehc12345678 Mar 26, 2024
f6a7107
better auto code
Slimjim42 Mar 26, 2024
8a553f6
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
abuddies0 Mar 26, 2024
6f2f925
Shuffleboard alliance selection, auto adjustments and breakbeam code
Slimjim42 Mar 27, 2024
005bf99
last auto fixes
Slimjim42 Mar 28, 2024
0ed4037
Auto tuning
Slimjim42 Mar 29, 2024
4c578d2
comp adjustments
Slimjim42 Mar 30, 2024
788655f
Update LedSubsystem.java
Justin-Dana Mar 30, 2024
f84474a
Merge branch 'main' of https://github.com/Team4761/2024CompetitionBot
Justin-Dana Mar 30, 2024
35a56c6
Fix compile error with leds
ehc12345678 Mar 31, 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,6 @@ logs/

# Folder that has CTRE Phoenix Sim device config storage
ctre_sim/
src/main/java/frc/robot/subsystems/swerve/SwerveDriveSubsystemBackupWithAutocorrect.java
src/main/java/frc/robot/Auto/AutoTrap.java
src/main/java/frc/robot/subsystems/vision/AlignToTrap.java
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
}
},
],
"java.test.defaultConfig": "WPIlibUnitTests"
"java.test.defaultConfig": "WPIlibUnitTests",
"java.debug.settings.onBuildFailureProceed": true
}
139 changes: 138 additions & 1 deletion networktables.json
Original file line number Diff line number Diff line change
@@ -1 +1,138 @@
[]
[
{
"name": "/Shuffleboard/Settings/Shooter/Shooter In Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Shooter/Shooter Out Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Shooter/Shooter Intake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Shooter/Shooter Outtake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Shooter/Amp Shoot Speed",
"type": "double",
"value": 10.0,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Swerve/Movement Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Swerve/Rotation Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Swerve/Is Robot Relative",
"type": "boolean",
"value": true,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Swerve/Swerve Steer Tolerance",
"type": "double",
"value": 1.0,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Intake/Intake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Intake/Outtake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Intake/Full Intake Setting",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Climber/Climber Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/SmartDashboard/Settings/Shooter In Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/SmartDashboard/Settings/Shooter Out Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/SmartDashboard/Settings/Shooter Intake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/SmartDashboard/Settings/Shooter Outtake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
}
]
138 changes: 138 additions & 0 deletions networktables.json.bck
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
[
{
"name": "/Shuffleboard/Settings/Shooter/Shooter In Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Shooter/Shooter Out Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Shooter/Shooter Intake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Shooter/Shooter Outtake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Shooter/Amp Shoot Speed",
"type": "double",
"value": 10.0,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Swerve/Movement Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Swerve/Rotation Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Swerve/Is Robot Relative",
"type": "boolean",
"value": true,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Swerve/Swerve Steer Tolerance",
"type": "double",
"value": 1.0,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Intake/Intake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Intake/Outtake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Intake/Full Intake Setting",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/Settings/Climber/Climber Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/SmartDashboard/Settings/Shooter In Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/SmartDashboard/Settings/Shooter Out Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/SmartDashboard/Settings/Shooter Intake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
},
{
"name": "/Shuffleboard/SmartDashboard/Settings/Shooter Outtake Speed",
"type": "double",
"value": 0.5,
"properties": {
"persistent": true
}
}
]
3 changes: 2 additions & 1 deletion simgui-ds.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
],
"robotJoysticks": [
{
"guid": "Keyboard0"
"guid": "78696e70757401000000000000000000",
"useGamepad": true
}
]
}
12 changes: 12 additions & 0 deletions simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@
"NTProvider": {
"types": {
"/FMSInfo": "FMSInfo",
"/Shuffleboard/Debug/Commands/Full Intake": "Command",
"/Shuffleboard/Debug/Commands/Go 1 Meter Forward": "Command",
"/Shuffleboard/Debug/Commands/Go 1 Meter Left": "Command",
"/Shuffleboard/Debug/Commands/LED Charge Up": "Command",
"/Shuffleboard/Debug/Commands/Loosen Climber": "Command",
"/Shuffleboard/Debug/Commands/Shoot": "Command",
"/Shuffleboard/Debug/Commands/Shoot At 45 Degrees": "Command",
"/Shuffleboard/Debug/Commands/Tighten Climber": "Command",
"/Shuffleboard/Debug/Commands/Turn 90 Degrees": "Command",
"/Shuffleboard/Debug/Commands/Turn Shooter To 45 Degrees": "Command",
"/Shuffleboard/Debug/Commands/Turn To 90 Degrees": "Command",
"/Shuffleboard/Settings/Auto/Auto": "String Chooser",
"/SmartDashboard/Auto choices": "String Chooser"
}
},
Expand Down
25 changes: 25 additions & 0 deletions src/main/deploy/pathplanner/autos/2 Meter Spin.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.0,
"y": 0.0
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "2 Meter Spin"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
25 changes: 25 additions & 0 deletions src/main/deploy/pathplanner/autos/2 Meter Up.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.0,
"y": 0.0
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "2 Meter Up"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
Loading