Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
218 commits
Select commit Hold shift + click to select a range
6f8d0a3
Merge pull request #13 from robototes/master
jamesdooley4 Feb 23, 2020
1834282
Merge pull request #14 from robototes/master
jamesdooley4 Feb 23, 2020
1e0f4f6
Fix crash due to incorrect ordering of variable initialization in Int…
jamesdooley4 Feb 23, 2020
25a0469
Merge pull request #15 from robototes/master
jamesdooley4 Feb 24, 2020
89a3846
Shooter integration worked out
Mar 4, 2020
7340427
Merge pull request #13 from robototes/master
OroArmor Mar 6, 2020
e9e1d00
Yay better index. Need to add in new fixed index
Mar 6, 2020
aacf32b
Yay index!
Mar 7, 2020
c369937
Gyro and a thing
Mar 7, 2020
f42e28c
flywheel is now rpm not mps
Mar 8, 2020
bc6ba19
update code so it runs and doesn't crash
RobototesProgrammers Mar 8, 2020
cfa2cdc
Update flywheel to not spin on start for testing
jamesdooley4 Mar 8, 2020
9fc4ae2
Fix hood angle at 0 and tweak things for shooter testing
RobototesProgrammers Mar 8, 2020
8456217
Enable drive command and index commands, but comment out shoot command
RobototesProgrammers Mar 8, 2020
6f98efa
Fix index bitmap command to work correctly
RobototesProgrammers Mar 8, 2020
ac6a721
Fix and re-enable logging of the index sensors
jamesdooley4 Mar 8, 2020
9d2864b
Comment out indexBitmapCommand default system.out logging
jamesdooley4 Mar 8, 2020
a30a8c9
Add com.kauailabs.navx.frc.AHRS gyro support (disabled until hardware…
jamesdooley4 Mar 8, 2020
23fc36e
Merge pull request #93 from robototes/shooterTesting
OroArmor Mar 8, 2020
9772dc9
Invert index motors so spit command actually spits insteak of intaking
RobototesProgrammers Mar 8, 2020
7098d86
Working manual shooter
RobototesProgrammers Mar 8, 2020
ced5c18
Updating shooter
RobototesProgrammers Mar 8, 2020
15cff5c
Update intake commands to conflict less when both are put down
RobototesProgrammers Mar 8, 2020
8e52f32
merge and imports
Mar 9, 2020
d5442f9
Merge pull request #97 from robototes/ESCWest_0308
OroArmor Mar 10, 2020
e86ded1
Added back my LL based auto command
Mar 12, 2020
225bc94
oops forgot abotu robot library
Mar 12, 2020
fc004b2
Merge pull request #1 from robototes/master
SumedhP Mar 12, 2020
c4a7c37
Merge
Mar 12, 2020
572502f
Clean code - abstraction
May 30, 2020
d49d873
More abstraction
May 30, 2020
30deef4
Removed useless intake command, formatted and org imp
May 30, 2020
56c236b
Fixed climb "magic numbers", fixed color logic
May 31, 2020
b65cada
I made RobotMap prettier
Jun 1, 2020
3f62828
Form and O/I
Jun 1, 2020
fef670d
Started Intake Shuffleboard Logging
Jun 2, 2020
fa9ebc2
worked on shooter interpolation
OroArmor Jun 2, 2020
aafbe37
Merge pull request #102 from OroArmor/master
OroArmor Jun 2, 2020
7349b8f
Merge pull request #15 from robototes/master
OroArmor Jun 2, 2020
143205a
some fixes i guess
OroArmor Jun 2, 2020
90ec236
Merge pull request #103 from OroArmor/master
OroArmor Jun 2, 2020
72f44d4
Delete IntakeMotorLogging.java
OroArmor Jun 2, 2020
e86ee3c
Merge pull request #100 from SumedhP/master
OroArmor Jun 2, 2020
135dffd
Merge pull request #2 from robototes/master
SumedhP Jun 3, 2020
6cc3b8e
Oblog begone
Jun 4, 2020
19725a7
update library
OroArmor Jun 9, 2020
7dd44ca
Merge pull request #104 from OroArmor/master
OroArmor Jun 9, 2020
bfa258b
Merge pull request #3 from robototes/master
SumedhP Jun 9, 2020
5b82c02
Removed unnecessary statics in RobotMapConstants and removed some log…
SumedhP Jun 21, 2020
c348902
Removed unnessecary statics
SumedhP Jun 21, 2020
e32cb20
Removed some redundancy
SumedhP Jun 21, 2020
d2d64a0
Started to move robotState into subsystems
SumedhP Jun 23, 2020
8fdc83e
moved intakeDir into sub
SumedhP Jun 23, 2020
cdee791
deleted RobotState
SumedhP Jun 23, 2020
524fb03
fixed climb problem
SumedhP Jun 23, 2020
0317343
fixed couple of RobotState instances
SumedhP Jun 23, 2020
97ae356
Merge pull request #16 from robototes/master
OroArmor Jun 24, 2020
dbf8035
Index bitmap refactoring
OroArmor Jun 24, 2020
17f457c
Added back stuff for readability
SumedhP Jun 29, 2020
2fb7e60
Really minor changes to the spacing, formatting, and spelling in our …
SumedhP Jun 29, 2020
ea1f287
I made some indexbitmap changes
SumedhP Jul 1, 2020
d074d7e
Made autonomous a separate package
SumedhP Jul 1, 2020
1e1ff23
Started writing a testBase for easier tests
SumedhP Jul 2, 2020
22cf4db
woah functional programming ftw
OroArmor Jul 2, 2020
c34e760
clarified indexbitmap changes and fixed intake on off tests a bit more
OroArmor Jul 2, 2020
95157df
Eclipse formatted
SumedhP Jul 7, 2020
df93f5c
Properly formatted using eclipse
SumedhP Jul 7, 2020
0bd2135
started making proper testBase
SumedhP Jul 7, 2020
b442986
better testbase
SumedhP Jul 7, 2020
43f2abf
Merge pull request #105 from OroArmor/master
SumedhP Jul 7, 2020
168e649
Merge branch 'master' into master
SumedhP Jul 7, 2020
aa75aed
Merge pull request #4 from robototes/master
SumedhP Jul 7, 2020
d985772
fixed merge conflicts
SumedhP Jul 7, 2020
3634f0c
Merge pull request #107 from SumedhP/master
SumedhP Jul 7, 2020
7c10fc5
fixed naming for tests, removed unused interface, and added servo to
SumedhP Jul 15, 2020
7faf0f8
Updated tests, has a nullpointerException tho
SumedhP Jul 15, 2020
6c5d061
started to remove m_
SumedhP Jul 16, 2020
f18845a
library i guess
OroArmor Jul 17, 2020
037dadb
update library
OroArmor Jul 17, 2020
2309da2
Merge pull request #108 from OroArmor/master
SumedhP Jul 17, 2020
6d5b827
removing robot library from gradle
OroArmor Jul 24, 2020
941c374
Removed robot library
OroArmor Jul 24, 2020
b75c137
Update gradle.yml
OroArmor Jul 24, 2020
0ae4f55
Merge pull request #17 from robototes/master
OroArmor Jul 24, 2020
e2c30cd
not fat jar
OroArmor Jul 25, 2020
b57f7be
Merge branch 'master' of https://github.com/OroArmor/InfiniteRecharge…
OroArmor Jul 25, 2020
1a7f175
Merge pull request #109 from OroArmor/master
OroArmor Jul 25, 2020
cdc0db0
Update build.gradle
OroArmor Aug 4, 2020
6a5b0bf
Merge pull request #1 from robototes/master
SumedhP Aug 8, 2020
6a0b46d
Updating to 2021 version
SumedhP Jan 25, 2021
bdd21a7
Merge pull request #110 from SumedhP/master
SumedhP Jan 25, 2021
17b3ed8
Makes lift go down when climb goes up
SumedhP Feb 1, 2021
6338511
Forgot about tests, ignoring for now
SumedhP Feb 1, 2021
472d3fc
Merge pull request #16 from robototes/master
jamesdooley4 Feb 14, 2021
c701010
Finish updating to 2021 wpilib
jamesdooley4 Feb 14, 2021
c1cd3f4
Remove inclusion of robot_library subdirectory, as it's now included …
jamesdooley4 Feb 14, 2021
275f479
Finish updating to Project to WPILib version of 2021 season (#111)
jamesdooley4 Feb 14, 2021
0bcf271
Merge pull request #17 from robototes/master
jamesdooley4 Feb 14, 2021
c61f274
Update RevRobotics SparkMAX library & fix bugs to unblock simulation …
jamesdooley4 Feb 15, 2021
bf5d9ac
Removed the old Auto paths
SumedhP Feb 23, 2021
959cd58
Created Bounce Path
SumedhP Feb 23, 2021
0596e94
Created Slalom path
Feb 23, 2021
dba5190
Created Barrel Trajectory
Feb 23, 2021
fec3ca3
Made square Path command
SumedhP Feb 25, 2021
f183c4f
Fixed spacing
Feb 26, 2021
b6163b6
Merge pull request #114 from MasterCreeper41/master
SumedhP Feb 26, 2021
7fb9b15
Fixed Units of Barrel Trajectory
Feb 26, 2021
b4de484
Sim changes
SumedhP Mar 1, 2021
2ef908d
Merge branch 'master' into master
SumedhP Mar 1, 2021
6df073f
Merge pull request #113 from eddiert1239/master
SumedhP Mar 1, 2021
911daea
update to drivebase conenction
SumedhP Mar 5, 2021
59e2382
Merge pull request #18 from robototes/master
jamesdooley4 Mar 7, 2021
4436856
Disconnect climb & make '*_CONNECTED' constants `final`
jamesdooley4 Mar 7, 2021
13230ad
Merge pull request #115 from jamesdooley4/master
SumedhP Mar 7, 2021
38c4232
Merge branch 'master' into master
SumedhP Mar 7, 2021
2f41e94
Merge pull request #2 from robototes/master
SumedhP Mar 7, 2021
f483888
setting to brake mode
SumedhP Mar 9, 2021
a97bc52
Merge pull request #116 from SumedhP/master
SumedhP Mar 9, 2021
0d25219
Updated odometry with more accurate values
SumedhP Mar 12, 2021
8657f0a
Removed duplicate values
SumedhP Mar 12, 2021
d797bf4
Readability change
SumedhP Mar 12, 2021
daac609
Started implementing driveSim
SumedhP Mar 15, 2021
e3d0567
Robot shows in sim, using wasd and ijkl
SumedhP Mar 18, 2021
8d12ca9
cleaned up coments
SumedhP Mar 18, 2021
dcca321
Disabled Turret: for at home competitions.
Mar 19, 2021
39544e4
Set the hood to a constant value for at home
Mar 22, 2021
3763548
Merge branch 'master' of https://github.com/eddiert1239/InfiniteRecha…
Mar 26, 2021
56ce279
Merge pull request #1 from robototes/master
eddiert1239 Mar 26, 2021
28a71f6
Merge pull request #1 from robototes/master
Alexander-Minascurta Mar 26, 2021
6518c16
Update to GradleRIO 2021.2.2
RobototesProgrammers Mar 27, 2021
b77e2ed
code i have (#119)
jamesdooley4 Mar 27, 2021
2931731
Try reversing to see if robot can go forward
RobototesProgrammers Mar 27, 2021
3769ce0
Merge remote-tracking branch 'origin/master' into ESCWest_210327
RobototesProgrammers Mar 27, 2021
9db982c
Update to latest NavX gyro release
RobototesProgrammers Mar 27, 2021
0f483a5
Update to verify gyro is connected and calibrated
RobototesProgrammers Mar 27, 2021
1b7f1e8
auto testing
RobototesProgrammers Mar 27, 2021
ac78246
Add skeleton for reset position for odometery
RobototesProgrammers Mar 28, 2021
d139196
Log position slightly less frequently and log if the gyro is connected
RobototesProgrammers Mar 29, 2021
f0ef790
Merge pull request #2 from robototes/master
Alexander-Minascurta Mar 29, 2021
000da99
Merge pull request #2 from robototes/ESCWest_210327
eddiert1239 Mar 29, 2021
6796a16
Merge branch 'master' into master
SumedhP Mar 29, 2021
2fec014
Merge pull request #118 from MasterCreeper41/master
SumedhP Mar 29, 2021
133a058
Merge pull request #120 from SumedhP/master
SumedhP Mar 29, 2021
f397b60
Merge pull request #3 from robototes/master
Alexander-Minascurta Mar 29, 2021
9f1ae11
Fixed autonomous straight line command.
Mar 30, 2021
ba128b5
Update so the robot drives the correct direction and stops & shifts a…
RobototesProgrammers Mar 30, 2021
f48447e
Merge pull request #121 from MasterCreeper41/master
SumedhP Mar 30, 2021
a11be3b
Merge remote-tracking branch 'origin/master' into ESCWest_210327
jamesdooley4 Mar 31, 2021
840c1e2
Remove unused ADIS IMU
jamesdooley4 Mar 31, 2021
9555c7a
Stop double-reversing the trajectory
jamesdooley4 Mar 31, 2021
13e9c86
Connect driver button 3 to bouncePathTrajectory
jamesdooley4 Mar 31, 2021
5535094
Use correct wheel measurements
jamesdooley4 Mar 31, 2021
2defa92
Update getPose and getWheelSpeeds to work in simulation
jamesdooley4 Mar 31, 2021
772c4a8
Make shoot go in a square rather than just a short line
jamesdooley4 Mar 31, 2021
cd8e4a4
Implement reset position with driver stick button 3
jamesdooley4 Apr 1, 2021
1962fa7
Update physical robot to drive in a square also
RobototesProgrammers Apr 1, 2021
7012a1e
Switch back to LF
jamesdooley4 Apr 1, 2021
fde7492
Merge pull request #123 from robototes/ESCWest_210327
SumedhP Apr 1, 2021
c6ba31c
Merge pull request #3 from robototes/master
SumedhP Apr 1, 2021
6969832
comments
SumedhP Apr 1, 2021
7dddd05
Formatted and imports
SumedhP Apr 1, 2021
7fd461b
Makes trajectories start at 0,0
SumedhP Apr 2, 2021
1e1ba03
Merge pull request #124 from SumedhP/master
SumedhP Apr 2, 2021
f605a32
Merge pull request #4 from robototes/master
Alexander-Minascurta Apr 2, 2021
65fc31e
translated slalom path to meters.
Apr 2, 2021
7f774e3
Resolving merge conflicts from upstream
eddiert1239 Apr 2, 2021
4700509
Merge branch 'robototes-master'
eddiert1239 Apr 2, 2021
aff7e03
Wait a second after resetting position
RobototesProgrammers Apr 2, 2021
b2eb98b
Converted barrel path to meters
eddiert1239 Apr 2, 2021
ce239b9
Update feedforward constants based on new characterization
RobototesProgrammers Apr 2, 2021
418fff4
Merge pull request #126 from robototes/garageTesting
SumedhP Apr 2, 2021
fbc4103
Merge pull request #125 from MasterCreeper41/master
SumedhP Apr 2, 2021
84c8a6a
Merge pull request #117 from eddiert1239/master
SumedhP Apr 2, 2021
f8abbad
Add drive characterization project and data
RobototesProgrammers Apr 3, 2021
84b91ba
Update with ESCWest measured characterization
RobototesProgrammers Apr 3, 2021
b93f9d7
Add bounce run command to driver button 4
RobototesProgrammers Apr 3, 2021
b57af78
Increase robot speed to 2m/s
RobototesProgrammers Apr 3, 2021
0f915ef
Converted bounce path to meters
eddiert1239 Apr 3, 2021
bcf8c7b
Merge pull request #127 from eddiert1239/ESCWest_210403
SumedhP Apr 3, 2021
277476f
Turn off auto path controls for teleop challenges
RobototesProgrammers Apr 4, 2021
5891d3e
Merge branch 'ESCWest_210403' of https://github.com/robototes/Infinit…
RobototesProgrammers Apr 4, 2021
a44dbe2
Update autonomous to run the bouncePath command
RobototesProgrammers Apr 4, 2021
36de69e
Add barrel and slalom path commands
RobototesProgrammers Apr 4, 2021
f2fef29
Turn off odometry telemetry to reduce network traffic a bit
RobototesProgrammers Apr 4, 2021
3021030
Update autonomous trajectories
RobototesProgrammers Apr 4, 2021
627549d
Created a new bounce and barrel path with more and new points (#128)
eddiert1239 Apr 4, 2021
171af4f
Re-enable the shoot & spit index commands
jamesdooley4 Apr 4, 2021
8e6150b
UPdate barrel path
RobototesProgrammers Apr 4, 2021
41318d0
Changes for powerport challenge
RobototesProgrammers Apr 5, 2021
4cbb9ed
Add search path command and update bounce path command
RobototesProgrammers Apr 5, 2021
af4c74d
the thing working on 7/1
RobototesProgrammers Jul 2, 2021
4f8846c
7/2 things
RobototesProgrammers Jul 2, 2021
0e30c89
the code for alex from tuesday
RobototesProgrammers Jul 9, 2021
5667a23
Set intake motors to coast & index motors to brake and add disabled i…
RobototesProgrammers Jul 10, 2021
5a2006e
Comment out getIndexerMotorLiftSubsystem().addPID() for LiftDown and …
RobototesProgrammers Aug 10, 2021
23edc52
Remove mostly useless configureMotor() method from FlywheelSubsystem
RobototesProgrammers Aug 10, 2021
db6189e
Reduce shooter speed for 8 & 12 distances
RobototesProgrammers Aug 10, 2021
034630d
Update buttons for Xbox controller, move front index in when front in…
RobototesProgrammers Aug 10, 2021
aaf069e
Fix typo
RobototesProgrammers Aug 10, 2021
b5f7133
Fix compiler errors
RobototesProgrammers Aug 10, 2021
9c2444d
Disable spit button command, as the joystick with the spit button isn…
RobototesProgrammers Aug 10, 2021
4bbf4fe
Enable turret limits based on encoder, and set motor current limits
RobototesProgrammers Aug 10, 2021
0b40e93
Make right bumper the shoot command
RobototesProgrammers Aug 10, 2021
0c2531d
Enable climb & make it deploy the rails
RobototesProgrammers Aug 10, 2021
8927f10
Merge pull request #129 from robototes/july-things
bobtseattle Sep 15, 2021
a8194dd
Shoot and move autonomous
bobtseattle Sep 15, 2021
2b77dca
Changes from autonomous testing
Sep 15, 2021
e1ba69b
Merge pull request #131 from bobtseattle/basic_auto
SumedhP Sep 16, 2021
7b2ebe6
Set lower current limits for index motors & switch them back to full …
Sep 17, 2021
0931833
Merge branch 'master' of https://github.com/robototes/InfiniteRecharg…
Sep 17, 2021
f6d1012
Update auto so it works, albeit hackily
Sep 17, 2021
38065ee
Stop the limelight controlled turret after 8.5s in auto
Sep 17, 2021
3067572
Add test auto path for programming testing
Sep 17, 2021
a9a6234
Update auto to shoot slowly, add new shooter constants, add commented…
Sep 19, 2021
c50d2ae
Only run flywheel for 8s in auto, set climb current limit to 50A
Sep 19, 2021
8c60b81
Update driver lift controls to only move lift moter, and not index
Sep 19, 2021
4c92237
Removing oblog
SumedhP Oct 13, 2021
b8ed198
Undoing previous commit (Oblog)
SumedhP Oct 13, 2021
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
2 changes: 0 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.11
- name: Checkout submodules
uses: textbook/git-checkout-submodule-action@2.0.0

- name: Test with Gradle
run: ./gradlew test
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "robot_library"]
path = robot_library
url = https://github.com/robototes/2412RobotLibrary.git
19 changes: 19 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

159 changes: 159 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": false,
"currentLanguage": "java",
"projectYear": "2020",
"projectYear": "2021",
"teamNumber": 2412
}
13 changes: 13 additions & 0 deletions DriveCharacterization/characterization-project/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
### Gradle ###
.gradle
/build/

### VS Code Specific Java Settings ###
.settings/
bin/
imgui.ini
./vscode
.classpath

### Other ###
/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"currentLanguage": "none",
"enableCppIntellisense": false,
"projectYear": "none",
"teamNumber": 2412
}
62 changes: 62 additions & 0 deletions DriveCharacterization/characterization-project/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2021.1.2"
}

