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

Removed hhlib, added bottom collector

Browse Source
This commit is contained in:
Austen Adler 2015-02-08 12:19:39 -05:00
parent 2951ddd321
commit e265ac785e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "src/hhlib"]
path = src/hhlib
url = git@github.com:team2059/hhlib.git

1
RobotMap.h
View File

@ -22,6 +22,7 @@
#define COLLECTOR_WINDOW_LEFT_CAN 6 #define COLLECTOR_WINDOW_LEFT_CAN 6
#define COLLECTOR_WINDOW_RIGHT_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_RIGHT_CAN 9 #define COLLECTOR_RIGHT_CAN 9
#endif #endif

2
Subsystems/Collector.cpp
View File

@ -5,6 +5,7 @@ Collector::Collector() : Subsystem("Collector") {
windowMotorLeft=new CANTalon(COLLECTOR_WINDOW_LEFT_CAN); windowMotorLeft=new CANTalon(COLLECTOR_WINDOW_LEFT_CAN);
windowMotorRight=new CANTalon(COLLECTOR_WINDOW_RIGHT_CAN); windowMotorRight=new CANTalon(COLLECTOR_WINDOW_RIGHT_CAN);
collectorMotorLeft=new CANTalon(COLLECTOR_LEFT_CAN); collectorMotorLeft=new CANTalon(COLLECTOR_LEFT_CAN);
collectorMotorBottom=new CANTalon(COLLECTOR_BOTTOM_CAN);
collectorMotorRight=new CANTalon(COLLECTOR_RIGHT_CAN); collectorMotorRight=new CANTalon(COLLECTOR_RIGHT_CAN);
} }
void Collector::InitDefaultCommand() { void Collector::InitDefaultCommand() {
@ -15,6 +16,7 @@ void Collector::MoveArms(double a){
} }
void Collector::MoveRollers(double a){ void Collector::MoveRollers(double a){
collectorMotorLeft->Set(a); collectorMotorLeft->Set(a);
collectorMotorBottom->Set(a);
collectorMotorRight->Set(-a); collectorMotorRight->Set(-a);
} }
bool Collector::ArmSensor(){ bool Collector::ArmSensor(){

2
Subsystems/Collector.h
View File

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