/***
* This method allows you to set the voltage of the motor. The range of
* voltage is from [-1, 1]. A negative voltage makes the motor run backwards.
- *
-<<<<<<< e3056e0d68d3b4150b81db56c6685c399cb9c37a
-<<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
- * @param speed
- * The speed of the motors that control the rollers. The range of
- * these motors go from [-1,1]. A negative speed changes the
- * direction of the motors, making it run backwards.
- * =======
- * public IntakeArm() {
- *
- * }
*
- * /***
- * This method allows you to set the speed of the motor(s). The range
- * of speed
- * is from [-1, 1]. A negative speed changes the direction of the
- * motors.
- *
- * @param speed
- * The speed of the motors that control the rollers. The range of
- * these motors go from [-1,1]. A negative speed changes the
- * direction of the motors.
- * >>>>>>> reset to unix format
-=======
- * @param speed
- * The speed of the motors that control the rollers. The range of
- * these motors go from [-1,1]. A negative speed changes the
- * direction of the motors, making it run backwards.
->>>>>>> add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and areRollersRolling
-=======
* @param voltage
* The voltage of the motors that control the rollers. The range of
* these motors go from [-1,1]. A negative voltage makes the motor
* run
* backwards.
->>>>>>> add class level comment and change speed to voltage
*/
public void setRollerVoltage(double voltage) {
}
/***
-<<<<<<< e3056e0d68d3b4150b81db56c6685c399cb9c37a
-<<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
+ * <<<<<<< e3056e0d68d3b4150b81db56c6685c399cb9c37a
+ * <<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
* <<<<<<< bd5dc4363add71a17f95409115dec96b83146549
* This method gets you the current speed of the motor that controls the
* motor. The range of speed is from [-1,1]. A negative speed changes the
*
* @return
* >>>>>>> reset to unix format
-=======
- * This method gets you the current speed of the motor that controls the
- * motor. The range of speed is from [-1,1]. A negative speed changes the
- * direction of the motor, making it run backwards.
+ * =======
+ * This method gets you the current speed of the motor that controls
+ * the
+ * motor. The range of speed is from [-1,1]. A negative speed changes
+ * the
+ * direction of the motor, making it run backwards.
*
* @return Returns the speed of the motor that controls the roller. The range
* of the motor goes from [-1,1]. A negative speed changes the
* direction of the motor, making it go backwards.
->>>>>>> add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and areRollersRolling
-=======
- * This method gets you the current voltage of the motor that controls the
- * motor. The range of voltage is from [-1,1]. A negative voltage makes the
- * motor
- * run backwards.
+ * >>>>>>> add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and
+ * areRollersRolling
+ * =======
+ * This method gets you the current voltage of the motor that controls
+ * the
+ * motor. The range of voltage is from [-1,1]. A negative voltage
+ * makes the
+ * motor
+ * run backwards.
*
* @return Returns the voltage of the motor that controls the roller. The
* range
* of the motor goes from [-1,1]. A negative voltage indicates that
* the
* motor is running backwards.
->>>>>>> add class level comment and change speed to voltage
+ * >>>>>>> add class level comment and change speed to voltage
*/
public double getRollerVoltage() {
}
/***
-<<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
+ * <<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
* <<<<<<< bd5dc4363add71a17f95409115dec96b83146549
* This method checks to see if the motors controlling the rollers are
* currently working.
*
* @return
* >>>>>>> reset to unix format
-=======
- * This method checks to see if the motors controlling the rollers are
- * currently running.
+ * =======
+ * This method checks to see if the motors controlling the rollers are
+ * currently running.
*
* @return Returns whether the motors are currently running, and returns the
* state of the condition (true or false).
->>>>>>> add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and areRollersRolling
+ * >>>>>>> add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and
+ * areRollersRolling
*/
public boolean areRollersRolling() {