2
0
mirror of https://github.com/team2059/Dent synced 2024-12-18 20:52:29 -05:00

Fix slight style issues to meet current standards.

This commit is contained in:
Carl Colglazier 2015-03-08 21:27:33 -04:00
parent b5460f9b1e
commit 5663ba3fec
6 changed files with 7 additions and 10 deletions

View File

@ -10,9 +10,9 @@ Elevator* CommandBase::elevator = NULL;
BinElevator* CommandBase::binElevator = NULL; BinElevator* CommandBase::binElevator = NULL;
Pneumatics* CommandBase::pneumatics=NULL; Pneumatics* CommandBase::pneumatics=NULL;
OI* CommandBase::oi = NULL; OI* CommandBase::oi = NULL;
CommandBase::CommandBase(char const *name) : Command(name) { CommandBase::CommandBase(char const *name) : Command(name){
} }
CommandBase::CommandBase() : Command() { CommandBase::CommandBase() : Command(){
} }
void CommandBase::init(){ void CommandBase::init(){
drivetrain = new Drivetrain(); drivetrain = new Drivetrain();

View File

@ -10,7 +10,7 @@
#include "OI.h" #include "OI.h"
#include "WPILib.h" #include "WPILib.h"
class CommandBase: public Command { class CommandBase: public Command{
public: public:
CommandBase(char const *name); CommandBase(char const *name);
CommandBase(); CommandBase();

View File

@ -13,7 +13,7 @@
* *
* Features a 4-motor collector, 4-motor mecanum drivetrain, two one-motor elevators * Features a 4-motor collector, 4-motor mecanum drivetrain, two one-motor elevators
*/ */
class DentRobot: public IterativeRobot { class DentRobot: public IterativeRobot{
private: private:
/** /**
* @brief The default driving command * @brief The default driving command

3
OI.h
View File

@ -7,8 +7,7 @@
/** /**
* @brief Controls the robot with joysticks * @brief Controls the robot with joysticks
*/ */
class OI class OI{
{
private: private:
Joystick *leftStick, *rightStick; Joystick *leftStick, *rightStick;
public: 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 * 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: private:
CANTalon *collectorMotorLeft, //<! Left collector motor CANTalon *collectorMotorLeft, //<! Left collector motor
*collectorMotorBottom, //<! Bottom collctor motor *collectorMotorBottom, //<! Bottom collctor motor

View File

@ -2,8 +2,7 @@
#define PNEUMATICS_H #define PNEUMATICS_H
#include "WPILib.h" #include "WPILib.h"
class Pneumatics: public Subsystem class Pneumatics: public Subsystem{
{
private: private:
Solenoid *solenoid1, *solenoid2; Solenoid *solenoid1, *solenoid2;
public: public: