diff --git a/activities-by-session/1-exploration/1-git-workflow/MyFirstClass.java b/activities-by-session/1-exploration/1-git-workflow/MyFirstClass.java index 2707564..d9bfa0b 100644 --- a/activities-by-session/1-exploration/1-git-workflow/MyFirstClass.java +++ b/activities-by-session/1-exploration/1-git-workflow/MyFirstClass.java @@ -3,6 +3,6 @@ public class MyFirstClass { public static void main(String[] args) { - System.out.println("Hello, world"); + System.out.println("Hello, world!!"); } } diff --git a/activities-by-session/1-exploration/2-simple-intake/src/main/java/frc/robot/subsystems/Intake.java b/activities-by-session/1-exploration/2-simple-intake/src/main/java/frc/robot/subsystems/Intake.java index 7e50e7b..ac8d04d 100644 --- a/activities-by-session/1-exploration/2-simple-intake/src/main/java/frc/robot/subsystems/Intake.java +++ b/activities-by-session/1-exploration/2-simple-intake/src/main/java/frc/robot/subsystems/Intake.java @@ -1,9 +1,14 @@ package frc.robot.subsystems; +import com.ctre.phoenix6.hardware.TalonFX; + import edu.wpi.first.wpilibj2.command.SubsystemBase; public class Intake extends SubsystemBase { - + public final TalonFX intakeMotor = new TalonFX(deviceid:1); + public Intake() { + intakeMotor.set(speed: 0.75); + } } diff --git a/activities-by-session/1-exploration/3-cooler-intake/src/main/java/frc/robot/RobotContainer.java b/activities-by-session/1-exploration/3-cooler-intake/src/main/java/frc/robot/RobotContainer.java index 2f616b1..b163926 100644 --- a/activities-by-session/1-exploration/3-cooler-intake/src/main/java/frc/robot/RobotContainer.java +++ b/activities-by-session/1-exploration/3-cooler-intake/src/main/java/frc/robot/RobotContainer.java @@ -8,8 +8,10 @@ public class RobotContainer { private final Intake intake; + private final CommandXboxController controller = new CommandXboxController(port:1); public RobotContainer() { - intake = new Intake(); + intake = newIntake(); + controller.x().whileTrue(Commands.startEnd(intake::intake, intake::stop, intake)); } public Intake getIntake() { return intake; diff --git a/activities-by-session/1-exploration/3-cooler-intake/src/main/java/frc/robot/subsystems/Intake.java b/activities-by-session/1-exploration/3-cooler-intake/src/main/java/frc/robot/subsystems/Intake.java index 7e50e7b..2be99c2 100644 --- a/activities-by-session/1-exploration/3-cooler-intake/src/main/java/frc/robot/subsystems/Intake.java +++ b/activities-by-session/1-exploration/3-cooler-intake/src/main/java/frc/robot/subsystems/Intake.java @@ -4,6 +4,17 @@ public class Intake extends SubsystemBase { +private final TalonFX intakeMotor = new TalonFX(1); + public Intake(){} + public void intake(){ + intakeMotor.set(1); + } + public void eject(){ + intakeMotor.set(-1); + } + public void stop() { + intakeMotor.set(0); + } }