Merge pull request #63 from rh-robotics/teo-hwc-names

rh-robotics · Nov 15, 2023 · c7b23bd · c7b23bd
2 parents a252087 + 656097b
commit c7b23bd
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/HWC.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/HWC.java
@@ -58,25 +58,21 @@ public HWC(@NonNull HardwareMap hardwareMap, Telemetry telemetry) {
         rightRear = hardwareMap.get(DcMotorEx.class, "rightRear");
 
         // Declare other motors
-        rightPulley = hardwareMap.get(DcMotorEx.class, "R_Pulley");
-        leftPulley = hardwareMap.get(DcMotorEx.class, "L_Pulley");
+        rightPulley = hardwareMap.get(DcMotorEx.class, "pulleyR");
+        leftPulley = hardwareMap.get(DcMotorEx.class, "pulleyL");
         intakeMotor = hardwareMap.get(DcMotorEx.class, "intakeMotor");
 
         // Declare Servos
-        intakeL = hardwareMap.get(Servo.class, "Intake_L");
-        intakeR = hardwareMap.get(Servo.class, "Intake_R");
-        elbowL = hardwareMap.get(Servo.class, "Elbow_L");
-        elbowR = hardwareMap.get(Servo.class, "Elbow_R");
-        clawL = hardwareMap.get(Servo.class, "Claw_L");
-        clawR = hardwareMap.get(Servo.class, "Claw_R");
-        // Declare servos
+        intakeL = hardwareMap.get(Servo.class, "IntakeL");
+        intakeR = hardwareMap.get(Servo.class, "IntakeR");
+        clawL = hardwareMap.get(Servo.class, "ClawL");
+        clawR = hardwareMap.get(Servo.class, "ClawR");
         passoverArmLeft = hardwareMap.get(Servo.class, "passoverArmLeft");
         passoverArmRight = hardwareMap.get(Servo.class, "passoverArmRight");
 
         // Declare Sensors
-        buttonL = hardwareMap.get(TouchSensor.class, "L_Button");
-        buttonR = hardwareMap.get(TouchSensor.class, "R_Button");
-
+        buttonL = hardwareMap.get(TouchSensor.class, "buttonL");
+        buttonR = hardwareMap.get(TouchSensor.class, "buttonR");
 
         // Set the direction of motors
         leftFront.setDirection(DcMotorEx.Direction.REVERSE);
@@ -102,7 +98,6 @@ public HWC(@NonNull HardwareMap hardwareMap, Telemetry telemetry) {
         leftPulley.setMode(DcMotorEx.RunMode.RUN_USING_ENCODER);
         intakeMotor.setMode(DcMotorEx.RunMode.RUN_USING_ENCODER);
     }
-    // TODO: ADD ANY HARDWARE RELATED FUNCTIONS BELOW
 
     public void runIntake(double pwr) {
         intakeMotor.setPower(pwr);