Merge branch 'main' of https://git.demerso.net/PLS5618/pratique-2025
This commit is contained in:
commit
908c5d0b96
@ -5,12 +5,12 @@
|
|||||||
},
|
},
|
||||||
"absoluteEncoderOffset": 5.537,
|
"absoluteEncoderOffset": 5.537,
|
||||||
"drive": {
|
"drive": {
|
||||||
"type": "sparkmax",
|
"type": "talonFX",
|
||||||
"id": 11,
|
"id": 11,
|
||||||
"canbus": null
|
"canbus": null
|
||||||
},
|
},
|
||||||
"angle": {
|
"angle": {
|
||||||
"type": "sparkmax",
|
"type": "talonFX",
|
||||||
"id": 12,
|
"id": 12,
|
||||||
"canbus": null
|
"canbus": null
|
||||||
},
|
},
|
||||||
|
@ -13,7 +13,7 @@ public class Accumulateur extends SubsystemBase {
|
|||||||
|
|
||||||
/** Creates a new Accumulateur. */
|
/** Creates a new Accumulateur. */
|
||||||
public Accumulateur() {dashboard.addBoolean("photocellacc", this::photocell).withSize(1, 1).withPosition(0, 1);
|
public Accumulateur() {dashboard.addBoolean("photocellacc", this::photocell).withSize(1, 1).withPosition(0, 1);
|
||||||
|
dashboard.addBoolean("photocellacc2", this::photocell).withSize(1, 1).withPosition(0, 1);
|
||||||
}
|
}
|
||||||
ShuffleboardTab dashboard = Shuffleboard.getTab("dashboard");
|
ShuffleboardTab dashboard = Shuffleboard.getTab("dashboard");
|
||||||
|
|
||||||
@ -26,6 +26,7 @@ public class Accumulateur extends SubsystemBase {
|
|||||||
final WPI_TalonSRX accumulateur1 = new WPI_TalonSRX(0);
|
final WPI_TalonSRX accumulateur1 = new WPI_TalonSRX(0);
|
||||||
final WPI_TalonSRX accumulateur2 = new WPI_TalonSRX(10);
|
final WPI_TalonSRX accumulateur2 = new WPI_TalonSRX(10);
|
||||||
final DigitalInput photocell = new DigitalInput(94);
|
final DigitalInput photocell = new DigitalInput(94);
|
||||||
|
final DigitalInput photocell2 = new DigitalInput(93);
|
||||||
public void encodeur(){
|
public void encodeur(){
|
||||||
}
|
}
|
||||||
public boolean photocell(){
|
public boolean photocell(){
|
||||||
|
Loading…
x
Reference in New Issue
Block a user