From d1c991a852f6b98e93acb1e9a8ad04d1c98006b4 Mon Sep 17 00:00:00 2001 From: EuphoniumPlayer Date: Thu, 7 Mar 2024 21:34:02 -0600 Subject: [PATCH] Fixed a POV Value Typo "FlyWJoystick.getPOV() == >>>215<<<" has been corrected to "FlyWJoystick.getPOV() == >>>315<<<" in FlyWCommand.java. Additionally, some completed //TODO's have been cleared due to completion of their task in previous commits. --- .vscode/launch.json | 12 +++++++++--- .../java/frc/robot/commands/ConveyorCommand.java | 1 - src/main/java/frc/robot/commands/DumpControl.java | 2 -- src/main/java/frc/robot/commands/FlyWCommand.java | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index c9c9713..1f39ec5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,18 +4,24 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ - + { + "type": "java", + "name": "Main", + "request": "launch", + "mainClass": "frc.robot.Main", + "projectName": "2024-Robot" + }, { "type": "wpilib", "name": "WPILib Desktop Debug", "request": "launch", - "desktop": true, + "desktop": true }, { "type": "wpilib", "name": "WPILib roboRIO Debug", "request": "launch", - "desktop": false, + "desktop": false } ] } diff --git a/src/main/java/frc/robot/commands/ConveyorCommand.java b/src/main/java/frc/robot/commands/ConveyorCommand.java index 1ac4092..cf86812 100644 --- a/src/main/java/frc/robot/commands/ConveyorCommand.java +++ b/src/main/java/frc/robot/commands/ConveyorCommand.java @@ -26,7 +26,6 @@ public void initialize() {} public void execute() { if (ConveyorJoystick.getRawButton(5) == true | ConveyorJoystick.getRawButton(3) == true) { m_ConveyorSubsystem.enableConveyor(); - // TODO: Change this to the correct button } else if (ConveyorJoystick.getRawButton(6) == true | ConveyorJoystick.getRawButton(4)) { m_ConveyorSubsystem.reverseConveyor(); System.out.println("Conveyor Moving in Reverse"); diff --git a/src/main/java/frc/robot/commands/DumpControl.java b/src/main/java/frc/robot/commands/DumpControl.java index 2bd1d0f..2bef950 100644 --- a/src/main/java/frc/robot/commands/DumpControl.java +++ b/src/main/java/frc/robot/commands/DumpControl.java @@ -29,10 +29,8 @@ public void initialize() {} // Called every time the scheduler runs while the command is scheduled. @Override public void execute() { - // TODO: Change this to the correct button if (DumpJoystick.getRawButton(1)) { DumpSubsystem.open(); - // TODO: Change this to the correct button } else if (DumpJoystick.getRawButton(2)) { DumpSubsystem.close(); } diff --git a/src/main/java/frc/robot/commands/FlyWCommand.java b/src/main/java/frc/robot/commands/FlyWCommand.java index f45cc81..a7643e5 100644 --- a/src/main/java/frc/robot/commands/FlyWCommand.java +++ b/src/main/java/frc/robot/commands/FlyWCommand.java @@ -24,7 +24,7 @@ public void initialize() {} @Override public void execute() { - if (FlyWJoystick.getPOV() == 215 | FlyWJoystick.getPOV() == 0 | FlyWJoystick.getPOV() == 45) { + if (FlyWJoystick.getPOV() == 315 | FlyWJoystick.getPOV() == 0 | FlyWJoystick.getPOV() == 45) { m_FlyWSubsystem.enableflywheelfull(); } else if (FlyWJoystick.getPOV() == 225 | FlyWJoystick.getPOV() == 180 | FlyWJoystick.getPOV() == 135) { m_FlyWSubsystem.enableflywheellow();