From 90c5c0b7af0e27d08e29f12265f3bb737e62e40a Mon Sep 17 00:00:00 2001 From: ReignRoss Date: Mon, 14 Sep 2026 22:46:08 +0000 Subject: [PATCH 1/2] first commit --- .../1-exploration/1-git-workflow/MyFirstClass.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..cd6ce5a 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!"); } } From e6b32f68f5bba9f842d89f63dcaf5c39f85efe60 Mon Sep 17 00:00:00 2001 From: ReignRoss Date: Tue, 15 Sep 2026 00:09:27 +0000 Subject: [PATCH 2/2] 9/14/2026 --- .../1-exploration/1-git-workflow/MyFirstClass.java | 2 +- .../src/main/java/frc/robot/subsystems/Intake.java | 9 +++++++-- .../src/main/java/frc/robot/RobotContainer.java | 5 ++++- .../src/main/java/frc/robot/subsystems/Intake.java | 13 ++++++++++++- 4 files changed, 24 insertions(+), 5 deletions(-) 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 cd6ce5a..bc156f9 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, worlds"); } } 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..0bec40c 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(1); +public Intake () { +intakeMotor.set(0.75); } + +} \ No newline at end of file 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..65b75e5 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 @@ -4,13 +4,16 @@ package frc.robot; +import edu.wpi.first.wpilibj2.command.Commands; +import edu.wpi.first.wpilibj2.command.button.CommandXboxController; import frc.robot.subsystems.Intake; public class RobotContainer { private final Intake intake; + private final CommandXboxController controller = new CommandXboxController(1); public RobotContainer() { intake = new Intake(); - } + controller.x().whileTrue(Commands.startEnd(intake::intake, inake::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..bb98a25 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 @@ -1,9 +1,20 @@ package frc.robot.subsystems; +import com.ctre.phoenix6.hardware.TalonFX; + import edu.wpi.first.wpilibj2.command.SubsystemBase; public class Intake extends SubsystemBase { +private final TalonFX intakeMotor = new TalonFX(1); - +public intake(){} +public void intake(){ +intakeMotor.set(0); +} +public void eject(){ + intakeMotor.set(-1); } +public void stop(){ + intakeMotor.set(0); +} \ No newline at end of file