adam
/
FRC2016
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

potato... also maybe fixed driverstation::GetInstance() again potentially

This commit is contained in:
john sandstedt 2016-02-22 19:13:09 -05:00
parent 9d2e8f3675
commit 3475afb664
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Robot.cpp
View File

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