Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CRRobotics/2022Robot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: Release2
Choose a base ref
...
head repository: CRRobotics/2022Robot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: Deployment
Choose a head ref
  • 5 commits
  • 61 files changed
  • 1 contributor

Commits on Mar 11, 2022

  1. Lots of Paths at FLR Day 1

    asun121 committed Mar 11, 2022
    Copy the full SHA
    ae1fef8 View commit details
  2. Shuffleboard setup

    asun121 committed Mar 11, 2022
    Copy the full SHA
    6442ef7 View commit details
  3. Removed networktables flusher

    asun121 committed Mar 11, 2022
    Copy the full SHA
    4e8c3e0 View commit details
  4. FLR Day 1 Changes

    asun121 committed Mar 11, 2022
    Copy the full SHA
    95bc554 View commit details

Commits on Mar 12, 2022

  1. FLR Day 3 Changes

    asun121 committed Mar 12, 2022
    Copy the full SHA
    dc32e98 View commit details
Showing with 8,442 additions and 14,067 deletions.
  1. +3 −0 PathWeaver/Autos/4TRUE
  2. +3 −0 PathWeaver/Paths/4BALLTRUE1
  3. +6 −0 PathWeaver/Paths/4BALLTRUE2
  4. +4 −0 PathWeaver/Paths/4BALLTRUE3
  5. +1 −1 PathWeaver/Paths/4Ball_v2Part1Opt
  6. +257 −0 PathWeaver/Paths/4Ball_v2Part1Opt.wpilib.json
  7. +1 −1 PathWeaver/Paths/4Ball_v2Part2Opt
  8. +992 −0 PathWeaver/Paths/4Ball_v2Part2Opt.wpilib.json
  9. +1 −1 PathWeaver/Paths/4Ball_v2Part3Opt
  10. +3 −0 PathWeaver/Paths/reee1
  11. +6 −0 PathWeaver/Paths/reee2
  12. +4 −0 PathWeaver/Paths/reee3
  13. +272 −0 PathWeaver/output/4Ball_v2Part1Opt.wpilib.json
  14. +0 −812 PathWeaver/output/4Ball_v2Part2.wpilib.json
  15. +0 −782 PathWeaver/output/4Ball_v2Part3.wpilib.json
  16. +0 −227 PathWeaver/output/5BallPart1.wpilib.json
  17. +0 −812 PathWeaver/output/5BallPart2.wpilib.json
  18. +0 −1,712 PathWeaver/output/5BallPart3.wpilib.json
  19. +0 −77 PathWeaver/output/5BallPart4.wpilib.json
  20. +0 −2,252 PathWeaver/output/ReverseTest.wpilib.json
  21. +0 −167 PathWeaver/output/Test Path.wpilib.json
  22. +0 −842 PathWeaver/output/TestRoutine1.wpilib.json
  23. +0 −1,907 PathWeaver/output/TestRoutine2.wpilib.json
  24. +0 −452 PathWeaver/output/TestTurn.wpilib.json
  25. +0 −827 PathWeaver/output/bounce1.wpilib.json
  26. +0 −827 PathWeaver/output/bounce2.wpilib.json
  27. +0 −827 PathWeaver/output/bounce2_0.wpilib.json
  28. +0 −782 PathWeaver/output/bounce3.wpilib.json
  29. +480 −0 Shuffleboard/flrshuffleboardv1.json
  30. +472 −0 Shuffleboard/flrshuffleboardv2.json
  31. +49 −9 Shuffleboard/shuffleboard.json
  32. +572 −572 src/main/deploy/paths/3BallFender.wpilib.json
  33. +257 −0 src/main/deploy/paths/4BALLTRUE1.wpilib.json
  34. +1,052 −0 src/main/deploy/paths/4BALLTRUE2.wpilib.json
  35. +917 −0 src/main/deploy/paths/4BALLTRUE3.wpilib.json
  36. +227 −0 src/main/deploy/paths/4BallOptimized1.wpilib.json
  37. +227 −0 src/main/deploy/paths/4BallOptimized2.wpilib.json
  38. +1,487 −0 src/main/deploy/paths/4BallOptimized3.wpilib.json
  39. +677 −0 src/main/deploy/paths/4BallOptimized4.wpilib.json
  40. +140 −95 src/main/deploy/paths/4Ball_v2Part1Opt.wpilib.json
  41. +1 −1 src/main/java/org/team639/Robot.java
  42. +35 −22 src/main/java/org/team639/RobotContainer.java
  43. +1 −1 src/main/java/org/team639/commands/Acquisition/ToggleAcquisition.java
  44. +31 −0 src/main/java/org/team639/commands/AimbotLED.java
  45. +85 −0 src/main/java/org/team639/commands/Drive/ChaseBall.java
  46. +5 −2 src/main/java/org/team639/commands/Drive/JoystickDrive.java
  47. +2 −2 src/main/java/org/team639/commands/Drive/TurnToAngleRelative.java
  48. +2 −2 src/main/java/org/team639/commands/Drive/TurnToBall.java
  49. +2 −1 src/main/java/org/team639/commands/Indexer/SpitCargo.java
  50. +17 −3 src/main/java/org/team639/commands/Shooter/AutoShootAtDistance.java
  51. +11 −5 src/main/java/org/team639/commands/Shooter/ShootAtDistance.java
  52. +3 −1 src/main/java/org/team639/commands/Shooter/ShootAtDistanceTimed.java
  53. +3 −1 src/main/java/org/team639/commands/Shooter/ShootClosedLoop.java
  54. +3 −1 src/main/java/org/team639/commands/Shooter/ShootOpenLoop.java
  55. +7 −0 src/main/java/org/team639/controlboard/ControllerWrapper.java
  56. +38 −0 src/main/java/org/team639/controlboard/TriggerButton.java
  57. +7 −4 src/main/java/org/team639/lib/Constants.java
  58. +19 −16 src/main/java/org/team639/subsystems/Acquisition.java
  59. +7 −0 src/main/java/org/team639/subsystems/Climber.java
  60. +13 −2 src/main/java/org/team639/subsystems/DriveTrain.java
  61. +40 −19 src/main/java/org/team639/subsystems/LED.java
