From 14870e51a3229da800c3fbf87b39443ee29f5f49 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Wed, 15 Feb 2023 19:40:02 -0500 Subject: [PATCH 1/4] ghmj n --- .gitlab-ci.yml | 14 -------------- .../frc/robot/subsystems/BasePilotable.class | Bin 3529 -> 1904 bytes src/main/java/frc/robot/Robot.java | 4 +++- .../java/frc/robot/subsystems/Gratte.java | 8 +++++--- .../java/frc/robot/subsystems/Limelight.java | 5 ++++- 5 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index b325967..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,14 +0,0 @@ -default: - image: gradle:jdk11 - tags: - - robot - -stages: # List of stages for jobs, and their order of execution - - build - -build-job: # This job runs in the build stage, which runs first. - stage: build - script: - - chmod +x gradlew - - ./gradlew build - diff --git a/bin/main/frc/robot/subsystems/BasePilotable.class b/bin/main/frc/robot/subsystems/BasePilotable.class index a1ecf8d0e5dc7b0fe12ec67cf110faf2ead1688a..3edf4ca76811c71583152632750a183fb4d896a2 100644 GIT binary patch literal 1904 zcmeHHZBNud5S~R|?#dxAiui^UL^u>~6Ez`n#$O{n)^OC@9webh7X_N@tTWiNyqai|m5C;xdN2w+V%rvCS{9~p>>gSikrXw_g z<;K5NmG=}0<93ihwO)Ul7Ako{W1}us7&+vcqkOPm3|Kqqz~9A*!cf=Q<0{}KctptO z%e&RsZuzLgZ4pFL85`NvGA-6n8)-SCZI^|iG`7R--rTJ6Wl`Hmo7qX;|NpmL9Sk%F z+;+s3ke+aHrA-+tm+y&8Tz~z5YN;e)5l{;F=dxf5Mqm_AQ!tj>Qf|w+wO~ApS8_W6 zSJ5AWNz6&@bZ%$h8v12Kz7Dhay@B3StU}OQ-(c?J%&jkQ=SP;afZx$9vH&)oE8SPf zYY9C9_Xj|*3lSz@8F6|X(hmD`ST00(FaU?uLWC7qy}*H7%3-4rp*jG?(idc)z0CGAg1;nCV%wz%tLNZMarZ{%m z_7pdlb}zV|KJF^VR9EjYOxsh_rXE3+gq?aOr%YxIWyo+`PpnKMJ-S!X?D28c$|!w# zVIe9ZrcS7qmvL;vldwL;Q;MTc_;w75(#Sd$yz5mgm@}(k(WLU}Ne|r(@@`G*~@HnK40|N*QGtho6J_#$%VtZr&_}%k5RPy~z|P0i?j zg(NJX_J#pkIp3Gn^^63GNsC_WC8j;YwzxO=>!M#7!)0nUKbZ$)EI@S(EohD4P?*dz z$dz#zPZ9~NOuMDA8jgf5@rJv=-m9B5IiZJ#T5IqWjz-WXVZ;2sn0HjhF;T7>TIjJ| zL-;MSm6Q=dwODn?SQxC1%ZQ@7x~-PI&3}x)S9f(bAJH-(ES`{Y5PCVZ^J zb|zJaHQD(#&8zTNAMhB_#ifAynq)Ozn=vq{xFsTP^vN>Lv20*9lA5l1e`)f zh8~2`t54{Tn0D2N4a@M3#88P58AC`#F$yz+F$v3x4Z}GkfabXZV@*+5$VOlj?DJ7D zXF8_r$rP=aTm4Dae<8~xz61g-Hg?R(xg)0TvMrUnFn3QC%w!8Z;b>06zIfL|N{j4_ zVp4#RQH$IQC|#oaPUi?-ld$*Ug=4scH$+HpN-)b6`(D;t&z3>R zJ%s|Kyd@)s8qtt%%aBnc2HCs9nfD}&J(4qz>dObX8o`HUyRyg9bK@LFn%iw>a-8ly zpgzJi36Vs9Z+lOoyL?lY5^fa$_(Y6^CefasiJ(81u%}$mC3ST9x4 zn48Z0Mq7?9yBJhGodM!}Ml@hG=^8ZBxj4hwfqkS+qz6cgS!*c-{WMZx&@Nq_>(Jtx z=&r=+(4*o`xK!K;pTb=+M=KaB_%K-v1?!lPM&{ulvr)={X9^Bn%O-%HDVy1bH(z-%a>2gZ7f>N=Xuk;|5wovJzl1h2E1*wv@ap;Rw-EN%4 zaN}QS8JvPKh4ERq(`XJE6M04=WSq}4+C#?0JfoA0OM?uyx$1AcI#|h7d*3WxpT_0< zmqg)9XYl0;zw8h)SNOX;i+83GC+jR-d4CEY^ZzV9oknkwcYO-iecn0p)(p<#%W13> z!c{Z)s+fvq;s|`+RrwuRM78Hg(GuPcDqoA w@A4@l0!5GVS2Pqfb8?QL6be@0dmgR85BQOEDOVPL!Y^&B`2;zO8*Quq2V@CzF8}}l diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java index b68462c..50229b4 100644 --- a/src/main/java/frc/robot/Robot.java +++ b/src/main/java/frc/robot/Robot.java @@ -4,7 +4,10 @@ package frc.robot; + import edu.wpi.first.wpilibj.TimedRobot; +import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; + import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.CommandScheduler; @@ -35,7 +38,6 @@ public class Robot extends TimedRobot { @Override public void autonomousInit() { m_autonomousCommand = m_robotContainer.getAutonomousCommand(); - if (m_autonomousCommand != null) { m_autonomousCommand.schedule(); } diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java index e7e1cb6..72b98ba 100644 --- a/src/main/java/frc/robot/subsystems/Gratte.java +++ b/src/main/java/frc/robot/subsystems/Gratte.java @@ -12,8 +12,7 @@ import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; import edu.wpi.first.wpilibj.DigitalInput; - - +import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import frc.robot.Constants; @@ -51,6 +50,9 @@ public class Gratte extends SubsystemBase { } @Override public void periodic() { - // This method will be called once per scheduler run + Shuffleboard.getTab("SmartDashBoard") .add("limithd",0.1); + Shuffleboard.getTab("SmartDashBoard") .add("limitbd",0.1); + Shuffleboard.getTab("SmartDashBoard") .add("limithg",0.1); + Shuffleboard.getTab("SmartDashBoard") .add("limitbg",0.1); } } diff --git a/src/main/java/frc/robot/subsystems/Limelight.java b/src/main/java/frc/robot/subsystems/Limelight.java index befd637..d97c1ac 100644 --- a/src/main/java/frc/robot/subsystems/Limelight.java +++ b/src/main/java/frc/robot/subsystems/Limelight.java @@ -4,6 +4,8 @@ package frc.robot.subsystems; +import edu.wpi.first.cameraserver.CameraServer; +import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import edu.wpi.first.wpilibj2.command.SubsystemBase; public class Limelight extends SubsystemBase { @@ -12,6 +14,7 @@ public class Limelight extends SubsystemBase { @Override public void periodic() { - // This method will be called once per scheduler run + CameraServer.startAutomaticCapture(); + Shuffleboard.getTab("SmartDashBoard") .add("limelight",0.1); } } From b4d38706eeaa9fbcb6495434c8bab5caba8dd6b4 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Wed, 15 Feb 2023 19:40:33 -0500 Subject: [PATCH 2/4] fjfhmgn --- .../frc/robot/subsystems/BasePilotable.class | Bin 1904 -> 3506 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bin/main/frc/robot/subsystems/BasePilotable.class b/bin/main/frc/robot/subsystems/BasePilotable.class index 3edf4ca76811c71583152632750a183fb4d896a2..43a16c10aa72b895bd35bb0cd0e7ba9c0e14b90a 100644 GIT binary patch literal 3506 zcmbVO`BxKH6#j-SCX7l|RNSkG0hg(uB1J7rKxv~=uvE0RolFK87&7Ub38=M;wR>xA zYxjNm1A59SaBNTeLx0r&si)tY$%2@;c_jC}``+EZd*9sr@6Ue#wBnZ#$`ouJ5r!t5 zgyU&$CgEOiJ#*64x^&msg+Qc6g<{q z*2oAQN_m!U$0Ua;A_<{SAs%xw%-^76n<>Xi%1C{wob~YN1>v}clconjjwbYs zZrOUm)l&M@c}>=)^Vq;3C6|nvo}L=Dd9^&+7*kNu?Ig`G6s%RT0xKg}hYcaDSFm0t zyM!VY8&Ml5>kO1Fk6S78L}oH!ic_-K3Rc7&L$`-?Vaa`#S>cUYu7djbz2TB|Hf?#v znDnY%#db6VM*AhxkDymUWi%FR9Fie4s#uC;5$we75OyipUA(jJc1RQnLrWH&g=Zmp zQU;SR6l{w&-hu4_)268@GkdAM8i#Nsgu@CpFK&ZHS5-VAt5Z!2{f=u%e`R($RfJF_ zSKTU>1gjnuVN_Lh)UcKLkI5V`U6Z{=a12R{PpOFGIF*r`Q>I``G*-mno}svv=n=vZ ztX-r_0{diUO86P-SFs#5VGQ6@2!jfmikIegq}LDWcE(ik42GESiC#xc>w>k|bzglF zNVi9D8fQWnChG3Tri!z8j`90h(4r4wDFET~Djq>iE&;u!m}CM5psPp(VGNj4rjWy} z>X4PPydx2mgFzbT3u6>k2t@YELVs}VNT7MH#Mn52$ZIxIAxskBi;=KkAjX~PI4#-r z{_r|=Ax#?&(sXR1OJv+J+jQB9+8wyNs|sfG0EBdwvMtfR2b7i>8bw9|aa^vZB@q49 z1qsCQ5MEZ$TD(m69LOQOqM-S~g(J9#*JMbqE3iuy{BG9U&z3;RU4;U)yrCk3YT1-; zs!&lahu7QEnRgUSJd`sJ>&tuiAcXfzc4mLd%uI418SZf>nc+b90rerSDhPF-8tCco z=9DPan8k$KB>=9;u`n)M^b;BMrwaC#3c9F{zP!~Ilol#6}}FpR$q$k z=E)IW5k1o=2T9r#mXov$w!)y35r)}o`484@Un_gY`8C0>h`vW?uz$|9F@$VN~jUkk2k_>_q7DW5gcGC4zi$_e9B zzSyJ^KC4j6-__hT^PWPwr0EZ=nM2)g{>@GNt@8Psu$gN$xPvY9OAh|6dHI&Cd^nKb zc6G6WEejNc^9q(?2h~Ui;ta2nG(rW@9gTBn`klKnNEafcKs{aF?rYhSO-bN}JlF7; z?^*D@=9>|da? zHXqdsrIfyyS1MPFm9|ppK`L!4s+6x(7-)fpivgt1z7@on%3?}CB(kxoC z3@^v%$TFsKjIJ!>e2x(#KdHKtFySAJL$-u#DbG6JlQE_uJG^j zJl>i`l&sTq<=q*4#Q*d7coruMyz4W#?(@!(w{CbIpU+~A6t0-V7ll+DAdY}`!gD3T zx{64uC3;rl7}oIFUyDn`*fp%juPp668{uDmTHVCq1u46gufsRFl<_H$oyos~p`eAk k7YOoe%x~c`e9Nn4_zvHbuHeeX5BRC0jvpVV@pDJr|6h7<(*OVf literal 1904 zcmeHHZBNud5S~R|?#dxAiui^UL^u>~6Ez`n#$O{n)^OC@9webh7X_N@tTWiNyqai|m5C;xdN2w+V%rvCS{9~p>>gSikrXw_g z<;K5NmG=}0<93ihwO)Ul7Ako{W1}us7&+vcqkOPm3|Kqqz~9A*!cf=Q<0{}KctptO z%e&RsZuzLgZ4pFL85`NvGA-6n8)-SCZI^|iG`7R--rTJ6Wl`Hmo7qX;|NpmL9Sk%F z+;+s3ke+aHrA-+tm+y&8Tz~z5YN;e)5l{;F=dxf5Mqm_AQ!tj>Qf|w+wO~ApS8_W6 zSJ5AWNz6&@bZ%$h8v12Kz7Dhay@B3StU}OQ-(c?J%&jkQ=SP;afZx$9vH&)oE8SPf zYY9C9_Xj|*3lSz@8F6|X(hmD`ST00(FaU?uLWC7qy}*H7%3-4rp*jG Date: Thu, 16 Feb 2023 00:40:57 +0000 Subject: [PATCH 3/4] removed bin again --- .../frc/robot/subsystems/BasePilotable.class | Bin 3506 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/main/frc/robot/subsystems/BasePilotable.class diff --git a/bin/main/frc/robot/subsystems/BasePilotable.class b/bin/main/frc/robot/subsystems/BasePilotable.class deleted file mode 100644 index 43a16c10aa72b895bd35bb0cd0e7ba9c0e14b90a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3506 zcmbVO`BxKH6#j-SCX7l|RNSkG0hg(uB1J7rKxv~=uvE0RolFK87&7Ub38=M;wR>xA zYxjNm1A59SaBNTeLx0r&si)tY$%2@;c_jC}``+EZd*9sr@6Ue#wBnZ#$`ouJ5r!t5 zgyU&$CgEOiJ#*64x^&msg+Qc6g<{q z*2oAQN_m!U$0Ua;A_<{SAs%xw%-^76n<>Xi%1C{wob~YN1>v}clconjjwbYs zZrOUm)l&M@c}>=)^Vq;3C6|nvo}L=Dd9^&+7*kNu?Ig`G6s%RT0xKg}hYcaDSFm0t zyM!VY8&Ml5>kO1Fk6S78L}oH!ic_-K3Rc7&L$`-?Vaa`#S>cUYu7djbz2TB|Hf?#v znDnY%#db6VM*AhxkDymUWi%FR9Fie4s#uC;5$we75OyipUA(jJc1RQnLrWH&g=Zmp zQU;SR6l{w&-hu4_)268@GkdAM8i#Nsgu@CpFK&ZHS5-VAt5Z!2{f=u%e`R($RfJF_ zSKTU>1gjnuVN_Lh)UcKLkI5V`U6Z{=a12R{PpOFGIF*r`Q>I``G*-mno}svv=n=vZ ztX-r_0{diUO86P-SFs#5VGQ6@2!jfmikIegq}LDWcE(ik42GESiC#xc>w>k|bzglF zNVi9D8fQWnChG3Tri!z8j`90h(4r4wDFET~Djq>iE&;u!m}CM5psPp(VGNj4rjWy} z>X4PPydx2mgFzbT3u6>k2t@YELVs}VNT7MH#Mn52$ZIxIAxskBi;=KkAjX~PI4#-r z{_r|=Ax#?&(sXR1OJv+J+jQB9+8wyNs|sfG0EBdwvMtfR2b7i>8bw9|aa^vZB@q49 z1qsCQ5MEZ$TD(m69LOQOqM-S~g(J9#*JMbqE3iuy{BG9U&z3;RU4;U)yrCk3YT1-; zs!&lahu7QEnRgUSJd`sJ>&tuiAcXfzc4mLd%uI418SZf>nc+b90rerSDhPF-8tCco z=9DPan8k$KB>=9;u`n)M^b;BMrwaC#3c9F{zP!~Ilol#6}}FpR$q$k z=E)IW5k1o=2T9r#mXov$w!)y35r)}o`484@Un_gY`8C0>h`vW?uz$|9F@$VN~jUkk2k_>_q7DW5gcGC4zi$_e9B zzSyJ^KC4j6-__hT^PWPwr0EZ=nM2)g{>@GNt@8Psu$gN$xPvY9OAh|6dHI&Cd^nKb zc6G6WEejNc^9q(?2h~Ui;ta2nG(rW@9gTBn`klKnNEafcKs{aF?rYhSO-bN}JlF7; z?^*D@=9>|da? zHXqdsrIfyyS1MPFm9|ppK`L!4s+6x(7-)fpivgt1z7@on%3?}CB(kxoC z3@^v%$TFsKjIJ!>e2x(#KdHKtFySAJL$-u#DbG6JlQE_uJG^j zJl>i`l&sTq<=q*4#Q*d7coruMyz4W#?(@!(w{CbIpU+~A6t0-V7ll+DAdY}`!gD3T zx{64uC3;rl7}oIFUyDn`*fp%juPp668{uDmTHVCq1u46gufsRFl<_H$oyos~p`eAk k7YOoe%x~c`e9Nn4_zvHbuHeeX5BRC0jvpVV@pDJr|6h7<(*OVf From 0fabe373fa779e300b60d8922842be43300ca130 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Wed, 15 Feb 2023 19:52:10 -0500 Subject: [PATCH 4/4] wQA --- src/main/java/frc/robot/commands/Reculer.java | 3 ++- src/main/java/frc/robot/subsystems/Gratte.java | 3 --- src/main/java/frc/robot/subsystems/Limelight.java | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/frc/robot/commands/Reculer.java b/src/main/java/frc/robot/commands/Reculer.java index 6485bd0..7ff9989 100644 --- a/src/main/java/frc/robot/commands/Reculer.java +++ b/src/main/java/frc/robot/commands/Reculer.java @@ -5,6 +5,7 @@ package frc.robot.commands; +import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.CommandBase; import frc.robot.subsystems.BasePilotable; @@ -26,7 +27,7 @@ public class Reculer extends CommandBase { // Called every time the scheduler runs while the command is scheduled. @Override public void execute() { - basePilotable.drive(0.2, 0); + basePilotable.drive(SmartDashboard.getNumber("vitesse auto", -0.3), 0); } // Called once the command ends or is interrupted. diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java index 54192a0..3aa09ac 100644 --- a/src/main/java/frc/robot/subsystems/Gratte.java +++ b/src/main/java/frc/robot/subsystems/Gratte.java @@ -7,10 +7,7 @@ package frc.robot.subsystems; import edu.wpi.first.wpilibj2.command.SubsystemBase; import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; import edu.wpi.first.wpilibj.DigitalInput; -<<<<<<< HEAD import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; -======= ->>>>>>> b20ba544a81d82752f6f8e390de38cbcfdc79f08 import frc.robot.Constants; public class Gratte extends SubsystemBase { diff --git a/src/main/java/frc/robot/subsystems/Limelight.java b/src/main/java/frc/robot/subsystems/Limelight.java index 7e50b91..7e88f9b 100644 --- a/src/main/java/frc/robot/subsystems/Limelight.java +++ b/src/main/java/frc/robot/subsystems/Limelight.java @@ -4,15 +4,12 @@ package frc.robot.subsystems; -<<<<<<< HEAD import edu.wpi.first.cameraserver.CameraServer; import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; -======= import org.photonvision.PhotonCamera; import org.photonvision.common.hardware.VisionLEDMode; import edu.wpi.first.net.PortForwarder; ->>>>>>> b20ba544a81d82752f6f8e390de38cbcfdc79f08 import edu.wpi.first.wpilibj2.command.SubsystemBase;