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

commit

Browse Source
This commit is contained in:
Olivier Dubois 2023-02-13 18:28:09 -05:00
parent 30277d3523
commit ec28a44e5d
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/frc/robot/Constants.java
View File

@ -5,13 +5,10 @@ public class Constants {
public static int avantgauche = 1; public static int avantgauche = 1;
public static int arrieredroit = 2; public static int arrieredroit = 2;
public static int arrieregauche = 3; public static int arrieregauche = 3;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
public static int leverGratte = 0; public static int leverGratte = 0;
public static int baisserGratte = 1; public static int baisserGratte = 1;
>>>>>>> Gratte
// pneumatique // pneumatique
public static int pistonpinceouvre = 0; public static int pistonpinceouvre = 0;
public static int pistonpinceferme = 1; public static int pistonpinceferme = 1;
@ -22,28 +19,23 @@ public class Constants {
public static int limithg = 1; public static int limithg = 1;
=======
<<<<<<< HEAD
public static int BrasTelescopique = 5; public static int BrasTelescopique = 5;
>>>>>>> a6d29dff41c9186a3dd56354d6416a625159f366
<<<<<<< HEAD
=======
public static int actuateur = 4; public static int actuateur = 4;
>>>>>>> 91d5a71d52bad9fc56b40c68d78207113e16cd21
=======
public static int actuateur = 4; public static int actuateur = 4;
>>>>>>> Gratte
=======
// pneumatique // pneumatique
public static int pistonpinceouvre = 0; public static int pistonpinceouvre = 0;
public static int pistonpinceferme = 1; public static int pistonpinceferme = 1;
public static int BrasTelescopique = 5; public static int BrasTelescopique = 5;
public static int actuateur = 4; public static int actuateur = 4;
>>>>>>> 48259c9fcef533cfc4c76020b5b7862858c0627b
} }

11
src/main/java/frc/robot/subsystems/Gratte.java
View File

@ -4,19 +4,15 @@
package frc.robot.subsystems; package frc.robot.subsystems;
<<<<<<< HEAD
import edu.wpi.first.wpilibj2.command.SubsystemBase; import edu.wpi.first.wpilibj2.command.SubsystemBase;
public class Gratte extends SubsystemBase {
/** Creates a new Gratte. */
public Gratte() {}
=======
import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
import com.fasterxml.jackson.annotation.JacksonInject.Value;
import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj.DigitalInput;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.Constants; import frc.robot.Constants;
public class Gratte extends SubsystemBase { public class Gratte extends SubsystemBase {
@ -46,7 +42,6 @@ public class Gratte extends SubsystemBase {
baisserGratte.set(vitesse); baisserGratte.set(vitesse);
leverGratte.set(vitesse); leverGratte.set(vitesse);
} }
>>>>>>> Gratte
@Override @Override
public void periodic() { public void periodic() {
// This method will be called once per scheduler run // This method will be called once per scheduler run