Merge pull request #143 from technototes/revert-141-OspreyBranch

accident

Author: Kooolpool

LearnBot/src/main/java/org/firstinspires/ftc/hoops/ClawAndWristBot.java

@@ -1,6 +1,6 @@
 package org.firstinspires.ftc.hoops;
 
-import com.technototes.library.hardware.servo.ServoGroup;
+import com.technototes.library.hardware.servo.Servo;
 import org.firstinspires.ftc.hoops.subsystems.ClawAndWristSubsystem;
 
 //@Config
@@ -13,10 +13,6 @@ public class ClawAndWristBot {
     public ClawAndWristSubsystem caw;
 
     public ClawAndWristBot() {
-        caw = new ClawAndWristSubsystem(
-            new ServoGroup(CLAW1),
-            new ServoGroup(CLAW2),
-            new ServoGroup(WRIST)
-        );
+        caw = new ClawAndWristSubsystem(new Servo(CLAW1), new Servo(CLAW2), new Servo(WRIST));
     }
 }

LearnBot/src/main/java/org/firstinspires/ftc/hoops/Hardware.java

@@ -11,7 +11,7 @@
 import com.technototes.library.hardware.sensor.IGyro;
 import com.technototes.library.hardware.sensor.IMU;
 import com.technototes.library.hardware.sensor.Rev2MDistanceSensor;
-import com.technototes.library.hardware.servo.ServoGroup;
+import com.technototes.library.hardware.servo.Servo;
 import com.technototes.library.logger.Loggable;
 import com.technototes.vision.hardware.Webcam;
 import java.util.List;
@@ -25,8 +25,8 @@ public class Hardware implements Loggable {
     public Motor<DcMotorEx> placeholder1;
     public DcMotorEx liftMotor;
 
-    public ServoGroup placeholder2;
-    public ServoGroup servo;
+    public Servo placeholder2;
+    public Servo servo;
 
     public IGyro imu;
     public Webcam camera;
@@ -67,7 +67,7 @@ public Hardware(HardwareMap hwmap) {
         }
         if (Setup.Connected.TESTSUBSYSTEM) {
             if (Setup.Connected.SERVO) {
-                this.servo = new ServoGroup(Setup.HardwareNames.SERVO);
+                this.servo = new Servo(Setup.HardwareNames.SERVO);
             }
             //            if (Setup.Connected.COLOR_SENSOR) {
             //                this.colorSensor = new ColorDistanceSensor(Setup.HardwareNames.COLOR);

LearnBot/src/main/java/org/firstinspires/ftc/hoops/subsystems/ClawAndWristSubsystem.java

@@ -1,7 +1,7 @@
 package org.firstinspires.ftc.hoops.subsystems;
 
 import com.qualcomm.robotcore.util.Range;
-import com.technototes.library.hardware.servo.ServoGroup;
+import com.technototes.library.hardware.servo.Servo;
 import com.technototes.library.logger.Log;
 import com.technototes.library.logger.Loggable;
 import com.technototes.library.subsystem.Subsystem;
@@ -31,11 +31,11 @@ public class ClawAndWristSubsystem implements Subsystem, Loggable {
     @Log(name = "Wrist")
     public double WristPos;
 
-    private ServoGroup claw1;
-    private ServoGroup claw2;
-    private ServoGroup wrist;
+    private Servo claw1;
+    private Servo claw2;
+    private Servo wrist;
 
-    public ClawAndWristSubsystem(ServoGroup c1, ServoGroup c2, ServoGroup w) {
+    public ClawAndWristSubsystem(Servo c1, Servo c2, Servo w) {
         claw1 = c1;
         claw2 = c2;
         wrist = w;

LearnBot/src/main/java/org/firstinspires/ftc/hoops/subsystems/PlacementSubsystem.java

@@ -2,7 +2,7 @@
 
 import com.qualcomm.robotcore.hardware.DcMotor;
 import com.qualcomm.robotcore.hardware.DcMotorEx;
-import com.technototes.library.hardware.servo.ServoGroup;
+import com.technototes.library.hardware.servo.Servo;
 import com.technototes.library.logger.Log;
 import com.technototes.library.logger.Loggable;
 import com.technototes.library.subsystem.Subsystem;
@@ -17,7 +17,7 @@ public class PlacementSubsystem implements Subsystem, Loggable {
     public static double ScoreServo = 0.5;
 
     public static double ArmServo = 0.5;
-    public ServoGroup armServo;
+    public Servo armServo;
 
     public static double ScoreServoInput = 0.5;
 
@@ -27,7 +27,7 @@ public class PlacementSubsystem implements Subsystem, Loggable {
 
     public static double ArmServoOutput = 0.5;
 
-    public ServoGroup scoreServo;
+    public Servo scoreServo;
     public DcMotorEx liftMotor;
     private boolean isHardware;
 

LearnBot/src/main/java/org/firstinspires/ftc/hoops/subsystems/TestSubsystem.java

@@ -6,7 +6,7 @@
 import com.qualcomm.robotcore.util.Range;
 import com.technototes.library.hardware.motor.EncodedMotor;
 import com.technototes.library.hardware.sensor.Rev2MDistanceSensor;
-import com.technototes.library.hardware.servo.ServoGroup;
+import com.technototes.library.hardware.servo.Servo;
 import com.technototes.library.logger.Log;
 import com.technototes.library.logger.Loggable;
 import com.technototes.library.subsystem.Subsystem;
@@ -37,7 +37,7 @@ public class TestSubsystem implements Subsystem, Loggable {
     // but only while/if the the distance is greater than 10cm
     private EncodedMotor<DcMotorEx> theMotor;
 
-    private ServoGroup servo;
+    private Servo servo;
 
     private Rev2MDistanceSensor theSensor;
     private boolean running;