Fixed issues, ready to test
This commit is contained in:
@@ -52,7 +52,10 @@ tasks.register<Copy>("deployToSDK") {
|
|||||||
val sdkDir = "/home/eric/.weevil/ftc-sdk"
|
val sdkDir = "/home/eric/.weevil/ftc-sdk"
|
||||||
|
|
||||||
from("src/main/java") {
|
from("src/main/java") {
|
||||||
include("robot/**/*.java")
|
include("org/firstinspires/ftc/teamcode/**/*.java")
|
||||||
|
exclude("**/mock/MockCRServo.java")
|
||||||
|
exclude("**/mock/MockDCMotor.java")
|
||||||
|
exclude("**/mock/MockPotentiometer.java")
|
||||||
}
|
}
|
||||||
|
|
||||||
into(layout.projectDirectory.dir("$sdkDir/TeamCode/src/main/java"))
|
into(layout.projectDirectory.dir("$sdkDir/TeamCode/src/main/java"))
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ import com.qualcomm.robotcore.hardware.DcMotor;
|
|||||||
import com.qualcomm.robotcore.hardware.AnalogInput;
|
import com.qualcomm.robotcore.hardware.AnalogInput;
|
||||||
|
|
||||||
import org.firstinspires.ftc.teamcode.subsystems.chute.Chute;
|
import org.firstinspires.ftc.teamcode.subsystems.chute.Chute;
|
||||||
import org.firstinspires.ftc.teamcode.subsystems.chute.FtcCRServo;
|
import org.firstinspires.ftc.teamcode.hardware.FtcCRServo;
|
||||||
import org.firstinspires.ftc.teamcode.subsystems.chute.FtcDCMotor;
|
import org.firstinspires.ftc.teamcode.hardware.FtcDCMotor;
|
||||||
import org.firstinspires.ftc.teamcode.subsystems.chute.FtcPotentiometer;
|
import org.firstinspires.ftc.teamcode.hardware.FtcPotentiometer;
|
||||||
import org.firstinspires.ftc.teamcode.subsystems.chute.ChuteController;
|
import org.firstinspires.ftc.teamcode.subsystems.chute.ChuteController;
|
||||||
import org.firstinspires.ftc.teamcode.subsystems.chute.MockMotor;
|
import org.firstinspires.ftc.teamcode.mock.MockMotor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Example OpMode demonstrating chute control with real hardware.
|
* Example OpMode demonstrating chute control with real hardware.
|
||||||
@@ -48,10 +48,10 @@ public class ChuteOpMode extends LinearOpMode {
|
|||||||
// Create motor adapter — either DcMotor or CRServo
|
// Create motor adapter — either DcMotor or CRServo
|
||||||
MockMotor motor;
|
MockMotor motor;
|
||||||
if (USE_SERVO) {
|
if (USE_SERVO) {
|
||||||
CRServo chuteServo = hardwareMap.get(CRServo.class, "chute_servo");
|
FtcCRServo chuteServo = hardwareMap.get(CRServo.class, "chute_servo");
|
||||||
motor = new FtcCRServo(chuteServo);
|
motor = new FtcCRServo(chuteServo);
|
||||||
} else {
|
} else {
|
||||||
DcMotor chuteMotor = hardwareMap.get(DcMotor.class, "chute_motor");
|
FtcDCMotor chuteMotor = hardwareMap.get(DcMotor.class, "chute_motor");
|
||||||
motor = new FtcDCMotor(chuteMotor);
|
motor = new FtcDCMotor(chuteMotor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user