Team4388/2019-Hit-or-Miss
1
0
Fork 0
mirror of https://github.com/Team4388/2019-Hit-or-Miss.git synced 2026-06-09 00:28:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Left to right motor name change

Browse Source
This commit is contained in:
mayabartels
2019-02-01 18:32:21 -08:00
parent 52ba717ffc
commit b64c23c620
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2019robot/src/main/java/org/usfirst/frc4388/robot/RobotMap.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class RobotMap {
public static final int DRIVETRAIN_RIGHT_MOTOR2_CAN_ID = 5;
//carriage motors
public static final int WRIST_LEFT_MOTOR_CAN_ID = 6;
public static final int WRIST_RIGHT_MOTOR_CAN_ID = 6;
public static final int INTAKE_MOTOR = 7;
//Arm Motors
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Wrist.java
+7 -2
View File
@@ -94,7 +94,7 @@ public class Wrist extends Subsystem
try
{
//PID wrist encoder and talon
wristRight = new CANTalonEncoder(RobotMap.WRIST_LEFT_MOTOR_CAN_ID, WRIST_ENCODER_TICKS_TO_DEGREES, FeedbackDevice.QuadEncoder);
wristRight = new CANTalonEncoder(RobotMap.WRIST_RIGHT_MOTOR_CAN_ID, WRIST_ENCODER_TICKS_TO_DEGREES, FeedbackDevice.QuadEncoder);
}
catch(Exception e)
{
@@ -222,7 +222,7 @@ public class Wrist extends Subsystem
{
double joystickSpeed;
joystickSpeed = -Robot.oi.getOperatorController().getLeftYAxis();
joystickSpeed = -Robot.oi.getOperatorController().getRightYAxis();
setSpeedJoystick(joystickSpeed);
}
@@ -242,6 +242,11 @@ public class Wrist extends Subsystem
updatePositionPID(targetAngleDegreesBallIn);
}
public void controlPIDBallOut()
{
}
public synchronized boolean isFinished()
{
return isFinished;