Merge branch 'master' into DriveMotor

Conflicts:
	src/OI.cpp

src/Commands/StickOfJoy.cpp

@@ -0,0 +1,36 @@
+#include "StickOfJoy.h"
+
+StickOfJoy::StickOfJoy() {
+	Requires(Robot::driveMotor.get());
+	// Use Requires() here to declare subsystem dependencies
+	// eg. Requires(Robot::chassis.get());
+}
+
+// Called just before this Command runs the first time
+void StickOfJoy::Initialize() {
+
+
+}
+
+// Called repeatedly when this Command is scheduled to run
+void StickOfJoy::Execute() {
+	Robot::driveMotor->SetLeftMotor(Robot::oi->getJoystick1()->GetY());
+	Robot::driveMotor->SetRightMotor(Robot::oi->getJoystick1()->GetY());
+}
+
+// Make this return true when this Command no longer needs to run execute()
+bool StickOfJoy::IsFinished() {
+	return false;
+}
+
+// Called once after isFinished returns true
+void StickOfJoy::End() {
+
+}
+
+// Called when another command which requires one or more of the same
+// subsystems is scheduled to run
+void StickOfJoy::Interrupted() {
+	Robot::driveMotor->StopLeftMotor();
+	Robot::driveMotor->StopRightMotor();
+}

src/Commands/StickOfJoy.h

@@ -0,0 +1,16 @@
+#ifndef StickOfJoy_H
+#define StickOfJoy_H
+
+#include "../CommandBase.h"
+
+class StickOfJoy : public CommandBase {
+public:
+	StickOfJoy();
+	void Initialize();
+	void Execute();
+	bool IsFinished();
+	void End();
+	void Interrupted();
+};
+
+#endif  // StickOfJoy_H

src/OI.h

@@ -27,6 +27,8 @@ class OI {
 	// BEGIN AUTOGENERATED CODE, SOURCE=ROBOTBUILDER ID=PROTOTYPES
 
 	std::shared_ptr<Joystick> getJoystick1();
+	std::shared_ptr<Joystick> getY();
+
 	// END AUTOGENERATED CODE, SOURCE=ROBOTBUILDER ID=PROTOTYPES
 };