PLS5618/robot-2023
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://demerso.net/pls5618/2023/robot

Browse Source
This commit is contained in:
Olivier Dubois 2023-03-08 18:34:13 -05:00
commit 6e5539ef1d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/frc/robot/commands/Gyro.java
View File

@ -30,19 +30,16 @@ public class Gyro extends CommandBase {
public void execute() {
if(basePilotable.getpitch()>4)
{
<<<<<<< HEAD
basePilotable.drive(0.3*basePilotable.getpitch()/12, 0);
}
else if(basePilotable.getpitch()<-4)
{
basePilotable.drive(0.3*basePilotable.getpitch()/12, 0);
=======
basePilotable.drive(0.3*basePilotable.getpitch()/15, 0);
}
else if(basePilotable.getpitch()<-4)
{
basePilotable.drive(0.3*basePilotable.getpitch()/15, 0);
>>>>>>> 3d2364b54822fb53a6cd71a0347d11baeef62001
}
else
{