From 9833f8c594973a1e273e6f86540ecea609be7e85 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Mon, 27 Feb 2023 20:14:26 -0500 Subject: [PATCH] fdgsrytyu --- simgui-ds.json | 92 +++++++++++++++++++ simgui.json | 17 ++++ src/main/java/frc/robot/RobotContainer.java | 12 +++ .../java/frc/robot/subsystems/Gratte.java | 2 +- .../subsystems/bras/BrasTelescopique.java | 6 +- 5 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 simgui-ds.json create mode 100644 simgui.json 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..1d8ea9a --- /dev/null +++ b/simgui.json @@ -0,0 +1,17 @@ +{ + "NTProvider": { + "types": { + "/FMSInfo": "FMSInfo" + } + }, + "NetworkTables": { + "transitory": { + "Shuffleboard": { + ".metadata": { + "open": true + }, + "open": true + } + } + } +} diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index de2c9d0..a2d0c3c 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -6,8 +6,20 @@ package frc.robot; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; +import frc.robot.subsystems.BasePilotable; +import frc.robot.subsystems.Gratte; +import frc.robot.subsystems.Limelight; +import frc.robot.subsystems.bras.BrasTelescopique; +import frc.robot.subsystems.bras.Pince; +import frc.robot.subsystems.bras.Pivot; public class RobotContainer { + BasePilotable basePilotable = new BasePilotable(); + Gratte gratte = new Gratte(); + BrasTelescopique brasTelescopique = new BrasTelescopique(); + Pince pince = new Pince(); + Pivot pivot = new Pivot(); + Limelight limelight = new Limelight(); public RobotContainer() { configureBindings(); } diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java index 8c5199a..db7b8b6 100644 --- a/src/main/java/frc/robot/subsystems/Gratte.java +++ b/src/main/java/frc/robot/subsystems/Gratte.java @@ -22,7 +22,7 @@ import frc.robot.Constants; public class Gratte extends SubsystemBase { ShuffleboardTab teb = Shuffleboard.getTab("teb"); -ShuffleboardLayout layout = Shuffleboard.getTab("teb") +ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb") .getLayout("limitswitchsgratte", BuiltInLayouts.kList) .withSize(2, 2); private WPI_TalonSRX Gratted = new WPI_TalonSRX(Constants.leverGratte); diff --git a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java index 797cc12..c47f2f0 100644 --- a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java +++ b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java @@ -18,8 +18,8 @@ import frc.robot.Constants; public class BrasTelescopique extends SubsystemBase { ShuffleboardTab teb = Shuffleboard.getTab("teb"); -ShuffleboardLayout layout = Shuffleboard.getTab("teb") -.getLayout("yeet", BuiltInLayouts.kList) +ShuffleboardLayout bras = Shuffleboard.getTab("teb") +.getLayout("bras", BuiltInLayouts.kList) .withSize(2, 2); /** Creates a new BrasTelescopique. */ public BrasTelescopique() {} @@ -36,6 +36,6 @@ ShuffleboardLayout layout = Shuffleboard.getTab("teb") @Override public void periodic() { - yeet.add ("encodeur",0.1); + bras.add ("encodeur",0.1); } }