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

Merge branch 'Arm' of https://github.com/Team4388/2019-Hit-or-Miss into Arm

Browse Source
This commit is contained in:
Daniel Williams
2019-01-21 14:26:03 -07:00
parent c8c3c1489a 0888637bb2
commit e8ed8886f6
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java
+1 -4
View File
@@ -32,10 +32,7 @@ public class Robot extends IterativeRobot
public static final Elevator elevator = new Elevator(); public static final Arm arm = new Arm();
public static final Climber climber = new Climber(); public static final Climber climber = new Climber();
public static final Pnumatics pnumatics = new Pnumatics(); public static final Pnumatics pnumatics = new Pnumatics();
public static final long periodMS = 10; public static final long periodMS = 10;
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Elevator.java → 2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java
+1 -1
View File
@@ -31,7 +31,7 @@ import com.ctre.phoenix.motorcontrol.NeutralMode;
import com.ctre.phoenix.motorcontrol.SensorCollection; import com.ctre.phoenix.motorcontrol.SensorCollection;
import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
public class Elevator extends Subsystem implements ControlLoopable public class Arm extends Subsystem implements ControlLoopable
{ {
//PID encoder and motor //PID encoder and motor
private CANTalonEncoder elevatorRight; private CANTalonEncoder elevatorRight;