Merge remote-tracking branch 'origin/master'

BaronClaps · Sep 25, 2024 · b15ba2f · b15ba2f
2 parents 9b12cd8 + dc9743f
commit b15ba2f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/TeamCode/src/main/java/indubitables/config/subsystem/LiftSubsystem.java b/TeamCode/src/main/java/indubitables/config/subsystem/LiftSubsystem.java
@@ -29,6 +29,7 @@ public LiftSubsystem(HardwareMap hardwareMap, Telemetry telemetry) {
         this.telemetry = telemetry;
         this.telemetry = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
         lift = hardwareMap.get(DcMotor.class, "lift");
+        lift.setDirection(DcMotor.Direction.REVERSE);
         lift.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
         lift.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
 

diff --git a/TeamCode/src/main/java/indubitables/config/util/RobotConstants.java b/TeamCode/src/main/java/indubitables/config/util/RobotConstants.java
@@ -10,8 +10,8 @@ public class RobotConstants {
     public static double intakeSpinOutPwr = -0.25;
     public static double intakeSpinStopPwr = 0;
     public static double intakePivotTransferPos= 0.965;
-    public static double intakePivotGroundPos = 0.57;
-    public static double boxTransferPos= 0.9;
+    public static double intakePivotGroundPos = 0.4;
+    public static double boxTransferPos= 0.95;
     public static double boxScoringPos = 0.5;
     public static int liftZeroPos = 0;
     public static int liftToHumanPlayerPos = 750;

diff --git a/TeamCode/src/main/java/indubitables/opmode/PID_Test.java b/TeamCode/src/main/java/indubitables/opmode/PID_Test.java
@@ -83,7 +83,7 @@ public class PID_Test extends OpMode {
     public void init() {
         liftPID = new PIDController(p, i, d);
         telemetry = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
-        lift = hardwareMap.get(DcMotor.class, "extend");
+        lift = hardwareMap.get(DcMotor.class, "lift");
         lift.setDirection(DcMotorSimple.Direction.REVERSE);
     }
 

diff --git a/build.common.gradle b/build.common.gradle
@@ -47,10 +47,6 @@ android {
         }
     }
 
-    aaptOptions {
-        noCompress "tflite"
-    }
-
     defaultConfig {
         signingConfig signingConfigs.debug
         applicationId 'com.qualcomm.ftcrobotcontroller'