Reformatted

technototes · Sep 21, 2024 · 7018316 · 7018316
1 parent 8f2f11a
commit 7018316
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/Twenty403/src/main/java/org/firstinspires/ftc/twenty403/Hardware.java b/Twenty403/src/main/java/org/firstinspires/ftc/twenty403/Hardware.java
@@ -5,10 +5,10 @@
 import com.qualcomm.robotcore.hardware.DcMotorEx;
 import com.qualcomm.robotcore.hardware.HardwareMap;
 import com.qualcomm.robotcore.hardware.ServoController;
+import com.technototes.library.hardware.motor.CRServo;
 import com.technototes.library.hardware.motor.EncodedMotor;
 import com.technototes.library.hardware.motor.Motor;
 import com.technototes.library.hardware.sensor.IMU;
-import com.technototes.library.hardware.motor.CRServo;
 import com.technototes.library.hardware.sensor.encoder.MotorEncoder;
 import com.technototes.library.hardware.servo.Servo;
 import com.technototes.library.logger.Loggable;
@@ -45,7 +45,7 @@ public Hardware(HardwareMap hwmap) {
             odoR = new MotorEncoder(Setup.HardwareNames.ODOR);
             odoF = new MotorEncoder(Setup.HardwareNames.ODOF);
         }
-        if (Setup.Connected.KIDSSHAMPOOSUBSYSTEM){
+        if (Setup.Connected.KIDSSHAMPOOSUBSYSTEM) {
             intake = new CRServo(Setup.HardwareNames.INTAKE);
             retainer = new Servo(Setup.HardwareNames.RETAINER);
             jaw = new Servo(Setup.HardwareNames.JAW);

diff --git a/Twenty403/src/main/java/org/firstinspires/ftc/twenty403/subsystems/KidShampoo.java b/Twenty403/src/main/java/org/firstinspires/ftc/twenty403/subsystems/KidShampoo.java
@@ -5,11 +5,11 @@
 import com.technototes.library.hardware.servo.Servo;
 import com.technototes.library.logger.Loggable;
 import com.technototes.library.subsystem.Subsystem;
-
 import org.firstinspires.ftc.twenty403.Hardware;
 
 @Config
 public class KidShampoo implements Subsystem, Loggable {
+
     private Servo retainer, jaw;
     private CRServo intake;
 
@@ -24,37 +24,37 @@ public class KidShampoo implements Subsystem, Loggable {
 
     public static double INTAKE_SPIT = .1;
 
-    public KidShampoo(Hardware hw){
+    public KidShampoo(Hardware hw) {
         intake = hw.intake;
         retainer = hw.retainer;
         jaw = hw.jaw;
     }
 
-    public void openRetainer(){
+    public void openRetainer() {
         retainer.setPosition(RETAINER_OPEN_POSITION);
     }
-    public void eatRetainer(){
-        retainer.setPosition(RETAINER_EAT_POSITION);
 
+    public void eatRetainer() {
+        retainer.setPosition(RETAINER_EAT_POSITION);
     }
-    public void closeRetainer(){
+
+    public void closeRetainer() {
         retainer.setPosition(RETAINER_CLOSE_POSITION);
     }
-    public void biteJaw(){
+
+    public void biteJaw() {
         jaw.setPosition(JAW_BITE_POSITION);
     }
-    public void releaseJaw(){
+
+    public void releaseJaw() {
         jaw.setPosition(JAW_RELEASE_POSITION);
     }
 
     public void slurpIntake() {
-      intake.setPower(INTAKE_SLURP);
+        intake.setPower(INTAKE_SLURP);
     }
+
     public void spitIntake() {
         intake.setPower(INTAKE_SPIT);
     }
-    @Override
-    public void periodic() {
-
-    }
 }