From ec69c8fff355ac9dd5fb8f1ecce4bfc1c42738f7 Mon Sep 17 00:00:00 2001
From: penguin212 <dhuber06@gmail.com>
Date: Thu, 9 Nov 2023 15:39:03 -0800
Subject: [PATCH] re0ing

---
 FRC_TBD_2e1222392fcc8c02.wpilog             | Bin 12 -> 0 bytes
 FRC_TBD_f5fa01df8b142e71.wpilog             | Bin 0 -> 23835 bytes
 networktables.json                          |   1 +
 simgui-ds.json                              |  92 ++++++++++++++++++++
 simgui.json                                 |   7 ++
 src/main/java/frc/robot/Constants.java      |   2 +-
 src/main/java/frc/robot/RobotContainer.java |   4 +-
 7 files changed, 103 insertions(+), 3 deletions(-)
 delete mode 100644 FRC_TBD_2e1222392fcc8c02.wpilog
 create mode 100644 FRC_TBD_f5fa01df8b142e71.wpilog
 create mode 100644 networktables.json
 create mode 100644 simgui-ds.json
 create mode 100644 simgui.json

diff --git a/FRC_TBD_2e1222392fcc8c02.wpilog b/FRC_TBD_2e1222392fcc8c02.wpilog
deleted file mode 100644
index c8524049c83dac0c2cbb03fc425570a022e6c755..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12
RcmWF!@bvL_XJBLi0ss+&0n`8h

diff --git a/FRC_TBD_f5fa01df8b142e71.wpilog b/FRC_TBD_f5fa01df8b142e71.wpilog
new file mode 100644
index 0000000000000000000000000000000000000000..75642de8b1cc240599166456890c1a02f9e9c7af
GIT binary patch
literal 23835
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

literal 0
HcmV?d00001

diff --git a/networktables.json b/networktables.json
new file mode 100644
index 00000000..fe51488c
--- /dev/null
+++ b/networktables.json
@@ -0,0 +1 @@
+[]
diff --git a/simgui-ds.json b/simgui-ds.json
new file mode 100644
index 00000000..73cc713c
--- /dev/null
+++ b/simgui-ds.json
@@ -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
+    }
+  ]
+}
diff --git a/simgui.json b/simgui.json
new file mode 100644
index 00000000..449f4b1d
--- /dev/null
+++ b/simgui.json
@@ -0,0 +1,7 @@
+{
+  "NTProvider": {
+    "types": {
+      "/FMSInfo": "FMSInfo"
+    }
+  }
+}
diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
index 822ef67f..dae238a6 100644
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -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
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 5bae3052..f5435590 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -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);