Merge remote-tracking branch 'origin/master'

This commit is contained in:
SpencerPiha
2022-12-03 15:55:54 -06:00
2 changed files with 6 additions and 6 deletions

View File

@@ -105,19 +105,19 @@ public class PhoenixBot1 {
frontLeftDrive.setDirection(DcMotorSimple.Direction.REVERSE);
frontLeftDrive.setMode(DcMotor.RunMode.STOP_AND_RESET_ENCODER);
frontLeftDrive.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
frontLeftDrive.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
frontRightDrive.setDirection(DcMotorSimple.Direction.FORWARD);
frontRightDrive.setMode(DcMotor.RunMode.STOP_AND_RESET_ENCODER);
frontRightDrive.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
frontRightDrive.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
backLeftDrive.setDirection(DcMotorSimple.Direction.REVERSE);
backLeftDrive.setMode(DcMotor.RunMode.STOP_AND_RESET_ENCODER);
backLeftDrive.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
backLeftDrive.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
backRightDrive.setDirection(DcMotorSimple.Direction.FORWARD);
backRightDrive.setMode(DcMotor.RunMode.STOP_AND_RESET_ENCODER);
backRightDrive.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
backRightDrive.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
HighRiserLeft.setDirection(Servo.Direction.REVERSE);

View File

@@ -88,13 +88,13 @@ public class PhoenixTeleOPState extends CyberarmState {
}
if (Math.abs(engine.gamepad1.left_stick_y) > 0.05) {
drivePower = engine.gamepad1.left_stick_y * 0.35;
drivePower = engine.gamepad1.left_stick_y * 0.75;
robot.backRightDrive.setPower(drivePower);
robot.frontRightDrive.setPower(drivePower);
}
if (Math.abs(engine.gamepad1.right_stick_y) > 0.05) {
drivePower = engine.gamepad1.right_stick_y * 0.35;
drivePower = engine.gamepad1.right_stick_y * 0.75;
robot.backLeftDrive.setPower(drivePower);
robot.frontLeftDrive.setPower(drivePower);
}