From 3475afb6649ac4ce02a56a13ebb6de673534284d Mon Sep 17 00:00:00 2001
From: john sandstedt <john sandstedt>
Date: Mon, 22 Feb 2016 19:13:09 -0500
Subject: [PATCH] potato... also maybe fixed driverstation::GetInstance() again
 potentially

---
 src/Robot.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Robot.cpp b/src/Robot.cpp
index e847442..5e9beaf 100644
--- a/src/Robot.cpp
+++ b/src/Robot.cpp
@@ -31,7 +31,7 @@ class Robot: public IterativeRobot
 	RobotDrive drive;
 	Shooter shooter;
 	Joystick driver_stick, operator_stick;
-	DriverStation ds;
+	//DriverStation DriverStation::GetInstance();
 	float power;
 public:
 	Robot():
@@ -46,7 +46,7 @@ public:
 		driver_stick(0), 				// right stick (operator)
 		operator_stick(1)				// left stick (driver)
 	{
-		ds.GetInstance();
+		//DriverStation::GetInstance().GetInstance();
 
 	}
 
@@ -64,7 +64,7 @@ private:
 	/*void LogData()
 	{
 		static PowerDistributionPanel pdp;
-		static DriverStation ds = DriverStation::GetInstance();
+		static DriverStation DriverStation::GetInstance() = DriverStation::GetInstance();
 		static std::vector<CANTalon*> motors;
 
 		static std::ofstream logA, logB, logC;
@@ -261,11 +261,11 @@ private:
 		LOG("\t" << driver_stick.GetTwist());
 
 		//DriverStation Data
-		LOG("\t" << ds.GetAlliance());
-		LOG("\t" << ds.GetLocation());
-		LOG("\t" << ds.GetMatchTime());
-		LOG("\t" << ds.IsFMSAttached());
-		LOG("\t" << ds.IsSysBrownedOut());
+		LOG("\t" << DriverStation::GetInstance().GetAlliance());
+		LOG("\t" << DriverStation::GetInstance().GetLocation());
+		LOG("\t" << DriverStation::GetInstance().GetMatchTime());
+		LOG("\t" << DriverStation::GetInstance().IsFMSAttached());
+		LOG("\t" << DriverStation::GetInstance().IsSysBrownedOut());
 		LOG(std::endl);
 	}
 };