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

Added collectorMotorRamp

Browse Source
This commit is contained in:
Austen Adler 2015-02-14 17:12:58 -05:00
parent 5aab16c8b1
commit 7665f16a9b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RobotMap.h
View File

@ -5,10 +5,9 @@
// Elevator // Elevator
#define ELEVATOR_CAN 1 #define ELEVATOR_CAN 1
#define ELEVATOR_BOTTOM_DIO 0 #define ELEVATOR_BOTTOM_DIO 9
#define ELEVATOR_COLELCT_TOTE_DIO 1 #define ELEVATOR_MIDDLE_DIO 8
#define ELEVATOR_READY_TOTE_DIO 2 #define ELEVATOR_TOP_DIO 7
#define ELEVATOR_TOP_DIO 5
#define ELEVATOR_ENCODERA 4 #define ELEVATOR_ENCODERA 4
#define ELEVATOR_ENCODERB 9 #define ELEVATOR_ENCODERB 9
@ -27,8 +26,7 @@
#define DRIVE_BACK_RIGHT_CAN 5 #define DRIVE_BACK_RIGHT_CAN 5
// Collector // Collector
#define COLLECTOR_WINDOW_LEFT_CAN 6 #define COLLECTOR_RAMP_CAN 7
#define COLLECTOR_WINDOW_RIGHT_CAN 7
#define COLLECTOR_LEFT_CAN 8 #define COLLECTOR_LEFT_CAN 8
#define COLLECTOR_BOTTOM_CAN 10 #define COLLECTOR_BOTTOM_CAN 10
#define COLLECTOR_RIGHT_CAN 9 #define COLLECTOR_RIGHT_CAN 9

2
Subsystems/Collector.cpp
View File

@ -4,6 +4,7 @@
Collector::Collector() : Subsystem("Collector"){ Collector::Collector() : Subsystem("Collector"){
collectorMotorLeft=new CANTalon(COLLECTOR_LEFT_CAN); collectorMotorLeft=new CANTalon(COLLECTOR_LEFT_CAN);
collectorMotorBottom=new CANTalon(COLLECTOR_BOTTOM_CAN); collectorMotorBottom=new CANTalon(COLLECTOR_BOTTOM_CAN);
collectorMotorRamp=new CANTalon(COLLECTOR_RAMP_CAN);
collectorMotorRight=new CANTalon(COLLECTOR_RIGHT_CAN); collectorMotorRight=new CANTalon(COLLECTOR_RIGHT_CAN);
} }
void Collector::InitDefaultCommand(){ void Collector::InitDefaultCommand(){
@ -11,6 +12,7 @@ void Collector::InitDefaultCommand(){
void Collector::MoveRollers(double a){ void Collector::MoveRollers(double a){
collectorMotorLeft->Set(a); collectorMotorLeft->Set(a);
collectorMotorBottom->Set(a); collectorMotorBottom->Set(a);
collectorMotorRamp->Set(a);
collectorMotorRight->Set(-a); collectorMotorRight->Set(-a);
} }
// vim: ts=2:sw=2:et // vim: ts=2:sw=2:et

2
Subsystems/Collector.h
View File

@ -5,7 +5,7 @@
class Collector: public Subsystem class Collector: public Subsystem
{ {
private: private:
CANTalon *collectorMotorLeft, *collectorMotorBottom, *collectorMotorRight; CANTalon *collectorMotorLeft, *collectorMotorBottom, *collectorMotorRamp, *collectorMotorRight;
public: public:
Collector(); Collector();
void InitDefaultCommand(); void InitDefaultCommand();