Merge branch 'main' of https://git.demerso.net/PLS5618/pratique-2025

networktables.json

@@ -0,0 +1 @@
+[]

simgui-ds.json

@@ -0,0 +1,92 @@
+{
+  "keyboardJoysticks": [
+    {
+      "axisConfig": [
+        {
+          "decKey": 65,
+          "incKey": 68
+        },
+        {
+          "decKey": 87,
+          "incKey": 83
+        },
+        {
+          "decKey": 69,
+          "decayRate": 0.0,
+          "incKey": 82,
+          "keyRate": 0.009999999776482582
+        }
+      ],
+      "axisCount": 3,
+      "buttonCount": 4,
+      "buttonKeys": [
+        90,
+        88,
+        67,
+        86
+      ],
+      "povConfig": [
+        {
+          "key0": 328,
+          "key135": 323,
+          "key180": 322,
+          "key225": 321,
+          "key270": 324,
+          "key315": 327,
+          "key45": 329,
+          "key90": 326
+        }
+      ],
+      "povCount": 1
+    },
+    {
+      "axisConfig": [
+        {
+          "decKey": 74,
+          "incKey": 76
+        },
+        {
+          "decKey": 73,
+          "incKey": 75
+        }
+      ],
+      "axisCount": 2,
+      "buttonCount": 4,
+      "buttonKeys": [
+        77,
+        44,
+        46,
+        47
+      ],
+      "povCount": 0
+    },
+    {
+      "axisConfig": [
+        {
+          "decKey": 263,
+          "incKey": 262
+        },
+        {
+          "decKey": 265,
+          "incKey": 264
+        }
+      ],
+      "axisCount": 2,
+      "buttonCount": 6,
+      "buttonKeys": [
+        260,
+        268,
+        266,
+        261,
+        269,
+        267
+      ],
+      "povCount": 0
+    },
+    {
+      "axisCount": 0,
+      "buttonCount": 0,
+      "povCount": 0
+    }
+  ]
+}

simgui.json

@@ -0,0 +1,10 @@
+{
+  "NTProvider": {
+    "types": {
+      "/FMSInfo": "FMSInfo"
+    }
+  },
+  "NetworkTables Info": {
+    "visible": true
+  }
+}

src/main/java/frc/robot/Commands/Tracker_Couleur_Forme.java

@@ -1,47 +1,47 @@
-// Copyright (c) FIRST and other WPILib contributors.
+// // Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
+// // Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
+// // the WPILib BSD license file in the root directory of this project.
 
-package frc.robot.Commands;
+// package frc.robot.Commands;
 
-import edu.wpi.first.wpilibj2.command.Command;
+// import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.Subsystems.Limelight3G;
+// import frc.robot.Subsystems.Limelight3G;
 
 
-public class Tracker_Couleur_Forme extends Command {
+// public class Tracker_Couleur_Forme extends Command {
-  /** Creates a new Tracker_Couleur_Forme. */
+//   /** Creates a new Tracker_Couleur_Forme. */
-  private Limelight3G pipeline;
+//   private Limelight3G pipeline;
-  public Tracker_Couleur_Forme(Limelight3G tracker_couleur, Limelight3G tracker_forme) {
+//   public Tracker_Couleur_Forme(Limelight3G tracker_couleur, Limelight3G tracker_forme) {
-    // Use addRequirements() here to declare subsystem dependencies.
+//     // Use addRequirements() here to declare subsystem dependencies.
-    this.pipeline = pipeline;
+//     this.pipeline = pipeline;
-    this.tracker_couleur = tracker_couleur;
+//     this.tracker_couleur = tracker_couleur;
-    this.tracker_forme = tracker_forme;
+//     this.tracker_forme = tracker_forme;
-  }
+//   }
 
-  // Called when the command is initially scheduled.
+//   // Called when the command is initially scheduled.
-  @Override
+//   @Override
-  public void initialize() {}
+//   public void initialize() {}
 
-  // Called every time the scheduler runs while the command is scheduled.
+//   // Called every time the scheduler runs while the command is scheduled.
-  @Override
+//   @Override
-  public void execute() {
+//   public void execute() {
-    if (pipeline == 1) {
+//     if (pipeline == 1) {
-      Limelight3G.tracker_couleur;
+//       Limelight3G.tracker_couleur;
-    }
+//     }
-    else if (pipeline == 2){
+//     else if (pipeline == 2){
-      Limelight3G.tracker_forme;
+//       Limelight3G.tracker_forme;
-    }
+//     }
     
     
-  }
+//   }
 
-  // Called once the command ends or is interrupted.
+//   // Called once the command ends or is interrupted.
-  @Override
+//   @Override
-  public void end(boolean interrupted) {}
+//   public void end(boolean interrupted) {}
 
-  // Returns true when the command should end.
+//   // Returns true when the command should end.
-  @Override
+//   @Override
-  public boolean isFinished() {
+//   public boolean isFinished() {
-    return false;
+//     return false;
-  }
+//   }
-}
+// }

src/main/java/frc/robot/Subsystems/Accumulateur.java

@@ -25,8 +25,8 @@ public class Accumulateur extends SubsystemBase {
       
   final WPI_TalonSRX accumulateur1 = new WPI_TalonSRX(0);
   final WPI_TalonSRX accumulateur2 = new WPI_TalonSRX(10);
-  final DigitalInput photocell = new DigitalInput(94);
+  final DigitalInput photocell = new DigitalInput(20);
-  final DigitalInput photocell2 = new DigitalInput(93);
+  final DigitalInput photocell2 = new DigitalInput(21);
   public void encodeur(){
   }
   public boolean photocell(){

src/main/java/frc/robot/Subsystems/Lanceur.java

@@ -25,8 +25,9 @@ public class Lanceur extends SubsystemBase {
   final WPI_TalonSRX lanceur1 = new WPI_TalonSRX(0);
   final WPI_TalonSRX lanceur2 = new WPI_TalonSRX(1);
   final CANSparkMax tourelle = new CANSparkMax(2, MotorType.kBrushed);
+  final 
   private GenericEntry vitesse =
-        dashboard.add("vitesselanceur", 0.2)
+        dashboard.add("vitesselanceur", 0.2) 
         .withSize(0,0)
         .withPosition(1, 4)
         .getEntry();