def ROBOT_MAIN_CLASS = "dc.Main"

// Define my targets (RoboRIO) and artifacts (deployable files)
// This is added by GradleRIO's backing project EmbeddedTools.
deploy {
targets {
roboRIO("roborio") {
// Team number is loaded either from the .wpilib/wpilib_preferences.json
// or from command line. If not found an exception will be thrown.
// You can use getTeamOrDefault(team) instead of getTeamNumber if you
// want to store a team number in this file.
team = frc.getTeamOrDefault(2412)
}
}
artifacts {
frcJavaArtifact('frcJava') {
targets << "roborio"
// Debug can be overridden by command line, for use with VSCode
debug = frc.getDebugOrDefault(false)
}
// Built in artifact to deploy arbitrary files to the roboRIO.
fileTreeArtifact('frcStaticFileDeploy') {
// The directory below is the local directory to deploy
files = fileTree(dir: 'src/main/deploy')
// Deploy to RoboRIO target, into /home/lvuser/deploy
targets << "roborio"
directory = '/home/lvuser/deploy'
}
}
}

// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
// Also defines JUnit 4.
dependencies {
implementation wpi.deps.wpilib()
nativeZip wpi.deps.wpilibJni(wpi.platforms.roborio)
nativeDesktopZip wpi.deps.wpilibJni(wpi.platforms.desktop)


implementation wpi.deps.vendor.java()
nativeZip wpi.deps.vendor.jni(wpi.platforms.roborio)
nativeDesktopZip wpi.deps.vendor.jni(wpi.platforms.desktop)

// In Java for now, the argument must be false
simulation wpi.deps.sim.gui(wpi.platforms.desktop, false)

testImplementation 'junit:junit:4.12'
}

// Setting up my Jar File. In this case, adding all libraries into the main jar ('fat jar')
// in order to make them all available at runtime. Also adding the manifest so WPILib
// knows where to look for our Robot Class.
jar {
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
manifest edu.wpi.first.gradlerio.GradleRIOPlugin.javaManifest(ROBOT_MAIN_CLASS)
}

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=permwrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=permwrapper/dists
Loading