team2059/zaphod
2
0
Fork 0
mirror of https://github.com/team2059/Zaphod synced 2025-01-07 22:14:14 -05:00
Code Issues Releases Wiki Activity

Removed unused variables (multiplier) and cleaned up the variable-declaration area of the code

Browse Source
This commit is contained in:
Adam Long 2014-03-19 18:39:15 -04:00
parent 88a51913b7
commit 3fa5c4bcc0
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MyRobot.cpp
View File

@ -3,22 +3,19 @@
#include "SmartDashboard/SmartDashboard.h" #include "SmartDashboard/SmartDashboard.h"
#include <iostream> #include <iostream>
#include <math.h> #include <math.h>
#include <vector>
#include <sstream> #include <sstream>
//}}} //}}}
class RobotDemo : public SimpleRobot class RobotDemo : public SimpleRobot
{ {
//Declarations{{{ //Declarations{{{
RobotDrive myRobot; RobotDrive myRobot;
float potVal, multiplier, throttle;
bool collectorExtended, shooting, compressing, allowCompressing; bool collectorExtended, shooting, compressing, allowCompressing;
float upLimit; float upLimit, throttle;
Joystick Rstick, Lstick; Joystick Rstick, Lstick;
Solenoid collectorSole1, collectorSole2; Solenoid collectorSole1, collectorSole2;
Compressor compressor; Compressor compressor;
Jaguar Left1, Left2, Left3, Right1, Right2, Right3, RightArmMotor1, RightArmMotor2, LeftArmMotor1, LeftArmMotor2, CollectorMotor1; Jaguar Left1, Left2, Left3, Right1, Right2, Right3, RightArmMotor1, RightArmMotor2, LeftArmMotor1, LeftArmMotor2, CollectorMotor1;
AnalogChannel armPot; AnalogChannel armPot, BallSonicLeft, BallSonicRight, WallSonicLeft, WallSonicRight;
AnalogChannel BallSonicLeft, BallSonicRight, WallSonicLeft, WallSonicRight;
DigitalOutput BallLeft, BallRight, WallLeft, WallRight; DigitalOutput BallLeft, BallRight, WallLeft, WallRight;
//}}} //}}}
public: public:
@ -64,7 +61,6 @@ public:
//RobotInit{{{ //RobotInit{{{
void RobotInit() { void RobotInit() {
DashboardSetup(); DashboardSetup();
multiplier = 1.0f;
upLimit = 130.0; upLimit = 130.0;
compressor.Start(); compressor.Start();
shooting = false; shooting = false;