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

2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java

@@ -2,6 +2,7 @@
 package org.usfirst.frc4388.robot;
 
 import edu.wpi.first.wpilibj.IterativeRobot;
+import edu.wpi.first.wpilibj.TimedRobot;
 import edu.wpi.first.wpilibj.CameraServer;
 import edu.wpi.first.wpilibj.DriverStation;
 //import edu.wpi.first.wpilibj.PowerDistributionPanel;
@@ -23,7 +24,7 @@ import org.usfirst.frc4388.robot.subsystems.Drive;
 
 import org.usfirst.frc4388.robot.subsystems.Drive.DriveControlMode;;
 
-public class Robot extends IterativeRobot 
+public class Robot extends TimedRobot
 {
 
 	public static OI oi;
@@ -39,7 +40,7 @@ public class Robot extends IterativeRobot
 
 
     public static final Climber climber = new Climber();
-    public static final Pnumatics pnumatics = new Pnumatics();
+    public static final Pneumatics pnumatics = new Pneumatics();
 	public static final long periodMS = 10;
 	public static final ControlLooper controlLoop = new ControlLooper("Main control loop", periodMS);
 

2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Pneumatics.java

@@ -6,7 +6,7 @@ import org.usfirst.frc4388.robot.RobotMap;
 import edu.wpi.first.wpilibj.DoubleSolenoid;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
-public class Pnumatics extends Subsystem {
+public class Pneumatics extends Subsystem {
     
 		
 	private DoubleSolenoid speedShift;
@@ -15,7 +15,7 @@ public class Pnumatics extends Subsystem {
 	private DoubleSolenoid wrist;
 
 	
-	public Pnumatics() {
+	public Pneumatics() {
 		try {
 			speedShift = new DoubleSolenoid(1,0,1);					
 			hatchIntake = new DoubleSolenoid(1,2,3); 
@@ -23,7 +23,7 @@ public class Pnumatics extends Subsystem {
 			wrist = new DoubleSolenoid(1,6,7);
 		} 
 		catch (Exception e) {
-			System.err.println("An error occurred in the Pnumatics constructor");
+			System.err.println("An error occurred in the Pneumatics constructor");
 		}
 	}