Merge branch 'main' of https://git.demerso.net/pls5618/2024/robot
This commit is contained in:
		| @@ -11,9 +11,11 @@ public class Constants { | |||||||
|     public static int lancer2 = 2; |     public static int lancer2 = 2; | ||||||
|     public static int roue = 3; |     public static int roue = 3; | ||||||
|     public static int etoile = 4; |     public static int etoile = 4; | ||||||
|     public static int Deaccumulationneur1 = 5; |     public static int Moteuracc2 = 5; | ||||||
|     public static int Deaccumulationneur2 = 6; |     public static int Moteuracc = 6; | ||||||
|     public static int guideur = 7; |     public static int guideur = 7; | ||||||
|     // limit switsh |     // limit switsh | ||||||
|     public static int guideurhaut = 8; |     public static int guideurhaut = 8; | ||||||
|  |      | ||||||
|  |    | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,14 +6,18 @@ package frc.robot.subsystem; | |||||||
|  |  | ||||||
| import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; | import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; | ||||||
|  |  | ||||||
|  | import edu.wpi.first.wpilibj.DigitalInput; | ||||||
| import edu.wpi.first.wpilibj2.command.SubsystemBase; | import edu.wpi.first.wpilibj2.command.SubsystemBase; | ||||||
| import frc.robot.Constants; | import frc.robot.Constants; | ||||||
|  |  | ||||||
| public class Accumulateur extends SubsystemBase { | public class Accumulateur extends SubsystemBase { | ||||||
|   /** Creates a new Accumulateur. */ |   /** Creates a new Accumulateur. */ | ||||||
|   public Accumulateur() {} |   public Accumulateur() {} | ||||||
|   final WPI_TalonSRX Deaccumulationneur1 = new WPI_TalonSRX(Constants.Deaccumulationneur1); |   final WPI_TalonSRX Moteuracc2 = new WPI_TalonSRX(Constants.Moteuracc2); | ||||||
|   final WPI_TalonSRX Deaccumulationneur2 = new WPI_TalonSRX(Constants.Deaccumulationneur2); |   final WPI_TalonSRX Moteuracc = new WPI_TalonSRX(Constants.Moteuracc); | ||||||
|  |   final DigitalInput limitacc = new DigitalInput(0); | ||||||
|  |   public void Deaccumuler(double vitesse){Moteuracc2.set(vitesse);} | ||||||
|  |    | ||||||
|  |  | ||||||
|   @Override |   @Override | ||||||
|   public void periodic() { |   public void periodic() { | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ public class Balayeuse extends SubsystemBase { | |||||||
|   /** Creates a new Balayeuse. */   |   /** Creates a new Balayeuse. */   | ||||||
|   |   | ||||||
|   public Balayeuse() {} |   public Balayeuse() {} | ||||||
|    final WPI_TalonSRX roue = new WPI_TalonSRX(Constants.roue); |   final WPI_TalonSRX roue = new WPI_TalonSRX(Constants.roue); | ||||||
|   final TalonSRX etoile = new TalonSRX(Constants.etoile); |   final TalonSRX etoile = new TalonSRX(Constants.etoile); | ||||||
|  |  | ||||||
|   public void Accumulation(double vitesse){ |   public void Accumulation(double vitesse){ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user