From f3154a551ec0b8cbd383a162cf5dac291c05fc41 Mon Sep 17 00:00:00 2001 From: Carlos Rivas Date: Tue, 10 Dec 2024 16:56:24 -0800 Subject: [PATCH] Fixed naming convention --- .../java/org/firstinspires/ftc/teamcode/PedroConstants.java | 5 +++++ .../ftc/teamcode/subsystem/SkyHookSubsystem.java | 3 ++- .../ftc/teamcode/subsystem/WristActionsSubsystem.java | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/PedroConstants.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/PedroConstants.java index 48428ad..85c61e5 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/PedroConstants.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/PedroConstants.java @@ -76,6 +76,11 @@ public class PedroConstants { */ public static final String WRIST_NAME = "wrist-servo"; + /* + Skyhook configuration name + */ + public static final String SKYHOOK_NAME = "skyhook"; + /* Pedro's parameters */ diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/SkyHookSubsystem.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/SkyHookSubsystem.java index 0d44c3e..1be7b54 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/SkyHookSubsystem.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/SkyHookSubsystem.java @@ -1,6 +1,7 @@ package org.firstinspires.ftc.teamcode.subsystem; import static org.firstinspires.ftc.teamcode.PedroConstants.LEFT_ENCODER; +import static org.firstinspires.ftc.teamcode.PedroConstants.SKYHOOK_NAME; import static org.firstinspires.ftc.teamcode.configs.RobotConstants.liftPower; import com.acmerobotics.roadrunner.Action; @@ -19,7 +20,7 @@ public class SkyHookSubsystem { private SkyHookState skyHookState; public SkyHookSubsystem(HardwareMap hardwareMap) { - hook = hardwareMap.get(DcMotor.class, "skyhook"); + hook = hardwareMap.get(DcMotor.class, SKYHOOK_NAME); } diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/WristActionsSubsystem.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/WristActionsSubsystem.java index 9ae78de..deeab63 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/WristActionsSubsystem.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/WristActionsSubsystem.java @@ -1,5 +1,6 @@ package org.firstinspires.ftc.teamcode.subsystem; +import static org.firstinspires.ftc.teamcode.PedroConstants.WRIST_NAME; import static org.firstinspires.ftc.teamcode.configs.RobotConstants.wristBucket; import static org.firstinspires.ftc.teamcode.configs.RobotConstants.wristFloor; import static org.firstinspires.ftc.teamcode.configs.RobotConstants.wristPickup; @@ -26,7 +27,7 @@ public class WristActionsSubsystem { public WristState state; public WristActionsSubsystem(HardwareMap hardwareMap) { - this.wrist = hardwareMap.get(ServoImplEx.class, "wrist-servo"); + this.wrist = hardwareMap.get(ServoImplEx.class, WRIST_NAME); } public class MoveToPosition implements Action {