2
0
mirror of https://github.com/team2059/Dent synced 2025-01-07 22:14:14 -05:00

Merge branch patch/style-fixes

This commit is contained in:
Austen Adler 2015-03-09 10:15:43 -04:00
commit c10a308abf
22 changed files with 34 additions and 36 deletions

3
OI.h
View File

@ -7,8 +7,7 @@
/**
* @brief Controls the robot with joysticks
*/
class OI
{
class OI{
private:
Joystick *leftStick, *rightStick;
public:

View File

@ -7,8 +7,7 @@
*
* Uses four motors, two on the sides, one on the bottom, and one on the ramp to collect and eject totes
*/
class Collector: public Subsystem
{
class Collector: public Subsystem{
private:
CANTalon *collectorMotorLeft, //<! Left collector motor
*collectorMotorBottom, //<! Bottom collctor motor