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

Merge branch 'patch/typos' into develop

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

View File

@ -7,7 +7,7 @@ void RollOut::Initialize(){
}
void RollOut::Execute(){
//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);
SmartDashboard::PutNumber("DriveThrottle", -DentRobot::oi->GetLeftThrottle());
}

View File

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

View File

@ -11,7 +11,7 @@ void Lower::Execute(){
}
bool Lower::IsFinished(){
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;
}else{
return false;

View File

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

View File

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

View File

@ -10,8 +10,8 @@
class Collector: public Subsystem{
private:
CANTalon *collectorMotorLeft, //<! Left collector motor
*collectorMotorBottom, //<! Bottom collctor motor
*collectorMotorRamp, //<! Ramp collctor motor
*collectorMotorBottom, //<! Bottom collector motor
*collectorMotorRamp, //<! Ramp collector motor
*collectorMotorRight; //<! Right collector motor
/**
* @brief Analog input for sonar (unused)

View File

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