Skip to content

Commit

Permalink
re0ing
Browse files Browse the repository at this point in the history
  • Loading branch information
penguin212 committed Nov 9, 2023
1 parent 88038e3 commit ec69c8f
Show file tree
Hide file tree
Showing 7 changed files with 103 additions and 3 deletions.
Binary file removed FRC_TBD_2e1222392fcc8c02.wpilog
Binary file not shown.
Binary file added FRC_TBD_f5fa01df8b142e71.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 @@
[]
92 changes: 92 additions & 0 deletions simgui-ds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"keyboardJoysticks": [
{
"axisConfig": [
{
"decKey": 65,
"incKey": 68
},
{
"decKey": 87,
"incKey": 83
},
{
"decKey": 69,
"decayRate": 0.0,
"incKey": 82,
"keyRate": 0.009999999776482582
}
],
"axisCount": 3,
"buttonCount": 4,
"buttonKeys": [
90,
88,
67,
86
],
"povConfig": [
{
"key0": 328,
"key135": 323,
"key180": 322,
"key225": 321,
"key270": 324,
"key315": 327,
"key45": 329,
"key90": 326
}
],
"povCount": 1
},
{
"axisConfig": [
{
"decKey": 74,
"incKey": 76
},
{
"decKey": 73,
"incKey": 75
}
],
"axisCount": 2,
"buttonCount": 4,
"buttonKeys": [
77,
44,
46,
47
],
"povCount": 0
},
{
"axisConfig": [
{
"decKey": 263,
"incKey": 262
},
{
"decKey": 265,
"incKey": 264
}
],
"axisCount": 2,
"buttonCount": 6,
"buttonKeys": [
260,
268,
266,
261,
269,
267
],
"povCount": 0
},
{
"axisCount": 0,
"buttonCount": 0,
"povCount": 0
}
]
}
7 changes: 7 additions & 0 deletions simgui.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"NTProvider": {
"types": {
"/FMSInfo": "FMSInfo"
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static final class SwerveConstants {
: 1.382026108103343;
public static final double TR_OFFSET_RADS = IS_R1
? -1.1199431538621365 // 2.0216494997276566
: 2.771561729904038;
: -0.37003092686; // 2.771561729904038
public static final double BL_OFFSET_RADS = IS_R1
? -2.374440566697393
: -0.0563106973979135 ; //3.0852819561918796
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ public class RobotContainer {
* The container for the robot. Contains subsystems, OI devices, and commands.
*/
public RobotContainer() {
driveController = new DualJoystickDriveController();
// driveController = new XboxDriveController();
// driveController = new DualJoystickDriveController();
driveController = new XboxDriveController();

photonWrapper = new PhotonWrapper();
switchableCamera = new SwitchableCamera(shuffleboardTab);
Expand Down

0 comments on commit ec69c8f

Please sign in to comment.