Team4388/2018-Robot
1
0
Fork 0
mirror of https://github.com/Team4388/2018-Robot.git synced 2026-06-09 00:38:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Elevator Changed Reverted

Browse Source 
Safety uncommented from elevator
This commit is contained in:
mayabartels
2018-03-05 21:20:34 -07:00
parent 8fab4d55fe
commit 06fff41d54
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/usfirst/frc4388/robot/subsystems/Elevator.java
+5 -11
View File
@@ -211,19 +211,15 @@ public class Elevator extends Subsystem implements ControlLoopable
} }
else if(elevatorTuningPressed == false) else if(elevatorTuningPressed == false)
{ {
elevatorRight.set(moveElevatorInput);
}
/*
if(elevatorPos <= elevatorSafeZone && elevatorPos >= 0) if(elevatorPos <= elevatorSafeZone && elevatorPos >= 0)
{ {
elevatorRight.set(moveElevatorInput); elevatorRight.set(moveElevatorInput);
} }
else if(elevatorPos > elevatorSafeZone) else if(elevatorPos > elevatorSafeZone)
{ {
elevatorRight.set(moveElevatorInput * 0.65); elevatorRight.set(moveElevatorInput * 0.8);
/*
if(holdButtonPressed == true) if(holdButtonPressed == true)
{ {
elevatorRight.set(-0.43 * (0.2)); elevatorRight.set(-0.43 * (0.2));
@@ -232,17 +228,15 @@ public class Elevator extends Subsystem implements ControlLoopable
{ {
elevatorRight.set(moveElevatorInput * 0.75); elevatorRight.set(moveElevatorInput * 0.75);
} }
*/
} }
/*
else if(elevatorPos < 0) else if(elevatorPos < 0)
{ {
elevatorRight.set(moveElevatorInput * 0.75); elevatorRight.set(moveElevatorInput * 0.75);
} }
*/ */
}
System.out.println(moveElevatorInput);
} }
// System.out.println(elevatorPos); //-6.9 to 1.9 total: 8.8 range // System.out.println(elevatorPos); //-6.9 to 1.9 total: 8.8 range