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

Off-season code #1

Merged
merged 40 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
17ce243
Shooter code (Elsa wrote)
ColinH0 Sep 12, 2024
c91f4fb
Swerve things
ColinH0 Sep 16, 2024
1ee0be2
more shooter stuff (elsa)
Pouman1 Sep 17, 2024
6a55ffb
Drive singleton
ColinH0 Sep 17, 2024
3e00609
SysId stuff
ColinH0 Sep 19, 2024
89f30bb
Drive Talon?
ColinH0 Sep 20, 2024
caff02b
Intake base
Arenacloserr Sep 25, 2024
3e27841
The Bad Pivot Code I forgot to Commit
GooseJuice898 Sep 26, 2024
b472ff5
More questionable changes, WIP obv
GooseJuice898 Sep 26, 2024
69724b2
Switch gyro to NavX
ColinH0 Sep 29, 2024
c804377
Real, in terms of Pivot (ykwim)
GooseJuice898 Sep 30, 2024
c7c2541
intake updates
Arenacloserr Oct 3, 2024
2bf52e6
fix gradle
Arenacloserr Oct 4, 2024
16a3dfc
sim update
Arenacloserr Oct 5, 2024
d4c7b9f
shooter fix eeelsa
Bob1272001 Oct 8, 2024
ea1e3c6
shooter sim
Bob1272001 Oct 8, 2024
034d44f
Flywheel gone, CANid errors fixed
GooseJuice898 Oct 9, 2024
cc944c3
Intake update
Arenacloserr Oct 10, 2024
32feff9
Runs in sim now, button binding temporary
GooseJuice898 Oct 10, 2024
d80f603
Intake Timer
Arenacloserr Oct 10, 2024
78831cb
Merge branch 'intake' into pivot
Arenacloserr Oct 10, 2024
497ae2a
Code review w/ Oscar
ozziexyz Oct 16, 2024
93c72e3
logged goal angle
ozziexyz Oct 16, 2024
5035ef4
fix shooter code
elsaroni Oct 17, 2024
cbe6499
Can IDs
Bob1272001 Oct 21, 2024
88a16be
Can IDs
Bob1272001 Oct 21, 2024
3780791
Can IDs
Bob1272001 Oct 21, 2024
0a1c073
Can IDs with Talon now
ozziexyz Oct 21, 2024
db2ed4d
current detection for pivot
GooseJuice898 Oct 21, 2024
152a9bc
driving forward and backwards works
ozziexyz Oct 22, 2024
7284c6e
Drive works!
ozziexyz Oct 22, 2024
d82bb90
Merge branch 'Swerve' into pivot
ozziexyz Oct 22, 2024
92bf9fe
semi-working intake code
ozziexyz Oct 22, 2024
c2f207f
Merge branch 'shooter' into pivot
ozziexyz Oct 22, 2024
6846074
Some button bindings for testing
Bob1272001 Oct 23, 2024
d5e2634
Switched SPARKFlex to SPARKMax (oops)
Bob1272001 Oct 23, 2024
4466148
testing 10/24
Bob1272001 Oct 26, 2024
701f90d
shooter voltage control
ColinH0 Oct 26, 2024
cb10830
Update Drive.java
Bob1272001 Oct 27, 2024
9d74ee9
slo-mo for off-season bot
Bob1272001 Oct 27, 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
41 changes: 41 additions & 0 deletions .DataLogTool/datalogtool-window.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"MainWindow": {
"GLOBAL": {
"fps": "120",
"height": "510",
"maximized": "0",
"style": "0",
"userScale": "2",
"width": "925",
"xpos": "-1",
"ypos": "-1"
}
},
"Window": {
"Debug##Default": {
"Collapsed": "0",
"Pos": "60,60",
"Size": "400,400"
},
"Download": {
"Collapsed": "0",
"Pos": "0,250",
"Size": "375,260"
},
"Entries": {
"Collapsed": "0",
"Pos": "380,20",
"Size": "540,365"
},
"Input Files": {
"Collapsed": "0",
"Pos": "0,20",
"Size": "375,230"
},
"Output": {
"Collapsed": "0",
"Pos": "380,390",
"Size": "540,120"
}
}
}
1 change: 1 addition & 0 deletions .DataLogTool/datalogtool.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
56 changes: 56 additions & 0 deletions .SysId/sysid-window.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"MainWindow": {
"GLOBAL": {
"fps": "120",
"height": "720",
"maximized": "0",
"style": "0",
"userScale": "2",
"width": "1280",
"xpos": "115",
"ypos": "138"
}
},
"Window": {
"###Analyzer": {
"Collapsed": "0",
"Pos": "320,25",
"Size": "360,550"
},
"###Data Selector": {
"Collapsed": "0",
"Pos": "5,480",
"Size": "310,235"
},
"###Log Loader": {
"Collapsed": "0",
"Pos": "5,25",
"Size": "310,450"
},
"###Program Log": {
"Collapsed": "0",
"Pos": "323,581",
"Size": "360,135"
},
"Debug##Default": {
"Collapsed": "0",
"Pos": "60,60",
"Size": "400,400"
},
"Diagnostic Plots": {
"Collapsed": "0",
"Pos": "685,25",
"Size": "590,690"
},
"Exception Caught!": {
"Collapsed": "0",
"Pos": "285,310",
"Size": "480,97"
},
"Override Units": {
"Collapsed": "0",
"Pos": "480,288",
"Size": "320,144"
}
}
}
1 change: 1 addition & 0 deletions .SysId/sysid.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
21 changes: 11 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,17 @@ tasks.withType(JavaCompile) {
}

