Skip to content

accident #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2025
Merged

accident #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions LearnBot/src/main/java/org/firstinspires/ftc/hoops/ClawAndWristBot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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));
}
}
8 changes: 4 additions & 4 deletions LearnBot/src/main/java/org/firstinspires/ftc/hoops/Hardware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions LearnBot/src/main/java/org/firstinspires/ftc/hoops/subsystems/ClawAndWristSubsystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions LearnBot/src/main/java/org/firstinspires/ftc/hoops/subsystems/PlacementSubsystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions LearnBot/src/main/java/org/firstinspires/ftc/hoops/subsystems/TestSubsystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading