Skip to content

Commit 8b255ef

Browse files
Dear lord do not mess with the sloth config if you know whats good for you
1 parent bb3aeec commit 8b255ef

5 files changed

Lines changed: 19 additions & 16 deletions

File tree

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/OpModes/TeleOps/BlueNoAutoTele.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,10 @@ public class BlueNoAutoTele extends OpMode {
4545
@Override
4646
public void init() {
4747
follower = Constants.createFollower(hardwareMap);
48-
// follower.setStartingPose(new Pose(135.62616822429905, 8.635514018691586, Math.toRadians(0)));
49-
follower.setStartingPose(new Pose(135.6261682242990, 8.635514018691586, Math.toRadians(0)));
48+
follower.setStartingPose(new Pose(144, 0, Math.toRadians(0)));
5049

51-
odoAim = new OdoAimBlue(hardwareMap, follower, true);
52-
flywheel = new BlueTeleFlywheelConstants(hardwareMap, follower, true);
50+
odoAim = new OdoAimBlue(hardwareMap, follower, false);
51+
flywheel = new BlueTeleFlywheelConstants(hardwareMap, follower, false);
5352

5453
sensors = new ColorSensors();
5554
sensors.init(hardwareMap);
@@ -206,6 +205,8 @@ public void loop() {
206205

207206
telemetry.addData("Turret Tracking Enabled", turretTrackingEnabled);
208207
telemetry.addData("Turret Offset (deg)", odoAim.getOffsetDegrees());
208+
telemetry.addData("target position X", odoAim.getTargetPose().getX());
209+
telemetry.addData("target position X", odoAim.getTargetPose().getY());
209210
telemetry.update();
210211
}
211212
}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/OpModes/TeleOps/RedNoAutoTele.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class RedNoAutoTele extends OpMode {
4545
@Override
4646
public void init() {
4747
follower = Constants.createFollower(hardwareMap);
48-
follower.setStartingPose(new Pose(8.672897196261653, 9.30841121495326, Math.toRadians(0)));
48+
follower.setStartingPose(new Pose(8.672897196261653, 9.30841121495326, Math.toRadians(180)));
4949
odoAim = new OdoAim(hardwareMap, follower, true);
5050
flywheel = new TeleFlywheelConstants(hardwareMap, follower, true);
5151

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Subsystems/FlywheelConstants/TeleFlywheelConstants.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public class TeleFlywheelConstants {
1919
// ================= LINEAR REGRESSION CONSTANTS =================
2020

2121
// RPM Regression
22-
private static final double RPM_SLOPE = 20;
23-
private static final double RPM_INTERCEPT = 1100;
22+
private static final double RPM_SLOPE = 18.5;
23+
private static final double RPM_INTERCEPT = 1000;
2424

2525
// Hood Regression
2626
private static final double HOOD_SLOPE = -0.550766;
@@ -105,7 +105,7 @@ private double getRegressionRPM(double distance) {
105105
// ================= HOOD REGRESSION =================
106106
private double getRegressionHood(double distance) {
107107
double angle = HOOD_SLOPE * distance + HOOD_INTERCEPT;
108-
return Math.max(-15, Math.min(120, angle));
108+
return Math.max(0, Math.min(120, angle));
109109
}
110110

111111
// ================= MOTOR CONTROL =================

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Subsystems/OdoAim.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ public class OdoAim {
3232
private double manualOffsetRad = 0.0;
3333
public static double OFFSET_STEP_RAD = Math.toRadians(3.0);
3434

35-
// ✅ TRUE CONSTANTS (never modified directly)
3635
public static final Pose REDTARGET = new Pose(150, 130);
37-
public static final Pose REDTARGET_TELE = new Pose(150, 130);
36+
public static final Pose REDTARGET_TELE = new Pose(125, 137);
3837

3938
private final PIDFController limelightPIDF =
4039
new PIDFController(0.06, 0.0, 0.008, 0.0);
@@ -131,21 +130,21 @@ public void aim() {
131130
public void changeTargetX(boolean dpadRight, boolean dpadLeft) {
132131
if (dpadRight) {
133132
// Example: move turret target slightly forward in X
134-
targetPose = new Pose(targetPose.getX() + 3, targetPose.getY());
133+
targetPose = new Pose(targetPose.getX() - 3, targetPose.getY());
135134
}
136135
if (dpadLeft) {
137136
// Example: move turret target slightly backward in X
138-
targetPose = new Pose(targetPose.getX() - 3, targetPose.getY());
137+
targetPose = new Pose(targetPose.getX() + 3, targetPose.getY());
139138
}
140139
}
141140
public void changeTargetY(boolean dpadUp, boolean dpadDown) {
142141
if (dpadUp) {
143142
// Example: move turret target slightly forward in Y
144-
targetPose = new Pose(targetPose.getX() , targetPose.getY() + 3);
143+
targetPose = new Pose(targetPose.getX() , targetPose.getY() - 3);
145144
}
146145
if (dpadDown) {
147-
// Example: move turret target slightly backward in X
148-
targetPose = new Pose(targetPose.getX() , targetPose.getY() - 3);
146+
// Example: move turret target slightly backward in Y
147+
targetPose = new Pose(targetPose.getX() , targetPose.getY() + 3);
149148
}
150149
}
151150

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Subsystems/OdoAimBlue.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class OdoAimBlue {
3333
public static double OFFSET_STEP_RAD = Math.toRadians(3.0);
3434

3535
Pose REDTARGET = new Pose(152.0 , 146.0 );
36-
Pose BLUETARGET = new Pose(-3, 140.0);
36+
Pose BLUETARGET = new Pose(21, 138.0);
3737

3838
private final PIDFController limelightPIDF =
3939
new PIDFController(0.06, 0.0, 0.008, 0.0);
@@ -204,4 +204,7 @@ public void restoreFromStorage(double storedTurretRadians) {
204204

205205
manualOffsetRad = 0.0;
206206
}
207+
public Pose getTargetPose(){
208+
return targetPose;
209+
}
207210
}

0 commit comments

Comments
 (0)