From 862c449dc858976bbae31240948ac4bee9e620fd Mon Sep 17 00:00:00 2001
From: Antoine PerreaultE <KalcioGx53@hotmail.com>
Date: Mon, 13 Feb 2023 19:14:01 -0500
Subject: [PATCH] tcfnjkm

---
 bin/main/frc/robot/Constants.class         | Bin 1278 -> 970 bytes
 bin/main/frc/robot/commands/Gyro.class     | Bin 1029 -> 1143 bytes
 src/main/java/frc/robot/Constants.java     |  24 +--------------------
 src/main/java/frc/robot/commands/Gyro.java |   2 +-
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/bin/main/frc/robot/Constants.class b/bin/main/frc/robot/Constants.class
index aba154ff745daee0132917871fb62248d26bd27e..e6d79202d4f3acae181d0386b7ad7114d1222c29 100644
GIT binary patch
delta 474
zcmYL_O-{m46opUef4!)vh(D;PsDLP_D5w<#_uvN90g2HGa~8qaMUW0m95`@f*om7U
zp7xs9CcWQ1@4olW>C~UN!DRaJ380DIILI19FMN3Jzw`%f17@jwZ@{{HeSGp^U`=4d
zi778|l{N*QQbFJ=?Fa&;qF_d8Um!{)L0YLIm{qC@=9G?`f_cTdAft3DSWs#R7L_gp
zOG+(47S8C)EN7fBaUQ_Ljo=!&(U18(Owr;pa`e5zoNui0(={WkS`pUm2pdj>E%w{&
zcUkvX52%-^AG#5asMXk?us`G4xfh{1<{>Fu^4p_jz~XDie}hR~Dn1PcymF96o<R$Y
zSfpHHswz{|x!j=h7QKZWyGo7&-O=}-*BWc=)~>uG{J+mhL^IhUI)FAh95is79Mk;;
DCJ-=(

literal 1278
zcmcIkOK%e~5FUq+bT>&8QVNvk5*{j2MJ`B41aW9e5mE#aX)AH`?mCHE$6jo2L=XHf
zB#_|Fk3!5Y&Z7mQT)6o2d>(sdK9Bw5=a+8)@Dv`Fp+I0`prf`{p|b6+lEzYLO&N*=
z8pm`(+k(nr`)zp4B1^zWM%q{_js|&6ppp|qnnoi=ph~soOf%<DbLMopBG`oKSDIRj
z&b5$oW9D`v;l?VNa2YX`PBgkKQUj*PNO?4}DYY!sm`$kZ$uw9cH>RP=f{(ckV*+kA
zoX$owZiHN8S5tGq1T&FJ_=glDl%8|R?F#}IwjUi4D0WrM%5a@PeXhq#t(9Jbo22mW
zP-<qBn6NmA)HvaSTCQY}prV3}&9lJw_R>V~2$K#5oQXJ?$^7_y$t(KiS}gOOiL}h=
zeCfW|Kb4k#3|LlOfJIn!!lc;=ViX9ow<Bh7%*ka3uM~YHr~jqTpQZo%jusMK)MqE)
z61&$1txgLy$uB=wX+OK;Jr)UyjgGBwR@V8pPiMDv1vO?@#izaxTX4GySKtnT&F$X2
z>-tu6IqYOzS?_Vl-lXG@=>v+5MxfbK5fw*N^UQW+(T=#mQ+j`S;~jiJeU<8n?epw_
z^?6%nA>l6I6Tp9>0Ulh063#p*J6v<<IrJS?99A9H9IiX8J8U?-<gn>*!{KFzn>pfF
zgKAvG@fv3F1hXQD{#V#~-@Ne|Zhc3q00EAre5HoD15|%|K@0AoMc_V;1$giaj{0y4

diff --git a/bin/main/frc/robot/commands/Gyro.class b/bin/main/frc/robot/commands/Gyro.class
index 48c1e8d3cb73324f195c75f1de0fb623932d5b15..9bfcf2711f26b9045d29087bf0d148eeee2d3c82 100644
GIT binary patch
delta 328
zcmX|+IZpy{5XFCgHZ04vg~21pBCLumM7+h=NU;_cRvLT6jS?-0A+|R90St*(h^;k|
zP*|v)(Jy3YoK<ipGs&Cx=DIY#jL7Hr^9xXBwG-*8XoM8$5SGHeYTI6n2{H=f&}%m8
z&DxPd%R8=KDM^c%zVUJA+r8hGi!no95j;4ppLq&B@48#gp8hrvzxKt7_)fE0JKnA~
zcB}g*-cuzIR_E8~D4Drg=o0TSo*;YMX2?egCQYr!^dp6T(z$sUki|Y3_et{?bYzgm
zuw)xUauQQ6Ok#<rDUy+gv#c|POO6pyq+@^E8D&i1tV9saN`<9dVy<<etwrZq5TsaS
Osr9avL(3uxu<`>N@jCMW

delta 244
zcmey)(aOPf>ff$?3=9nB3|bqxwlLPSGsrM9@Mk5KCF<uS=B4Yq78T_eaWKd+GPs83
z6{QyE=ai+UC?x0S7G&lmmSpDVDHIgtC*`E(S}AaGCM6b^Wu*pW=H!<o0>u=P6Z7)&
zOB9k)6<|8KxEQ1v6nGfe859{AL^XU676q3SW#*+bTWf}G4q)PBv^HU2W?%$5jB7W8
zbfl2%b_V(VKpqo=D3D|W%cwAj0ogndRSe<`5<ng!gA#-C<ZsLt+$s#JKprE58iV>|
MOBQo>4X|!a05XU;2><{9

diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
index 44ac11c..427cfff 100644
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -20,29 +20,7 @@ public class Constants {
     public static int limitbg = 2;
     public static int limithd = 3;
     public static int limithg = 1;
-    
-
 
     public static int BrasTelescopique = 5;
-
-
-
-
-
-
-<<<<<<< HEAD
-
-
-    public static int actuateur = 4;
-
-    public static int actuateur = 4;
-    // pneumatique
-    public static int pistonpinceouvre = 0;
-    public static int pistonpinceferme = 1;
-    public static int BrasTelescopique = 5;
-    public static int actuateur = 4;
-=======
-    
->>>>>>> 0c37463a91f99a8623a1405743145ad70a140362
-
 }
+  
\ No newline at end of file
diff --git a/src/main/java/frc/robot/commands/Gyro.java b/src/main/java/frc/robot/commands/Gyro.java
index ffc3a22..f2dd5b8 100644
--- a/src/main/java/frc/robot/commands/Gyro.java
+++ b/src/main/java/frc/robot/commands/Gyro.java
@@ -33,7 +33,7 @@ public class Gyro extends CommandBase {
    }
    else
    {
-     basvjePilotable.drive(0, 0, 0); 
+     basePilotable.drive(0, 0, 0); 
    }
 }