updated code AND changed some things

OakvilleDynamics · Feb 10, 2024 · 6d33b1b · 6d33b1b
1 parent 5bec600
commit 6d33b1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
@@ -62,9 +62,9 @@ public static class OperatorConstants {
     // TODO: Add button binds for driver controllers
 
     // Joystick Deadband
-    public static final double LEFT_X_DEADBAND = 0.01;
-    public static final double LEFT_Y_DEADBAND = 0.01;
-    public static final double RIGHT_X_DEADBAND = 0.01;
+    public static final double LEFT_X_DEADBAND = 0.5;
+    public static final double LEFT_Y_DEADBAND = 0.5;
+    public static final double RIGHT_X_DEADBAND = 0.5;
     public static final double TURN_CONSTANT = 6;
   }
 
@@ -75,13 +75,13 @@ public static class MechanismConstants {
     public static final int INTAKE_MOTOR_2 = 52;
     public static final boolean INTAKE_MOTOR_1_INVERTED = true;
     public static final boolean INTAKE_MOTOR_2_INVERTED = false;
-    public static final double INTAKE_MOTOR_SPEED = 0.25;
+    public static final double INTAKE_MOTOR_SPEED = 0.15;
 
     // Conveyor Motors
     public static final int CONVEYOR_MOTOR_1 = 1;
     public static final int CONVEYOR_MOTOR_2 = 2;
     public static final boolean CONVEYOR_MOTOR_1_INVERTED = true;
     public static final boolean CONVEYOR_MOTOR_2_INVERTED = false;
-    public static final double CONVEYOR_MOTOR_SPEED = 0.25;
+    public static final double CONVEYOR_MOTOR_SPEED = 1;
   }
 }
diff --git a/src/main/java/frc/robot/commands/ConveyorCommand.java b/src/main/java/frc/robot/commands/ConveyorCommand.java
@@ -25,10 +25,10 @@ public void initialize() {}
   @Override
   public void execute() {
     // TODO: Change this to the correct button
-    if (ConveyorJoystick.getRawButton(4) == true) {
+    if (ConveyorJoystick.getRawButton(6) == true) {
       m_ConveyorSubsystem.enableConveyor();
       // TODO: Change this to the correct button
-    } else if (ConveyorJoystick.getRawButton(3) == true) {
+    } else if (ConveyorJoystick.getRawButton(5) == true) {
       m_ConveyorSubsystem.reverseConveyor();
       System.out.println("Conveyor Moving in Reverse");
     } else {