// Create version file
project.compileJava.dependsOn(createVersionFile)
gversion {
srcDir = "src/main/java/"
classPackage = "frc.robot"
className = "BuildConstants"
dateFormat = "yyyy-MM-dd HH:mm:ss z"
timeZone = "America/New_York"
indent = " "
}

/*
project.compileJava.dependsOn(createVersionFile)
gversion {
srcDir = "src/main/java/"
classPackage = "frc.robot"
className = "BuildConstants"
dateFormat = "yyyy-MM-dd HH:mm:ss z"
timeZone = "America/New_York"
indent = " "
}
*/
// Spotless formatting
project.compileJava.dependsOn(spotlessApply)
spotless {
Expand Down
Binary file added ctre_sim/Pigeon 2 - 020 - 0 - ext.dat
Binary file not shown.
2 changes: 1 addition & 1 deletion gradlew
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -246,4 +246,4 @@ eval "set -- $(
tr '\n' ' '
)" '"$@"'

exec "$JAVACMD" "$@"
exec "$JAVACMD" "$@"
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
:omega
Binary file added logs/Log_24-10-09_12-26-37.wpilog
Binary file not shown.
Binary file added logs/Log_24-10-10_16-16-33.wpilog
Binary file not shown.
Binary file added logs/Log_453809fd5c0e7d60.wpilog
Binary file not shown.
Binary file added logs/Log_5fc0f61a818611e2.wpilog
Binary file not shown.
Binary file added logs/Log_7ef8dfb8c7d4b407.wpilog
Binary file not shown.
1 change: 1 addition & 0 deletions networktables.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
18 changes: 0 additions & 18 deletions src/main/java/frc/robot/Robot.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,6 @@ public class Robot extends LoggedRobot {
*/
@Override
public void robotInit() {
// Record metadata
Logger.recordMetadata("ProjectName", BuildConstants.MAVEN_NAME);
Logger.recordMetadata("BuildDate", BuildConstants.BUILD_DATE);
Logger.recordMetadata("GitSHA", BuildConstants.GIT_SHA);
Logger.recordMetadata("GitDate", BuildConstants.GIT_DATE);
Logger.recordMetadata("GitBranch", BuildConstants.GIT_BRANCH);
switch (BuildConstants.DIRTY) {
case 0:
Logger.recordMetadata("GitDirty", "All changes committed");
break;
case 1:
Logger.recordMetadata("GitDirty", "Uncomitted changes");
break;
default:
Logger.recordMetadata("GitDirty", "Unknown");
break;
}

// Set up data receivers & replay source
switch (Constants.currentMode) {
case REAL:
Expand Down
Loading
Loading