mirror of
https://github.com/team2059/Dent
synced 2024-12-18 20:52:29 -05:00
Removed hhlib, added bottom collector
This commit is contained in:
parent
2951ddd321
commit
e265ac785e
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
||||
[submodule "src/hhlib"]
|
||||
path = src/hhlib
|
||||
url = git@github.com:team2059/hhlib.git
|
@ -22,6 +22,7 @@
|
||||
#define COLLECTOR_WINDOW_LEFT_CAN 6
|
||||
#define COLLECTOR_WINDOW_RIGHT_CAN 7
|
||||
#define COLLECTOR_LEFT_CAN 8
|
||||
#define COLLECTOR_BOTTOM_CAN 10
|
||||
#define COLLECTOR_RIGHT_CAN 9
|
||||
|
||||
#endif
|
||||
|
@ -5,6 +5,7 @@ Collector::Collector() : Subsystem("Collector") {
|
||||
windowMotorLeft=new CANTalon(COLLECTOR_WINDOW_LEFT_CAN);
|
||||
windowMotorRight=new CANTalon(COLLECTOR_WINDOW_RIGHT_CAN);
|
||||
collectorMotorLeft=new CANTalon(COLLECTOR_LEFT_CAN);
|
||||
collectorMotorBottom=new CANTalon(COLLECTOR_BOTTOM_CAN);
|
||||
collectorMotorRight=new CANTalon(COLLECTOR_RIGHT_CAN);
|
||||
}
|
||||
void Collector::InitDefaultCommand() {
|
||||
@ -15,6 +16,7 @@ void Collector::MoveArms(double a){
|
||||
}
|
||||
void Collector::MoveRollers(double a){
|
||||
collectorMotorLeft->Set(a);
|
||||
collectorMotorBottom->Set(a);
|
||||
collectorMotorRight->Set(-a);
|
||||
}
|
||||
bool Collector::ArmSensor(){
|
||||
|
@ -5,7 +5,7 @@
|
||||
class Collector: public Subsystem
|
||||
{
|
||||
private:
|
||||
CANTalon *windowMotorLeft, *windowMotorRight, *collectorMotorLeft, *collectorMotorRight;
|
||||
CANTalon *windowMotorLeft, *windowMotorRight, *collectorMotorLeft, *collectorMotorBottom, *collectorMotorRight;
|
||||
public:
|
||||
Collector();
|
||||
void InitDefaultCommand();
|
||||
|
Loading…
Reference in New Issue
Block a user