From 4f1eb45e044d03e52445472922a9fbf069296646 Mon Sep 17 00:00:00 2001
From: Shaina Chen <shaina.sierra@gmail.com>
Date: Fri, 29 Jan 2016 21:38:35 -0800
Subject: [PATCH] Add set motor speed methods in defense arm and add
 potentiometer getter methods

---
 .../frc/team3501/robot/subsystems/Scaler.java | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java
index 7f685fcb..09f73021 100755
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java
@@ -18,10 +18,13 @@ public class Scaler extends Subsystem {
 
   }
 
+<<<<<<< 39cd129b533ffb726c00d5d5cd98b541a25d23bd
   public void setPistonStatus(int status) {
 
   }
 
+=======
+>>>>>>> Add set motor speed methods in defense arm and add potentiometer getter methods
   public Value getSolenoidValue() {
     return piston.get();
   }
@@ -50,8 +53,52 @@ public class Scaler extends Subsystem {
     winch.set(speed);
   }
 
+<<<<<<< 39cd129b533ffb726c00d5d5cd98b541a25d23bd
+=======
+  /***
+   * This method returns boolean value true or false on whether piston is
+   * extended or not.
+   * 
+   * @return
+   *         returns true if piston is extended, false if otherwise.
+   */
+  public boolean getPistonStatus() {
+    return true;
+  }
+
+  /***
+   * This method sets the motor voltage for the scissor lift. The range is from
+   * [-1, 1].
+   *
+   * @param speed
+   *          The voltage that you set the motor at. The range of the voltage of
+   *          the motor is from [-1,1].
+   */
+  public void setScalarSpeed(double speed) {
+
+  }
+
+  /***
+   * This method sets the piston status for the scissor lift.
+   * The piston can either be extended or not extended.
+   * 
+   * @param status
+   *          The status of the piston.
+   *          0 for the piston to be extended, 1 for the piston to not be
+   *          extended.
+   */
+
+  public void setPistonStatus(int status) {
+
+  }
+
+>>>>>>> Add set motor speed methods in defense arm and add potentiometer getter methods
   @Override
   protected void initDefaultCommand() {
 
   }
+<<<<<<< 39cd129b533ffb726c00d5d5cd98b541a25d23bd
+=======
+
+>>>>>>> Add set motor speed methods in defense arm and add potentiometer getter methods
 }
-- 
2.30.2