From e265ac785e22b27c186ec3daf2cdc2dd42c2b223 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Sun, 8 Feb 2015 12:19:39 -0500
Subject: [PATCH] Removed hhlib, added bottom collector

---
 .gitmodules              | 3 ---
 RobotMap.h               | 1 +
 Subsystems/Collector.cpp | 2 ++
 Subsystems/Collector.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index daab3dd..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "src/hhlib"]
-	path = src/hhlib
-  url = git@github.com:team2059/hhlib.git
diff --git a/RobotMap.h b/RobotMap.h
index 3e866a5..cdabc04 100644
--- a/RobotMap.h
+++ b/RobotMap.h
@@ -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
diff --git a/Subsystems/Collector.cpp b/Subsystems/Collector.cpp
index 365809b..f569633 100644
--- a/Subsystems/Collector.cpp
+++ b/Subsystems/Collector.cpp
@@ -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(){
diff --git a/Subsystems/Collector.h b/Subsystems/Collector.h
index 24dcc1d..d9cb6ff 100644
--- a/Subsystems/Collector.h
+++ b/Subsystems/Collector.h
@@ -5,7 +5,7 @@
 class Collector: public Subsystem
 {
   private:
-    CANTalon *windowMotorLeft, *windowMotorRight, *collectorMotorLeft, *collectorMotorRight;
+    CANTalon *windowMotorLeft, *windowMotorRight, *collectorMotorLeft, *collectorMotorBottom, *collectorMotorRight;
   public:
     Collector();
     void InitDefaultCommand();