Skip to content

Commit 0e29146

Browse files
Update Robot.cpp
1 parent 75675bd commit 0e29146

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

main/cpp/Robot.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ void Robot::RobotPeriodic() {
7474
} else {
7575
Drive.ArcadeDrive(flightStick.GetRawAxis(1) * -.7, flightStick.GetRawAxis(0) * .7);
7676
}
77-
77+
/*Forklift Auto
78+
if (fightStick.GetRawButton(X) == 1) { //change here lmao loser
79+
for(int i; i > time.Get(10)
80+
} else {
81+
} */
7882

7983
//timer.HasPeriodPassed(5)
8084

@@ -143,11 +147,14 @@ void Robot::RobotPeriodic() {
143147
}*/
144148

145149
//Ball Intake
146-
if (fightStick.GetRawButton(1) == 1) {
150+
if((fightStick.GetRawButton(1) == 1) && (fightStick.GetRawButton(X) == 1)) {//determine what x is
151+
m_leftIntake.Set(-1); //if inttake is fast, switch right and left intake with each other
152+
m_rightIntake.Set(1);
153+
} else if (fightStick.GetRawButton(1) == 1) {
147154
m_leftIntake.Set(.5);//+
148-
m_rightIntake.Set(-1 * .5);
155+
m_rightIntake.Set(-.5);
149156
} else if (fightStick.GetRawButton(3) == 1) {
150-
m_leftIntake.Set(-1 * .5);
157+
m_leftIntake.Set(-.5);
151158
m_rightIntake.Set(.5);
152159
} else {
153160
m_leftIntake.Set(0);

0 commit comments

Comments
 (0)