Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/main/deploy/constants/BlueFieldLocations.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@
"radians": -2.0943951023931953
},
"blueCoralStationRightTranslation": {
"x": 1.57,
"y": 0.67
"x": 1.72,
"y": 0.55
},
"blueCoralStationRightRotation": {
"radians": 1.0471975511965976
},
"blueCoralStationLeftTranslation": {
"x": 1.61,
"y": 7.44
"x": 1.62,
"y": 7.38
},
"blueCoralStationLeftRotation": {
"radians": -1.0471975511965976
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/constants/RedFieldLocations.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@
"radians": 1.0471975511965976
},
"redCoralStationRightTranslation": {
"x": 15.99,
"y": 7.4
"x": 15.85,
"y": 7.38
},
"redCoralStationRightRotation": {
"radians": -2.0943951023931953
},
"redCoralStationLeftTranslation": {
"x": 15.96,
"y": 0.64
"x": 16.1,
"y": 0.8
},
"redCoralStationLeftRotation": {
"radians": 2.0943951023931953
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/constants/comp/DrivetrainConstants.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"driveRotationKi": 0.0,
"driveRotationKd": 0.0,
"driveAlongTrackMultiplier": 1,
"driveAlongTrackOffset": 0.27,
"driveCrossTrackFrontRightOffset": -0.04,
"driveAlongTrackOffset": 0.24,
"driveCrossTrackFrontRightOffset": -0.03,
"driveCrossTrackFrontLeftOffset": -0.03,
"driveCrossTrackFrontRightAlgaeOffset": 0.25,
"driveCrossTrackFrontLeftAlgaeOffset": 0.25,
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/constants/comp/controllers.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
{
"command": "driveX",
"axis": "JOYSTICK_X",
"negate": false
"negate": true
},
{
"command": "driveY",
"axis": "JOYSTICK_Y",
"negate": false
"negate": true
}
]
},
Expand All @@ -83,7 +83,7 @@
{
"command": "driveRotation",
"axis": "JOYSTICK_X",
"negate": false
"negate": true
}
]
},
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/frc/robot/InitBindings.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public static void initDriveBindings(Drive drive, StrategyManager strategyManage
drive.setDefaultCommand(
new DriveWithJoysticks(
drive, // type: DriveTemplate
() -> getAxis("driveX").getAsDouble(),
() -> getAxis("driveY").getAsDouble(),
() -> getAxis("driveRotation").getAsDouble(),
() -> -getAxis("driveX").getAsDouble(),
() -> -getAxis("driveY").getAsDouble(),
() -> -getAxis("driveRotation").getAsDouble(),
JsonConstants.drivetrainConstants.maxLinearSpeed, // type: double (m/s)
JsonConstants.drivetrainConstants.maxAngularSpeed, // type: double (rad/s)
JsonConstants.drivetrainConstants.joystickDeadband // type: double
Expand Down
Loading