From d2c4205bbcdd6e6b053b33524726699ba6373965 Mon Sep 17 00:00:00 2001
From: Adam Long <macadam.long@gmail.com>
Date: Thu, 26 Feb 2015 17:18:23 +0000
Subject: [PATCH] Disabled camera, changed values

---
 Commands/Collector/RollOut.cpp |  2 +-
 DentRobot.cpp                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Commands/Collector/RollOut.cpp b/Commands/Collector/RollOut.cpp
index bc9ec90..d4d78d5 100644
--- a/Commands/Collector/RollOut.cpp
+++ b/Commands/Collector/RollOut.cpp
@@ -8,7 +8,7 @@ void RollOut::Initialize(){
 void RollOut::Execute(){
   //TODO check this value to move the motors in the right direction
   // Devide by 2 twice because this speed should be half the collector speed
-  DentRobot::collector->MoveRollers(-DentRobot::oi->GetLeftThrottle());
+  DentRobot::collector->MoveRollers(-DentRobot::oi->GetLeftThrottle()*.5);
 }
 bool RollOut::IsFinished(){
   return IsTimedOut();
diff --git a/DentRobot.cpp b/DentRobot.cpp
index 89d9c16..00b1f7d 100644
--- a/DentRobot.cpp
+++ b/DentRobot.cpp
@@ -16,8 +16,8 @@ DentRobot::DentRobot(){
   elevator=new Elevator();
   binElevator=new BinElevator();
   pneumatics=new Pneumatics();
-  CameraServer::GetInstance()->SetQuality(25);
-  CameraServer::GetInstance()->StartAutomaticCapture("cam0");
+  //CameraServer::GetInstance()->SetQuality(25);
+  //CameraServer::GetInstance()->StartAutomaticCapture("cam0");
   //SmartDashboard::PutNumber("Auto Wait Time", 1.0);
   //SmartDashboard::PutNumber("Auto Sequence", 0);
   printf("The robot is on\n");
@@ -48,9 +48,9 @@ void DentRobot::DisabledPeriodic(){
 void DentRobot::AutonomousInit(){
   aut=new Autonomous(SmartDashboard::GetNumber("Auto Sequence"));
   printf("Enabling Auto Sequence %f\n",SmartDashboard::GetNumber("Auto Sequence"));
-  if(aut != NULL){
-    aut->Start();
-  }
+  //if(aut != NULL){
+  //  aut->Start();
+  //}
 }
 void DentRobot::AutonomousPeriodic(){
   printf("Running auto.\n");