diff --git a/RobotMap.h b/RobotMap.h index afeb205..987561e 100644 --- a/RobotMap.h +++ b/RobotMap.h @@ -5,10 +5,9 @@ // Elevator #define ELEVATOR_CAN 1 -#define ELEVATOR_BOTTOM_DIO 0 -#define ELEVATOR_COLELCT_TOTE_DIO 1 -#define ELEVATOR_READY_TOTE_DIO 2 -#define ELEVATOR_TOP_DIO 5 +#define ELEVATOR_BOTTOM_DIO 9 +#define ELEVATOR_MIDDLE_DIO 8 +#define ELEVATOR_TOP_DIO 7 #define ELEVATOR_ENCODERA 4 #define ELEVATOR_ENCODERB 9 @@ -27,8 +26,7 @@ #define DRIVE_BACK_RIGHT_CAN 5 // Collector -#define COLLECTOR_WINDOW_LEFT_CAN 6 -#define COLLECTOR_WINDOW_RIGHT_CAN 7 +#define COLLECTOR_RAMP_CAN 7 #define COLLECTOR_LEFT_CAN 8 #define COLLECTOR_BOTTOM_CAN 10 #define COLLECTOR_RIGHT_CAN 9 diff --git a/Subsystems/Collector.cpp b/Subsystems/Collector.cpp index c3a1429..c7cd582 100644 --- a/Subsystems/Collector.cpp +++ b/Subsystems/Collector.cpp @@ -4,6 +4,7 @@ Collector::Collector() : Subsystem("Collector"){ collectorMotorLeft=new CANTalon(COLLECTOR_LEFT_CAN); collectorMotorBottom=new CANTalon(COLLECTOR_BOTTOM_CAN); + collectorMotorRamp=new CANTalon(COLLECTOR_RAMP_CAN); collectorMotorRight=new CANTalon(COLLECTOR_RIGHT_CAN); } void Collector::InitDefaultCommand(){ @@ -11,6 +12,7 @@ void Collector::InitDefaultCommand(){ void Collector::MoveRollers(double a){ collectorMotorLeft->Set(a); collectorMotorBottom->Set(a); + collectorMotorRamp->Set(a); collectorMotorRight->Set(-a); } // vim: ts=2:sw=2:et diff --git a/Subsystems/Collector.h b/Subsystems/Collector.h index dbddc51..ddb31ed 100644 --- a/Subsystems/Collector.h +++ b/Subsystems/Collector.h @@ -5,7 +5,7 @@ class Collector: public Subsystem { private: - CANTalon *collectorMotorLeft, *collectorMotorBottom, *collectorMotorRight; + CANTalon *collectorMotorLeft, *collectorMotorBottom, *collectorMotorRamp, *collectorMotorRight; public: Collector(); void InitDefaultCommand();