diff --git a/networktables.json b/networktables.json new file mode 100644 index 0000000..fe51488 --- /dev/null +++ b/networktables.json @@ -0,0 +1 @@ +[] diff --git a/simgui-ds.json b/simgui-ds.json new file mode 100644 index 0000000..73cc713 --- /dev/null +++ b/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 + } + ] +} diff --git a/simgui.json b/simgui.json new file mode 100644 index 0000000..5f9d275 --- /dev/null +++ b/simgui.json @@ -0,0 +1,10 @@ +{ + "NTProvider": { + "types": { + "/FMSInfo": "FMSInfo" + } + }, + "NetworkTables Info": { + "visible": true + } +} diff --git a/src/main/java/frc/robot/Commands/Tracker_Couleur_Forme.java b/src/main/java/frc/robot/Commands/Tracker_Couleur_Forme.java index 36b4da1..ecb3243 100644 --- a/src/main/java/frc/robot/Commands/Tracker_Couleur_Forme.java +++ b/src/main/java/frc/robot/Commands/Tracker_Couleur_Forme.java @@ -1,47 +1,47 @@ -// Copyright (c) FIRST and other WPILib contributors. -// 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. +// // Copyright (c) FIRST and other WPILib contributors. +// // 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. -package frc.robot.Commands; +// package frc.robot.Commands; -import edu.wpi.first.wpilibj2.command.Command; -import frc.robot.Subsystems.Limelight3G; +// import edu.wpi.first.wpilibj2.command.Command; +// import frc.robot.Subsystems.Limelight3G; -public class Tracker_Couleur_Forme extends Command { - /** Creates a new Tracker_Couleur_Forme. */ - private Limelight3G pipeline; - public Tracker_Couleur_Forme(Limelight3G tracker_couleur, Limelight3G tracker_forme) { - // Use addRequirements() here to declare subsystem dependencies. - this.pipeline = pipeline; - this.tracker_couleur = tracker_couleur; - this.tracker_forme = tracker_forme; - } +// public class Tracker_Couleur_Forme extends Command { +// /** Creates a new Tracker_Couleur_Forme. */ +// private Limelight3G pipeline; +// public Tracker_Couleur_Forme(Limelight3G tracker_couleur, Limelight3G tracker_forme) { +// // Use addRequirements() here to declare subsystem dependencies. +// this.pipeline = pipeline; +// this.tracker_couleur = tracker_couleur; +// this.tracker_forme = tracker_forme; +// } - // Called when the command is initially scheduled. - @Override - public void initialize() {} +// // Called when the command is initially scheduled. +// @Override +// public void initialize() {} - // Called every time the scheduler runs while the command is scheduled. - @Override - public void execute() { - if (pipeline == 1) { - Limelight3G.tracker_couleur; - } - else if (pipeline == 2){ - Limelight3G.tracker_forme; - } +// // Called every time the scheduler runs while the command is scheduled. +// @Override +// public void execute() { +// if (pipeline == 1) { +// Limelight3G.tracker_couleur; +// } +// else if (pipeline == 2){ +// Limelight3G.tracker_forme; +// } - } +// } - // Called once the command ends or is interrupted. - @Override - public void end(boolean interrupted) {} +// // Called once the command ends or is interrupted. +// @Override +// public void end(boolean interrupted) {} - // Returns true when the command should end. - @Override - public boolean isFinished() { - return false; - } -} +// // Returns true when the command should end. +// @Override +// public boolean isFinished() { +// return false; +// } +// } diff --git a/src/main/java/frc/robot/Subsystems/Accumulateur.java b/src/main/java/frc/robot/Subsystems/Accumulateur.java index 2eb7368..ea7e68d 100644 --- a/src/main/java/frc/robot/Subsystems/Accumulateur.java +++ b/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 photocell2 = new DigitalInput(93); + final DigitalInput photocell = new DigitalInput(20); + final DigitalInput photocell2 = new DigitalInput(21); public void encodeur(){ } public boolean photocell(){ diff --git a/src/main/java/frc/robot/Subsystems/Lanceur.java b/src/main/java/frc/robot/Subsystems/Lanceur.java index 7b14e92..2adc4a3 100644 --- a/src/main/java/frc/robot/Subsystems/Lanceur.java +++ b/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();