From 06fff41d54b8b977effd363c454b35a26732977f Mon Sep 17 00:00:00 2001
From: mayabartels <mayabartels01@gmail.com>
Date: Mon, 5 Mar 2018 21:20:34 -0700
Subject: [PATCH] Elevator Changed Reverted

Safety uncommented from elevator
---
 .../frc4388/robot/subsystems/Elevator.java       | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/org/usfirst/frc4388/robot/subsystems/Elevator.java b/src/org/usfirst/frc4388/robot/subsystems/Elevator.java
index a91b5bb..2deb2b9 100644
--- a/src/org/usfirst/frc4388/robot/subsystems/Elevator.java
+++ b/src/org/usfirst/frc4388/robot/subsystems/Elevator.java
@@ -211,19 +211,15 @@ public class Elevator extends Subsystem implements ControlLoopable
       	}
      	else if(elevatorTuningPressed == false)
      	{
-     		elevatorRight.set(moveElevatorInput);
-     	}
-     		
-     		/*
      		if(elevatorPos <= elevatorSafeZone && elevatorPos >= 0)
      		{
      			elevatorRight.set(moveElevatorInput);
      		}
      		else if(elevatorPos > elevatorSafeZone)
      		{
-     			elevatorRight.set(moveElevatorInput * 0.65);
-     			
+     			elevatorRight.set(moveElevatorInput * 0.8);
      			
+     			/*
      			if(holdButtonPressed == true)
              	{
              		elevatorRight.set(-0.43 * (0.2));
@@ -232,17 +228,15 @@ public class Elevator extends Subsystem implements ControlLoopable
              	{
              		elevatorRight.set(moveElevatorInput * 0.75);
              	}
-             	
+             	*/
      		}
-     		
+     		/*
      		else if(elevatorPos < 0)
      		{
              	elevatorRight.set(moveElevatorInput * 0.75);
      		}
-     		
      		*/
-    	
-    	System.out.println(moveElevatorInput);
+     	}
     }
      	
 //     	System.out.println(elevatorPos);		//-6.9 to 1.9   total: 8.8 range