team2059/dent
2
0
Fork 0
mirror of https://github.com/team2059/Dent synced 2024-12-18 20:52:29 -05:00
Code Issues Releases Wiki Activity

Merge branch 'patch/typos' into develop

Browse Source
This commit is contained in:
Austen Adler 2015-03-10 20:21:19 -04:00
commit 4a2cf10c22
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Commands/Collector/RollOut.cpp
View File

@ -7,7 +7,7 @@ void RollOut::Initialize(){
} }
void RollOut::Execute(){ void RollOut::Execute(){
//TODO check this value to move the motors in the right direction //TODO check this value to move the motors in the right direction
// Devide by 2 twice because this speed should be half the collector speed // Divide by 2 twice because this speed should be half the collector speed
DentRobot::collector->MoveRollers(-DentRobot::oi->GetLeftThrottle() * 0.8); DentRobot::collector->MoveRollers(-DentRobot::oi->GetLeftThrottle() * 0.8);
SmartDashboard::PutNumber("DriveThrottle", -DentRobot::oi->GetLeftThrottle()); SmartDashboard::PutNumber("DriveThrottle", -DentRobot::oi->GetLeftThrottle());
} }

2
Commands/Drivetrain/Drive.h
View File

@ -9,7 +9,7 @@
/** /**
* @brief Drives the robot with a joystick * @brief Drives the robot with a joystick
* *
* Uses mechanum drive * Uses mecanum drive
*/ */
class Drive: public Command{ class Drive: public Command{
public: public:

2
Commands/Elevator/Lower.cpp
View File

@ -11,7 +11,7 @@ void Lower::Execute(){
} }
bool Lower::IsFinished(){ bool Lower::IsFinished(){
if(!DentRobot::elevator->GetElevatorBottom()||IsTimedOut()){ if(!DentRobot::elevator->GetElevatorBottom()||IsTimedOut()){
printf("Robot stoped lowering. Sensor based? %d\n", !DentRobot::elevator->GetElevatorBottom()); printf("Robot stopped lowering. Sensor based? %d\n", !DentRobot::elevator->GetElevatorBottom());
return true; return true;
}else{ }else{
return false; return false;

4
DentRobot.h
View File

@ -29,11 +29,11 @@ class DentRobot: public IterativeRobot{
*/ */
static OI* oi; static OI* oi;
/** /**
* @brief The 4-motor Collctor * @brief The 4-motor Collector
*/ */
static Collector* collector; static Collector* collector;
/** /**
* @brief The 4-motor mechanum Drivetrain * @brief The 4-motor mecanum Drivetrain
*/ */
static Drivetrain* drivetrain; static Drivetrain* drivetrain;
/** /**

2
Subsystems/BinElevator.h
View File

@ -11,7 +11,7 @@ class BinElevator{
CANTalon *motor; //<! The bin elevator motor CANTalon *motor; //<! The bin elevator motor
Encoder *elevatorEncoder; //<! The bin elevator encoder (unused) Encoder *elevatorEncoder; //<! The bin elevator encoder (unused)
DigitalInput *elevatorBottom, //<! The bottom bin elevator sensor (unused) DigitalInput *elevatorBottom, //<! The bottom bin elevator sensor (unused)
*elevatorTop; //<! The top bin elevator sensor (unuesd) *elevatorTop; //<! The top bin elevator sensor (unused)
public: public:
/** /**
* @brief Constructs BinElevator * @brief Constructs BinElevator

4
Subsystems/Collector.h
View File

@ -10,8 +10,8 @@
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 collector motor
*collectorMotorRamp, //<! Ramp collctor motor *collectorMotorRamp, //<! Ramp collector motor
*collectorMotorRight; //<! Right collector motor *collectorMotorRight; //<! Right collector motor
/** /**
* @brief Analog input for sonar (unused) * @brief Analog input for sonar (unused)

4
Subsystems/Elevator.h
View File

@ -12,7 +12,7 @@ class Elevator{
DigitalInput *elevatorBottom, //<! The bottom elevator sensor DigitalInput *elevatorBottom, //<! The bottom elevator sensor
*elevatorMiddle, //<! The middle elevator sensor *elevatorMiddle, //<! The middle elevator sensor
*elevatorTop; //<! The top elevator sensor *elevatorTop; //<! The top elevator sensor
bool useEncoder; //<! Use the elevator enoder (unused) bool useEncoder; //<! Use the elevator encoder (unused)
public: public:
/** /**
* @brief Constructs Elevator * @brief Constructs Elevator
@ -33,7 +33,7 @@ class Elevator{
*/ */
void ResetEncoder(); void ResetEncoder();
/** /**
* @brief Gets the height of the elevtor * @brief Gets the height of the elevator
* *
* @return The hight of the elevator * @return The hight of the elevator
*/ */