From 42f4fd28ab2263114b81d50074b90f795f709d57 Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 13 Feb 2023 19:10:52 -0500 Subject: [PATCH 1/4] fsdhfj --- .../frc/robot/subsystems/BrasTelescopique.class | Bin 0 -> 411 bytes .../java/main/frc/robot/subsystems/Pince.class | Bin 0 -> 378 bytes .../java/main/frc/robot/subsystems/Pivot.class | Bin 0 -> 378 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 build/classes/java/main/frc/robot/subsystems/BrasTelescopique.class create mode 100644 build/classes/java/main/frc/robot/subsystems/Pince.class create mode 100644 build/classes/java/main/frc/robot/subsystems/Pivot.class diff --git a/build/classes/java/main/frc/robot/subsystems/BrasTelescopique.class b/build/classes/java/main/frc/robot/subsystems/BrasTelescopique.class new file mode 100644 index 0000000000000000000000000000000000000000..602c22e5590e6382398cf84d753ec64f076f495d GIT binary patch literal 411 zcma)2%TB{E5FEE@Q$nEyi4Wj_cnV8gIDj}5iBrU-Rqu}Dimj43*a;P%#R-W6AHYW; zHU%ow6SlPDnVnf#`|R%tD{yAgS}sbGGjhIaUKu6x3#o0Mt0I-- zI`PlGGWke(BhbC3f~p&V_R;Y)L{H#g=CpJ+v6b|{UN1*Z`H9Jl*S4g`nv=n;O&JC; z73RLq6XPZ-$ynKqtybAoIcoTi7*r4B1rFnXO}`T8mBx`xNee_{TRUy;sF}XE{*&{$ zdQ#X&$a`o`3!>Qs*9~TpQ80E+ULjtV?TBmB1~&Nu{ci)~7BhkERrqwtSz8Yd{{+P< JIAD7V!!M6_S?B-& literal 0 HcmV?d00001 diff --git a/build/classes/java/main/frc/robot/subsystems/Pince.class b/build/classes/java/main/frc/robot/subsystems/Pince.class new file mode 100644 index 0000000000000000000000000000000000000000..f1b877ddda0ed9f846f36959c4544d4d166a715f GIT binary patch literal 378 zcmZ`!O-lnY6r8u+cI#Sg^(bDv`Go;59x5IbJS`$rde3H4OzCb)va9&BJP98B0sbiQ zWz`~r3B1Y7n|a~Af4sf{IKx(o2%QA+0A2J5$GT|54KO&FQBf1b?cgTx*ZUNf8s z6c**W#!N60WB2d{^xU>nuAvRA^92T92F49$gw0j>sO7Bv4UT>VX%!r@J;LY{4a!U- literal 0 HcmV?d00001 diff --git a/build/classes/java/main/frc/robot/subsystems/Pivot.class b/build/classes/java/main/frc/robot/subsystems/Pivot.class new file mode 100644 index 0000000000000000000000000000000000000000..7316aa8240388988cd1d72694097ca9d2d4a90a3 GIT binary patch literal 378 zcmZ`!O-lnY6r8u+cI#Sg^(bDv`Go;59uyA>o)!@*y=Qk*OxbNplCAi&JP98B0sbiQ zWz`~r3B1Y7n|a~Af4sf{IKx(o2%QA+0A2J5$Es|^<3fw6w$6uFrSsXTC`?_;c`3$C z?w*`i^_6sr(7Vuc?Jo(P{eww@K4E8S3t>%eyl_8WC+_spctU(_N=^+kJy*9)ohy4U z^NN-2%oMVkNUHT zfx@C(*O&=LV(cEifS%iS$~Clsb-uvh%fPt7jIg;1AGMsdzroS3AgzK!wnrF!0$yKC Ai~s-t literal 0 HcmV?d00001 From 862c449dc858976bbae31240948ac4bee9e620fd Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 13 Feb 2023 19:14:01 -0500 Subject: [PATCH 2/4] 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~Dn1PcymF96ouG{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%RP=f{(ckV*+kA zoX$owZiHN8S5tGq1T&FJ_=glDl%8|R?F#}IwjUi4D0WrM%5a@PeXhq#t(9Jbo22mW zP-V~2$K#5oQXJ?$^7_y$t(KiS}gOOiL}h= zeCfW|Kb4k#3|LlOfJIn!!lc;=ViX9ow-tu6IqYOzS?_Vl-lXG@=>v+5MxfbK5fw*N^UQW+(T=#mQ+j`S;~jiJeU<8n?epw_ z^?6%nA>l6I6Tp9>0Ulh063#p*J6v<*!{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)(Jy3YoKN@jCMW delta 244 zcmey)(aOPf>ff$?3=9nB3|bqxwlLPSGsrM9@Mk5KCFu=P6Z7)& zOB9k)6<|8KxEQ1v6nGfe859{AL^XU676q3SW#*+bTWf}G4q)PBv^HU2W?%$5jB7W8 zbfl2%b_V(VKpqo=D3D|W%cwAj0ogndRSe<`5| 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); } } From 3bd850a25e44577742e988cb3a8be5eb081cfc6f Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 13 Feb 2023 19:19:52 -0500 Subject: [PATCH 3/4] sdfgh --- .../frc/robot/subsystems/BasePilotable.class | Bin 2723 -> 3529 bytes .../frc/robot/subsystems/BasePilotable.java | 13 +++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/main/frc/robot/subsystems/BasePilotable.class b/bin/main/frc/robot/subsystems/BasePilotable.class index 62da180ab92df5046f4731453b0ea05b49873fdd..96315e44e0c344eeb149130e8f604a849648fba6 100644 GIT binary patch literal 3529 zcmbVO=~vWN6#oT~VTQOA#ocNZalj>2D2Q0A42zr&NWOPdNpS?P)*sqyA4l{kL^~B0FQses+&7Pc8t+XKK?Gmc}!=q|e8>6VKI*y?` zdMLa!+~!^{3Hfcwq8=%ewr4w_K%p=MRXR8y{EsZ-|^k=G+f2L^dImU7gITs-w9 zOm*5>=6cXJb;~x=A}hXB&eN(<-BYbmljh3f4V@Ay5_VdTLc&@Z%dsMc_1GA}1_>KP zvP(E4V-sp62xUhCWy_O>r60>qrgZ0oD7J)}q^+sukm?v>A2KVvF~gNmm%KY%=(^CK zF+6QdcvUB3JL&^wzhL?ibh8Ta&d%P3ArV7^jHOr>!%pmuV3&m5#cNxl95VJm5ioKz zHLd#q2o zFqtKgE8`#@XLT8Dm!+{9j)ZOThTFhCpqn%~rH6;wtMLSmL~vNb=EZ%n=%|biQLbuQ z=(k-%_${*4DIK{9f95sf!^cUDaX&ypp1u56U9lKih%iTEMBTx;aoSQnps`O(->yL zC%SECT6I{HUH8-sfpmKeXYgzU&k%<9VpGO*c%Je5Sy1BlV<`ZoDq|&TatY|xok=F( zB+@eUAdCThN_WJxt2}5}hIc52a*W9sK{ASQm=R1!SXpQo&LIIb&lMPJj>1AF0-Io8 zjDiKzF=QD5Q?#yDs?E(cKi@DG&dh}Bf`DYULmWsTnj$Z#N7{}+L z>!{}3a(a&VeC_mVxMvl`;?gQ zDG}jQUU8&l;=1-J=crFPWk>~lR-u;9)!gmlIf=BY@eiz-!@A%6lMnM*>GL;WGuLu( z23zQt82VfD@=c+9G?3qRWwC{_8j-VVavnZliJ2 zmD`MR)05k1tI%r~f~u!8Ks`Src3>Updc^sx=dJ-wq|KzQq=l@t<%50_$uMY_t}b+F z*>&`l<5cKTVJBQF?1WF@u8^bEj1}0$lJCYwexNi$!G7kYm;+Dc9q0+mR!fruGdMAa z(_EbmRt4qD{FLrvqML}B<^@V?^HHTrDb?~y#cHwA7AkF}()~r1@@@-KC2i->7pc10 zIFHfBztA>317il0^KfU;5;CT8j6}#dmt%B=j0-tN4;dGS8Ei|%-*|broU5+EdAvG{ zOSw0R{F|QO&1JsXDP%75cWEAP%_2_L`r&!JJBu}3o}pLo&EO;c&*PI>3>0|RW^m2t zofX0rbNHf=iWcGsI6!!cj;tkaRx>GUa1?8iBEBvXUsth#^Jyb~1O4oB A>i_@% delta 1289 zcmZuxNmCP15dJ2U%w#5$D3A~ci-4?QGlW$U14Ig3*ahRxCPqktCW;H1gEy-zwcgF6 z`~Za_q|m~f2mJ-y)F0uMvR^VuEX$h8bbtL`_xt+mH~Chw=}^BPe)Hu_m!X?7>MkCU!`@=#z1p zy%ek6XOJ(zLWIU6(O@hX33D3#8e~Y^8`NM^Q}h3m4$m+!H# zyk>P`oF~LIJitTt(L80`5J<;Xv4pisX69Bj6_u1M(umA#Sm}?;gz}J2?*fXo!9X6Z zxp!dSMd1hX4Je_vl#07hO1_rfgEEv85^yY=@742_bbiIFe+!iTRY0Kv@pJ_%s;LfV zFvBNFR;3Cxbq%|y+ai?apppggSLkwZ9&Q-O#l54A$*nrquQG;T#F4WRfjXHX~ zWZTJhkbd*!6kh`|`mH1pNuY*8&Oj3P6R`83aTn2C zvn{X?XAcdu01ntmdI!l}h++C)nMV;eXeh5~DDP Date: Mon, 13 Feb 2023 19:26:19 -0500 Subject: [PATCH 4/4] nj --- src/main/java/frc/robot/subsystems/BasePilotable.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/BasePilotable.java b/src/main/java/frc/robot/subsystems/BasePilotable.java index b5bfcb2..220799e 100644 --- a/src/main/java/frc/robot/subsystems/BasePilotable.java +++ b/src/main/java/frc/robot/subsystems/BasePilotable.java @@ -24,10 +24,12 @@ public class BasePilotable extends SubsystemBase { final MotorControllerGroup droit = new MotorControllerGroup(avantdroit, arrieredroit); final MotorControllerGroup gauche = new MotorControllerGroup(avantgauche, arrieregauche); final DifferentialDrive drive = new DifferentialDrive(gauche, droit); - private AHRS gyroscope = new AHRS();public double getangle() {return gyroscope.getAngle();} + //piston private DoubleSolenoid brakedroit = new DoubleSolenoid(PneumaticsModuleType.CTREPCM,Constants.brakedroit, Constants.brakedroit); private DoubleSolenoid brakegauche = new DoubleSolenoid(PneumaticsModuleType.CTREPCM,Constants.brakegauche, Constants.brakegauche); - public double getpitch() { + //gyro + private AHRS gyroscope = new AHRS();public double getangle() {return gyroscope.getAngle();} + public double getpitch() { return gyroscope.getPitch(); }