Skip to content

Commit 75675bd

Browse files
Update Robot.h
1 parent 4e2746c commit 75675bd

File tree

1 file changed

+6
-26
lines changed

1 file changed

+6
-26
lines changed

main/include/Robot.h

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,13 @@ using namespace frc;
3838
using namespace cv;
3939
using namespace cs;
4040

41-
class ImageProcess : public frc::TimedRobot {
42-
void makeGrid(Mat img, int cellSize);
43-
Mat makeGrid(char *fileName, char *result);
44-
void RobotInit();
45-
string getPutTextData(int count);
46-
};
47-
4841
class Robot : public frc::TimedRobot {
49-
double acceleration(double input) {
42+
/*double acceleration (double input) {
5043
double V;
51-
V = input / 2 * sin((((2 * M_PI) / f) * timer.Get() - M_PI_2) + input / 2);
44+
V = input / 2 * sin(((2 * M_PI) / 6) * timer.Get() - M_PI_2) + input / 2;
5245
return V;
53-
}
46+
}*/
47+
5448
public:
5549
void RobotInit() override;
5650
void RobotPeriodic() override;
@@ -61,23 +55,9 @@ class Robot : public frc::TimedRobot {
6155
void TestPeriodic() override;
6256

6357
private:
64-
static constexpr double turningSpeedFast = .7;
65-
static constexpr double turningSpeedSlow = .5;
66-
static constexpr double speedFast = 1;
67-
static constexpr double speedNormal = .7;
68-
static constexpr double speedSlow = .5;
69-
static constexpr double stall = -.2;
70-
static constexpr double upSpeedNormal = -.4;
71-
static constexpr double upSpeedFast = -.5;
72-
static constexpr double downSpeedNormal = -.04;
73-
static constexpr double downSpeedFast = -.03;
74-
static constexpr double flywheelIntake = .5;
75-
static constexpr double flywheelOutake = .5;
76-
static constexpr double f = 10;//Frequancy for acceleration
77-
//Analog PI (PWM)
7858
AnalogInput pi{0};
79-
Joystick fightStick{1};
80-
Joystick flightStick{2};
59+
Joystick fightStick{2};
60+
Joystick flightStick{1};
8161
Compressor compressor;
8262
Timer timer;
8363
PWMVictorSPX m_frontLeft{0};

0 commit comments

Comments
 (0)