3 changes: 3 additions & 0 deletions PathWeaver/Autos/4TRUE
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
4BALLTRUE1
4BALLTRUE2
4BALLTRUE3
3 changes: 3 additions & 0 deletions PathWeaver/Paths/4BALLTRUE1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
6.440427904974559,-5.5975799811120455,-0.6160075053991729,-0.3136038209304859,true,false,
5.376414941103262,-6.224787622973022,-0.2800034115450787,-0.30240368446868615,true,false,
6 changes: 6 additions & 0 deletions PathWeaver/Paths/4BALLTRUE2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
5.376,-6.2246,-0.28,-0.302,true,false,
4.09035759520958,-6.327359411623811,-0.8119687829169631,0.08089385059403098,false,false,
2.9371526464247966,-6.014808537654102,-0.4095494210637556,-0.09699854709404754,true,false,
1.9240567101091923,-6.402802726030292,-0.543781221058791,-0.38998801885963985,false,false,
1.244,-7.0756,-0.2576031386214723,-0.2912035480068811,true,false,
4 changes: 4 additions & 0 deletions PathWeaver/Paths/4BALLTRUE3
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
1.2435645866979017,-7.075997994070063,-0.258,-0.291,true,true,
3.3155898321314825,-6.123986394816794,-0.7616092794026135,-0.16800204692704757,true,true,
5.3297834747446275,-6.057919003029236,-0.37897371918988565,-0.4020714856416534,true,true,
2 changes: 1 addition & 1 deletion PathWeaver/Paths/4Ball_v2Part1Opt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
6.440427904974559,-5.5975799811120455,-0.6160075053991729,-0.3136038209304859,true,false,
5.376414941103262,-6.224787622973022,-0.6832083241699918,-0.369604503239505,true,false,
5.376414941103262,-6.224787622973022,-0.246,-0.359,true,false,
257 changes: 257 additions & 0 deletions PathWeaver/Paths/4Ball_v2Part1Opt.wpilib.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,257 @@
[
{
"acceleration": 2.0,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": -2.6706987946090925
},
"translation": {
"x": 6.440427904974559,
"y": 2.632020018887954
}
},
"time": 0.0,
"velocity": 0.0
},
{
"acceleration": 1.9999999999999991,
"curvature": 0.0366659950661241,
"pose": {
"rotation": {
"radians": -2.6687593583807976
},
"translation": {
"x": 6.354358320719573,
"y": 2.5881324236172025
}
},
"time": 0.3108265060703404,
"velocity": 0.6216530121406808
},
{
"acceleration": 2.0,
"curvature": 0.04323404836674308,
"pose": {
"rotation": {
"radians": -2.666162665971656
},
"translation": {
"x": 6.297499145734791,
"y": 2.558956169392764
}
},
"time": 0.4006507408666103,
"velocity": 0.8013014817332205
},
{
"acceleration": 2.0000000000000018,
"curvature": 0.046305690843264045,
"pose": {
"rotation": {
"radians": -2.6626775563923175
},
"translation": {
"x": 6.228510138674949,
"y": 2.5232890066157037
}
},
"time": 0.48804157904520806,
"velocity": 0.976083158090416
},
{
"acceleration": 1.999999999999999,
"curvature": 0.05019782951988198,
"pose": {
"rotation": {
"radians": -2.6582969507816765
},
"translation": {
"x": 6.147812490992088,
"y": 2.4811665039566932
}
},
"time": 0.5737720225862055,
"velocity": 1.147544045172411
},
{
"acceleration": 2.0,
"curvature": 0.05707663487863063,
"pose": {
"rotation": {
"radians": -2.652841221616055
},
"translation": {
"x": 6.057418513033913,
"y": 2.4334189175032046
}
},
"time": 0.6568439642056606,
"velocity": 1.3136879284113212
},
{
"acceleration": 0.7626620803227327,
"curvature": 0.06894661436258266,
"pose": {
"rotation": {
"radians": -2.6459653132241066
},
"translation": {
"x": 5.960519983737048,
"y": 2.381475082413104
}
},
"time": 0.7357901203839136,
"velocity": 1.4715802407678271
},
{
"acceleration": -2.000000000000001,
"curvature": 0.0890473059997834,
"pose": {
"rotation": {
"radians": -2.6371126706696275
},
"translation": {
"x": 5.861076500320291,
"y": 2.3271663045682507
}
},
"time": 0.8113090147080106,
"velocity": 1.5291756378167156
},
{
"acceleration": -2.0,
"curvature": 0.1236555207180863,
"pose": {
"rotation": {
"radians": -2.6254009358770904
},
"translation": {
"x": 5.763403827977872,
"y": 2.2725302522280915
}
},
"time": 0.8883801670084662,
"velocity": 1.3750333332158045
},
{
"acceleration": -1.999999999999999,
"curvature": 0.18583935132968435,
"pose": {
"rotation": {
"radians": -2.609401527974989
},
"translation": {
"x": 5.671762249572714,
"y": 2.2196148476832587
}
},
"time": 0.9702091834888774,
"velocity": 1.211375300254982
},
{
"acceleration": -2.0,
"curvature": 0.30440106761988056,
"pose": {
"rotation": {
"radians": -2.586734444645188
},
"translation": {
"x": 5.5899449153296805,
"y": 2.1702821589091643
}
},
"time": 1.055014832270314,
"velocity": 1.0417640026921093
},
{
"acceleration": -1.9999999999999996,
"curvature": 0.5452468307287458,
"pose": {
"rotation": {
"radians": -2.553369025818913
},
"translation": {
"x": 5.520866192528841,
"y": 2.126012291219599
}
},
"time": 1.1408437614505855,
"velocity": 0.8701061443315661
},
{
"acceleration": -2.0000000000000004,
"curvature": 1.051731849103827,
"pose": {
"rotation": {
"radians": -2.5027424588398004
},
"translation": {
"x": 5.466150015198725,
"y": 2.0877072789203233
}
},
"time": 1.2259261857886903,
"velocity": 0.6999412956553568
},
{
"acceleration": -2.0,
"curvature": 2.00702755263788,
"pose": {
"rotation": {
"radians": -2.4267863835171433
},
"translation": {
"x": 5.425718233809574,
"y": 2.055494976962671
}
},
"time": 1.3098431410582272,
"velocity": 0.5321073851162831
},
{
"acceleration": -2.0,
"curvature": 2.545068677955283,
"pose": {
"rotation": {
"radians": -2.3791877799992958
},
"translation": {
"x": 5.41026785182417,
"y": 2.041453596328645
}
},
"time": 1.3524981864750185,
"velocity": 0.44679729428270026
},
{
"acceleration": -2.0,
"curvature": 2.7295865474899923,
"pose": {
"rotation": {
"radians": -2.3301343560903667
},
"translation": {
"x": 5.397378964966608,
"y": 2.028532952597139
}
},
"time": 1.3979731206637798,
"velocity": 0.35584742590517754
},
{
"acceleration": -2.0,
"curvature": -3.2569945202570383e-13,
"pose": {
"rotation": {
"radians": -2.273459480617757
},
"translation": {
"x": 5.37641494110327,
"y": 2.004812377026987
}
},
"time": 1.5758968336163686,
"velocity": 0.0
}
]
2 changes: 1 addition & 1 deletion PathWeaver/Paths/4Ball_v2Part2Opt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
5.376,-6.2246,-0.683,-0.37,true,false,
5.376,-6.2246,-0.24598806105640847,-0.3585919897507246,true,false,
4.09035759520958,-6.327359411623811,-0.8119687829169631,0.08089385059403098,false,false,
2.9371526464247966,-6.014808537654102,-0.4095494210637556,-0.09699854709404754,true,false,
1.9240567101091923,-6.402802726030292,-0.496617763170435,-0.3429475441834765,false,false,
Loading