From 9d9784565b9eb88ff06b1a22754b5154103e5a3b Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 12 Feb 2024 17:55:21 -0500 Subject: [PATCH 1/6] grimpeur --- simgui.json | 8 ++++++++ src/main/java/frc/robot/command/GrimpeurDroit.java | 2 +- src/main/java/frc/robot/command/GrimpeurGauche.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/simgui.json b/simgui.json index 5febc02..9fdf162 100644 --- a/simgui.json +++ b/simgui.json @@ -4,6 +4,11 @@ "window": { "visible": true } + }, + "Solenoids": { + "window": { + "visible": true + } } }, "NTProvider": { @@ -37,6 +42,9 @@ } } }, + "NetworkTables Info": { + "visible": true + }, "NetworkTables View": { "visible": false }, diff --git a/src/main/java/frc/robot/command/GrimpeurDroit.java b/src/main/java/frc/robot/command/GrimpeurDroit.java index 20ff35e..718c3ce 100644 --- a/src/main/java/frc/robot/command/GrimpeurDroit.java +++ b/src/main/java/frc/robot/command/GrimpeurDroit.java @@ -45,7 +45,7 @@ public class GrimpeurDroit extends Command { else{ grimpeur.droit(0); } - if(grimpeur.encoderd()>0){ + if(grimpeur.encoderd()>1){ grimpeur.resetencodeurd(); grimpeur.droit(0); diff --git a/src/main/java/frc/robot/command/GrimpeurGauche.java b/src/main/java/frc/robot/command/GrimpeurGauche.java index 11a5685..3e7e46e 100644 --- a/src/main/java/frc/robot/command/GrimpeurGauche.java +++ b/src/main/java/frc/robot/command/GrimpeurGauche.java @@ -44,7 +44,7 @@ public class GrimpeurGauche extends Command { else{ grimpeur.gauche(0); } - if(grimpeur.encoderd()>0){ + if(grimpeur.encoderd()>1){ grimpeur.resetencodeurg(); grimpeur.gauche(0); From b58baae2ce1864e020cdc0ffca6e29b25a5d98b2 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 12 Feb 2024 17:58:21 -0500 Subject: [PATCH 2/6] --- simgui.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/simgui.json b/simgui.json index 9fdf162..6676bf1 100644 --- a/simgui.json +++ b/simgui.json @@ -42,9 +42,6 @@ } } }, - "NetworkTables Info": { - "visible": true - }, "NetworkTables View": { "visible": false }, From 1087610e2660cd7842f860b6352c11f8fb278ba5 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 12 Feb 2024 18:01:01 -0500 Subject: [PATCH 3/6] --- simgui.json | 3 +++ src/main/java/frc/robot/command/AllumeLED.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/simgui.json b/simgui.json index 6676bf1..9fdf162 100644 --- a/simgui.json +++ b/simgui.json @@ -42,6 +42,9 @@ } } }, + "NetworkTables Info": { + "visible": true + }, "NetworkTables View": { "visible": false }, diff --git a/src/main/java/frc/robot/command/AllumeLED.java b/src/main/java/frc/robot/command/AllumeLED.java index dd1d09e..f070ff3 100644 --- a/src/main/java/frc/robot/command/AllumeLED.java +++ b/src/main/java/frc/robot/command/AllumeLED.java @@ -12,7 +12,7 @@ public class AllumeLED extends Command { private LED led; private Accumulateur accumulateur; /** Creates a new AllumeLED. */ - public AllumeLED(LED led) { + public AllumeLED(LED led,Accumulateur accumulateur){ this.accumulateur = accumulateur; this.led = led; addRequirements(led); From 8cc51eada493a0b4c828b4767af4952ba226d80e Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 12 Feb 2024 18:04:58 -0500 Subject: [PATCH 4/6] --- src/main/java/frc/robot/RobotContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 51dfd61..80b52fe 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -72,7 +72,7 @@ public class RobotContainer { Lancerampli lancerampli = new Lancerampli(lanceur,limelight); GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftX); GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getLeftY); - AllumeLED allumeLED = new AllumeLED(LED); + AllumeLED allumeLED = new AllumeLED(LED, accumulateur); Pistongrimpeur pistongrimpeur = new Pistongrimpeur(grimpeur, LED); public RobotContainer() { dashboard.addCamera("limelight", "limelight","limelight.local:5800"); From 6ce8cac6b11f036dbc96bd8e813f6bea170f8f12 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 12 Feb 2024 18:06:35 -0500 Subject: [PATCH 5/6] --- simgui.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/simgui.json b/simgui.json index 9fdf162..de3467e 100644 --- a/simgui.json +++ b/simgui.json @@ -5,6 +5,18 @@ "visible": true } }, + "Other Devices": { + "SPARK MAX [26]": { + "header": { + "open": true + } + }, + "SPARK MAX [27]": { + "header": { + "open": true + } + } + }, "Solenoids": { "window": { "visible": true From d9e9c2af4d1cbfab003a23a95b8c531c14b8f2d0 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 12 Feb 2024 18:06:49 -0500 Subject: [PATCH 6/6] --- src/main/java/frc/robot/RobotContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 80b52fe..3ea59f1 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -72,7 +72,7 @@ public class RobotContainer { Lancerampli lancerampli = new Lancerampli(lanceur,limelight); GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftX); GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getLeftY); - AllumeLED allumeLED = new AllumeLED(LED, accumulateur); + AllumeLED allumeLED = new AllumeLED(LED, accumulateur); Pistongrimpeur pistongrimpeur = new Pistongrimpeur(grimpeur, LED); public RobotContainer() { dashboard.addCamera("limelight", "limelight","limelight.local:5800");