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

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

Browse Source
This commit is contained in:
Olivier Dubois
2022-11-14 19:17:59 -05:00
parent 4708c8526b 8da918a7d2
commit 5afe54c3b6
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,8 @@
package frc.robot; package frc.robot;
/** /**
* The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean
* constants. This class should not be used for any other purpose. All constants should be declared * constants. This class should not be used for any other purpose. All constants should be declared
@@ -12,9 +14,16 @@ package frc.robot;
* <p>It is advised to statically import this class (or one of its inner classes) wherever the * <p>It is advised to statically import this class (or one of its inner classes) wherever the
* constants are needed, to reduce verbosity. * constants are needed, to reduce verbosity.
*/ */
<<<<<<< HEAD
public final class Constants {} public final class Constants {}
private static final int MoteurAvantGauche = (0); private static final int MoteurAvantGauche = (0);
private static final int MoteurAvantDroit = (0); private static final int MoteurAvantDroit = (0);
private static final int MoteurArriereDroit = (0); private static final int MoteurArriereDroit = (0);
private static final int MoteurArriereDroit = (0); private static final int MoteurArriereDroit = (0);
=======
public final class Constants {
public static final int pistonQuiShakef = 0;
public static final int pistonQuiShakeb = 1;
}
>>>>>>> 8da918a7d2ab52ff5442835f9f446fc07fe2d1bd

2
src/main/java/frc/robot/subsystems/BasePilotable.java
View File

@@ -20,7 +20,7 @@ private WPI_TalonSRX arriereGauche = new WPI_TalonSRX(Constants.MoteurArriereGau
private WPI_TalonSRX arriereDroit = new WPI_TalonSRX(Constants.MoteurArriereDroit); private WPI_TalonSRX arriereDroit = new WPI_TalonSRX(Constants.MoteurArriereDroit);
private MecanumDrive mecanum = new MecanumDrive(avntGauche, arriereGauche, avantDroit, arriereDroit); private MecanumDrive mecanum = new MecanumDrive(avantGauche, arriereGauche, avantDroit, arriereDroit);
private void Drive(double y, double x, double rot){ private void Drive(double y, double x, double rot){
drive.driveCarthesian(y, x, rot, 0) drive.driveCarthesian(y, x, rot, 0)