made buttons private as per request by dean and fixed getButton

Author: dfang314

Robot2018/.classpath

@@ -9,5 +9,7 @@
 	<classpathentry kind="var" path="wpiutil" sourcepath="wpiutil.sources"/>
 	<classpathentry kind="lib" path="/Robot2017/libs/jars/navx_frc.jar"/>
 	<classpathentry kind="var" path="USERLIBS_DIR/CTRE_Phoenix.jar"/>
+	<classpathentry kind="var" path="USERLIBS_DIR/CTRE_Phoenix-sources.jar"/>
+	<classpathentry kind="var" path="USERLIBS_DIR/navx_frc.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Robot2018/src/org/usfirst/frc/team199/Robot2018/OI.java

@@ -48,13 +48,13 @@ public class OI {
 	// button.whenReleased(new ExampleCommand());
 
 	public Joystick leftJoy;
-	public JoystickButton shiftDrive;
-	public JoystickButton shiftDriveType;
+	private JoystickButton shiftDrive;
+	private JoystickButton shiftDriveType;
 	public Joystick rightJoy;
 	public Joystick manipulator;
 
 	public int getButton(String key, int def) {
-		if (!SmartDashboard.containsKey(key)) {
+		if (!SmartDashboard.containsKey("Button/" + key)) {
 			SmartDashboard.putNumber("Button/" + key, def);
 		}
 		return (int) SmartDashboard.getNumber("Button/" + key, def);