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

2023-02-13 18:45:08 -05:00
parent ec28a44e5d 0c37463a91
commit 0b3f935979
133 changed files with 29 additions and 166 deletions
--- a/build/classes/java/main/frc/robot/Constants.class
+++ b/build/classes/java/main/frc/robot/Constants.class
--- a/build/classes/java/main/frc/robot/Main.class
+++ b/build/classes/java/main/frc/robot/Main.class
--- a/build/classes/java/main/frc/robot/Robot.class
+++ b/build/classes/java/main/frc/robot/Robot.class
--- a/build/classes/java/main/frc/robot/RobotContainer.class
+++ b/build/classes/java/main/frc/robot/RobotContainer.class
--- a/build/classes/java/main/frc/robot/commands/StablePlateform.class
+++ b/build/classes/java/main/frc/robot/commands/StablePlateform.class
--- a/build/classes/java/main/frc/robot/commands/bras/FermePince.class
+++ b/build/classes/java/main/frc/robot/commands/bras/FermePince.class
--- a/build/classes/java/main/frc/robot/commands/bras/OuvrePince.class
+++ b/build/classes/java/main/frc/robot/commands/bras/OuvrePince.class
--- a/build/classes/java/main/frc/robot/commands/bras/PivoteBrasBas.class
+++ b/build/classes/java/main/frc/robot/commands/bras/PivoteBrasBas.class
--- a/build/classes/java/main/frc/robot/commands/bras/PivoteBrasHaut.class
+++ b/build/classes/java/main/frc/robot/commands/bras/PivoteBrasHaut.class
--- a/build/classes/java/main/frc/robot/commands/bras/PivoteBrasMilieux.class
+++ b/build/classes/java/main/frc/robot/commands/bras/PivoteBrasMilieux.class
--- a/build/classes/java/main/frc/robot/commands/limelight.class
+++ b/build/classes/java/main/frc/robot/commands/limelight.class
--- a/build/classes/java/main/frc/robot/subsystems/BasePilotable.class
+++ b/build/classes/java/main/frc/robot/subsystems/BasePilotable.class
--- a/build/classes/java/main/frc/robot/subsystems/Limelight.class
+++ b/build/classes/java/main/frc/robot/subsystems/Limelight.class
--- a/build/classes/java/main/frc/robot/subsystems/bras/BrasTelescopique.class
+++ b/build/classes/java/main/frc/robot/subsystems/bras/BrasTelescopique.class
--- a/build/classes/java/main/frc/robot/subsystems/bras/Pince.class
+++ b/build/classes/java/main/frc/robot/subsystems/bras/Pince.class
--- a/build/classes/java/main/frc/robot/subsystems/bras/Pivot.class
+++ b/build/classes/java/main/frc/robot/subsystems/bras/Pivot.class
--- a/build/jni/release/CTRE_PhoenixCCISim.dll
+++ b/build/jni/release/CTRE_PhoenixCCISim.dll
--- a/build/jni/release/CTRE_PhoenixTools_Sim.dll
+++ b/build/jni/release/CTRE_PhoenixTools_Sim.dll
--- a/build/jni/release/CTRE_SimCANCoder.dll
+++ b/build/jni/release/CTRE_SimCANCoder.dll
--- a/build/jni/release/CTRE_SimPigeonIMU.dll
+++ b/build/jni/release/CTRE_SimPigeonIMU.dll
--- a/build/jni/release/CTRE_SimProCANcoder.dll
+++ b/build/jni/release/CTRE_SimProCANcoder.dll
--- a/build/jni/release/CTRE_SimProPigeon2.dll
+++ b/build/jni/release/CTRE_SimProPigeon2.dll
--- a/build/jni/release/CTRE_SimProTalonFX.dll
+++ b/build/jni/release/CTRE_SimProTalonFX.dll
--- a/build/jni/release/CTRE_SimTalonFX.dll
+++ b/build/jni/release/CTRE_SimTalonFX.dll
--- a/build/jni/release/CTRE_SimTalonSRX.dll
+++ b/build/jni/release/CTRE_SimTalonSRX.dll
--- a/build/jni/release/CTRE_SimVictorSPX.dll
+++ b/build/jni/release/CTRE_SimVictorSPX.dll
--- a/build/jni/release/REVLibDriver.dll
+++ b/build/jni/release/REVLibDriver.dll
--- a/build/jni/release/REVLibDriver.pdb
+++ b/build/jni/release/REVLibDriver.pdb
--- a/build/jni/release/apriltag.dll
+++ b/build/jni/release/apriltag.dll
--- a/build/jni/release/apriltag.pdb
+++ b/build/jni/release/apriltag.pdb
--- a/build/jni/release/apriltagjni.dll
+++ b/build/jni/release/apriltagjni.dll
--- a/build/jni/release/apriltagjni.pdb
+++ b/build/jni/release/apriltagjni.pdb
--- a/build/jni/release/cscore.dll
+++ b/build/jni/release/cscore.dll
--- a/build/jni/release/cscore.pdb
+++ b/build/jni/release/cscore.pdb
--- a/build/jni/release/cscorejni.dll
+++ b/build/jni/release/cscorejni.dll
--- a/build/jni/release/cscorejni.pdb
+++ b/build/jni/release/cscorejni.pdb
--- a/build/jni/release/halsim_ds_socket.dll
+++ b/build/jni/release/halsim_ds_socket.dll
--- a/build/jni/release/halsim_ds_socket.pdb
+++ b/build/jni/release/halsim_ds_socket.pdb
--- a/build/jni/release/halsim_gui.dll
+++ b/build/jni/release/halsim_gui.dll
--- a/build/jni/release/halsim_gui.pdb
+++ b/build/jni/release/halsim_gui.pdb
--- a/build/jni/release/ntcore.dll
+++ b/build/jni/release/ntcore.dll
--- a/build/jni/release/ntcore.pdb
+++ b/build/jni/release/ntcore.pdb
--- a/build/jni/release/ntcorejni.dll
+++ b/build/jni/release/ntcorejni.dll
--- a/build/jni/release/ntcorejni.pdb
+++ b/build/jni/release/ntcorejni.pdb
--- a/build/jni/release/opencv_aruco460.dll
+++ b/build/jni/release/opencv_aruco460.dll
--- a/build/jni/release/opencv_aruco460.pdb
+++ b/build/jni/release/opencv_aruco460.pdb
--- a/build/jni/release/opencv_calib3d460.dll
+++ b/build/jni/release/opencv_calib3d460.dll
--- a/build/jni/release/opencv_calib3d460.pdb
+++ b/build/jni/release/opencv_calib3d460.pdb
--- a/build/jni/release/opencv_core460.dll
+++ b/build/jni/release/opencv_core460.dll
--- a/build/jni/release/opencv_core460.pdb
+++ b/build/jni/release/opencv_core460.pdb
--- a/build/jni/release/opencv_features2d460.dll
+++ b/build/jni/release/opencv_features2d460.dll
--- a/build/jni/release/opencv_features2d460.pdb
+++ b/build/jni/release/opencv_features2d460.pdb
--- a/build/jni/release/opencv_flann460.dll
+++ b/build/jni/release/opencv_flann460.dll
--- a/build/jni/release/opencv_flann460.pdb
+++ b/build/jni/release/opencv_flann460.pdb
--- a/build/jni/release/opencv_gapi460.dll
+++ b/build/jni/release/opencv_gapi460.dll
--- a/build/jni/release/opencv_gapi460.pdb
+++ b/build/jni/release/opencv_gapi460.pdb
--- a/build/jni/release/opencv_highgui460.dll
+++ b/build/jni/release/opencv_highgui460.dll
--- a/build/jni/release/opencv_highgui460.pdb
+++ b/build/jni/release/opencv_highgui460.pdb
--- a/build/jni/release/opencv_imgcodecs460.dll
+++ b/build/jni/release/opencv_imgcodecs460.dll
--- a/build/jni/release/opencv_imgcodecs460.pdb
+++ b/build/jni/release/opencv_imgcodecs460.pdb
--- a/build/jni/release/opencv_imgproc460.dll
+++ b/build/jni/release/opencv_imgproc460.dll
--- a/build/jni/release/opencv_imgproc460.pdb
+++ b/build/jni/release/opencv_imgproc460.pdb
--- a/build/jni/release/opencv_java460.dll
+++ b/build/jni/release/opencv_java460.dll
--- a/build/jni/release/opencv_ml460.dll
+++ b/build/jni/release/opencv_ml460.dll
--- a/build/jni/release/opencv_ml460.pdb
+++ b/build/jni/release/opencv_ml460.pdb
--- a/build/jni/release/opencv_objdetect460.dll
+++ b/build/jni/release/opencv_objdetect460.dll
--- a/build/jni/release/opencv_objdetect460.pdb
+++ b/build/jni/release/opencv_objdetect460.pdb
--- a/build/jni/release/opencv_photo460.dll
+++ b/build/jni/release/opencv_photo460.dll
--- a/build/jni/release/opencv_photo460.pdb
+++ b/build/jni/release/opencv_photo460.pdb
--- a/build/jni/release/opencv_stitching460.dll
+++ b/build/jni/release/opencv_stitching460.dll
--- a/build/jni/release/opencv_stitching460.pdb
+++ b/build/jni/release/opencv_stitching460.pdb
--- a/build/jni/release/opencv_video460.dll
+++ b/build/jni/release/opencv_video460.dll
--- a/build/jni/release/opencv_video460.pdb
+++ b/build/jni/release/opencv_video460.pdb
--- a/build/jni/release/opencv_videoio460.dll
+++ b/build/jni/release/opencv_videoio460.dll
--- a/build/jni/release/opencv_videoio460.pdb
+++ b/build/jni/release/opencv_videoio460.pdb
--- a/build/jni/release/wpiHal.dll
+++ b/build/jni/release/wpiHal.dll
--- a/build/jni/release/wpiHal.pdb
+++ b/build/jni/release/wpiHal.pdb
--- a/build/jni/release/wpiHaljni.dll
+++ b/build/jni/release/wpiHaljni.dll
--- a/build/jni/release/wpiHaljni.pdb
+++ b/build/jni/release/wpiHaljni.pdb
--- a/build/jni/release/wpimath.dll
+++ b/build/jni/release/wpimath.dll
--- a/build/jni/release/wpimath.pdb
+++ b/build/jni/release/wpimath.pdb
--- a/build/jni/release/wpimathjni.dll
+++ b/build/jni/release/wpimathjni.dll
--- a/build/jni/release/wpimathjni.pdb
+++ b/build/jni/release/wpimathjni.pdb
--- a/build/jni/release/wpinet.dll
+++ b/build/jni/release/wpinet.dll
--- a/build/jni/release/wpinet.pdb
+++ b/build/jni/release/wpinet.pdb
--- a/build/jni/release/wpinetjni.dll
+++ b/build/jni/release/wpinetjni.dll
--- a/build/jni/release/wpinetjni.pdb
+++ b/build/jni/release/wpinetjni.pdb
--- a/build/jni/release/wpiutil.dll
+++ b/build/jni/release/wpiutil.dll
--- a/build/jni/release/wpiutil.pdb
+++ b/build/jni/release/wpiutil.pdb
--- a/build/jni/release/wpiutiljni.dll
+++ b/build/jni/release/wpiutiljni.dll
--- a/build/jni/release/wpiutiljni.pdb
+++ b/build/jni/release/wpiutiljni.pdb
--- a/build/libs/robot.jar
+++ b/build/libs/robot.jar
--- a/build/tmp/compileJava/previous-compilation-data.bin
+++ b/build/tmp/compileJava/previous-compilation-data.bin
--- a/build/tmp/jar/MANIFEST.MF
+++ b/build/tmp/jar/MANIFEST.MF
@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: frc.robot.Main
+