Skip to content
This repository was archived by the owner on Sep 12, 2023. It is now read-only.

Commit 22f0acd

Browse files
authored
Merge pull request #1 from kevinfrei/master
Fill in blanks enough to unblock the build.
2 parents 813e0f2 + 113d18b commit 22f0acd

File tree

5 files changed

+39
-2
lines changed

5 files changed

+39
-2
lines changed

TechnoTwoCode/src/main/java/org/firstinspires/ftc/teamcode/Robot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static class RobotConstants {
3030
public Robot() {
3131
if (LIFT_CONNECTED) liftSubsystem = new LiftSubsystem(Hardware.liftMotor);
3232
if (DEPOSIT_CONNECTED) depositSubsystem = new DepositSubsystem(Hardware.leftDepositServo, Hardware.rightDepositServo);
33-
if (DRIVE_CONNECTED) drivebaseSubsystem = new DrivebaseSubsystem(Hardware.flDriveMotor, Hardware.frDriveMotor, Hardware.rlDriveMotor, Hardware.rrDriveMotor);
33+
if (DRIVE_CONNECTED) drivebaseSubsystem = new DrivebaseSubsystem(Hardware.flDriveMotor, Hardware.frDriveMotor, Hardware.rlDriveMotor, Hardware.rrDriveMotor, Hardware.imu);
3434
if (CAROUSEL_CONNECTED) carouselSubsystem = new CarouselSubsystem(Hardware.carouselMotor);
3535
if (INTAKE_CONNECTED) intakeSubsystem = new IntakeSubsystem(Hardware.intakeMotor);
3636
if (VISION_CONNECTED) visionSubsystem = new VisionSubsystem(Hardware.camera);
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
package org.firstinspires.ftc.teamcode.subsystems;
22

3+
import com.qualcomm.robotcore.hardware.DcMotorEx;
4+
import com.technototes.library.hardware.motor.Motor;
5+
36
public class CarouselSubsystem {
7+
public CarouselSubsystem(Motor<DcMotorEx> m){}
8+
49
}

TechnoTwoCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/DrivebaseSubsystem.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22

33
import com.qualcomm.robotcore.hardware.DcMotorEx;
44
import com.technototes.library.hardware.motor.EncodedMotor;
5+
import com.technototes.library.hardware.sensor.IMU;
56
import com.technototes.library.subsystem.Subsystem;
67

78
public class DrivebaseSubsystem implements Subsystem {
9+
public DrivebaseSubsystem(EncodedMotor<DcMotorEx> fl, EncodedMotor<DcMotorEx> fr,
10+
EncodedMotor<DcMotorEx> rl, EncodedMotor<DcMotorEx> rr,
11+
IMU i) {}
812

913
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
package org.firstinspires.ftc.teamcode.subsystems;
22

3+
import com.qualcomm.robotcore.hardware.DcMotorEx;
4+
import com.technototes.library.hardware.motor.Motor;
5+
36
public class IntakeSubsystem {
7+
public IntakeSubsystem(Motor<DcMotorEx> m) {
8+
}
49
}
Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,25 @@
1-
package org.firstinspires.ftc.teamcode.subsystems;public class VisionSubsystem {
1+
package org.firstinspires.ftc.teamcode.subsystems;
2+
3+
import com.technototes.vision.hardware.Camera;
4+
import com.technototes.vision.subsystem.PipelineSubsystem;
5+
6+
import org.opencv.core.Mat;
7+
8+
import java.util.function.Supplier;
9+
10+
public class VisionSubsystem extends PipelineSubsystem implements Supplier<Integer> {
11+
12+
public VisionSubsystem(Camera c) {
13+
super(c);
14+
}
15+
16+
@Override
17+
public Integer get() {
18+
return null;
19+
}
20+
21+
@Override
22+
public Mat processFrame(Mat input) {
23+
return null;
24+
}
225
}

0 commit comments

Comments
 (0)