From 7e9e022bee27e18fc8a9772d3712cf30f7b4de1b Mon Sep 17 00:00:00 2001
From: OlivierDubois <odubois02@csbf.qc.ca>
Date: Thu, 22 Feb 2024 19:29:19 -0500
Subject: [PATCH] DASHBOARD FINI baleeuse

---
 src/main/java/frc/robot/RobotContainer.java         | 6 +++---
 src/main/java/frc/robot/subsystem/Accumulateur.java | 4 ++--
 src/main/java/frc/robot/subsystem/Guideur.java      | 4 ++--
 src/main/java/frc/robot/subsystem/Lanceur.java      | 9 ++++-----
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 4e05ed8..d189131 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -75,7 +75,7 @@ public class RobotContainer {
     .withPosition(7,0); 
 
     dashboard.addCamera("USB Camera 0", "USB Camera 0","http://roborio-5618-frc.local:1181/?action=stream")
-    .withSize(4, 4)
+    .withSize(4, 3)
     .withPosition(3, 0);
 
     CameraServer.startAutomaticCapture();
@@ -108,8 +108,8 @@ public class RobotContainer {
     ,grimpeur));
       
       dashboard.add("autochooser",autoChooser)
-      .withSize(2,1)
-      .withPosition(0,1);
+      .withSize(1,1)
+      .withPosition(2,2);
   }
 
   private void configureBindings() {}
diff --git a/src/main/java/frc/robot/subsystem/Accumulateur.java b/src/main/java/frc/robot/subsystem/Accumulateur.java
index c72aecf..e8d0b6b 100644
--- a/src/main/java/frc/robot/subsystem/Accumulateur.java
+++ b/src/main/java/frc/robot/subsystem/Accumulateur.java
@@ -20,7 +20,7 @@ public class Accumulateur extends SubsystemBase {
    private GenericEntry vitesse =
       dashboard.add("vitesseacc", 0.5)
       .withSize(1, 1)
-      .withPosition(2, 2)
+      .withPosition(0, 0)
       .getEntry(); 
   final WPI_TalonSRX Moteuracc2 = new WPI_TalonSRX(Constants.Moteuracc2);
   final WPI_TalonSRX Moteuracc = new WPI_TalonSRX(Constants.Moteuracc);
@@ -34,7 +34,7 @@ public class Accumulateur extends SubsystemBase {
     
     dashboard.addBoolean("limitacc", this::limitswitch)
     .withSize(1, 1)
-    .withPosition(2, 0);
+    .withPosition(0, 1);
   }
   public void Accumuler(double vitesse){
     Moteuracc.set(-vitesse);
diff --git a/src/main/java/frc/robot/subsystem/Guideur.java b/src/main/java/frc/robot/subsystem/Guideur.java
index 4a59907..4b196c1 100644
--- a/src/main/java/frc/robot/subsystem/Guideur.java
+++ b/src/main/java/frc/robot/subsystem/Guideur.java
@@ -23,10 +23,10 @@ public class Guideur extends SubsystemBase {
       public Guideur() {
         dashboard.addBoolean("limitguideurhaut", guideurhaut::get)
         .withSize(1,1)
-        .withPosition(0,0);
+        .withPosition(1,1);
         dashboard.addBoolean("limitguideurbas", guideurbas::get)
         .withSize(1,1)
-        .withPosition(1,0);        
+        .withPosition(2,1);        
       }
       public void guider(double vitesse){
         guideur.set(vitesse);
diff --git a/src/main/java/frc/robot/subsystem/Lanceur.java b/src/main/java/frc/robot/subsystem/Lanceur.java
index c377812..7f488c9 100644
--- a/src/main/java/frc/robot/subsystem/Lanceur.java
+++ b/src/main/java/frc/robot/subsystem/Lanceur.java
@@ -12,7 +12,6 @@ import edu.wpi.first.units.Measure;
 import edu.wpi.first.units.MutableMeasure;
 import edu.wpi.first.units.Velocity;
 import edu.wpi.first.units.Voltage;
-import edu.wpi.first.wpilibj.RobotController;
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
 import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
 import edu.wpi.first.wpilibj2.command.Command;
@@ -29,12 +28,12 @@ public class Lanceur extends SubsystemBase {
    private GenericEntry vitesse =
       dashboard.add("vitesse", 0.8)
       .withSize(1, 1)
-      .withPosition(2,1)
-         .getEntry();
-         private GenericEntry vitesseamp =
+      .withPosition(2,0)
+         .getEntry();         
+          private GenericEntry vitesseamp =
             dashboard.add("vitesseamp", 0.1)
             .withSize(1, 1)
-            .withPosition(2,3)
+            .withPosition(1,0)
               .getEntry();
   public Lanceur() {