Merge remote-tracking branch 'origin/LimelightCoast'
This commit is contained in:
@@ -59,6 +59,9 @@ public class Turret {
|
||||
private int prevPipeline = -1;
|
||||
PIDController bearingPID;
|
||||
|
||||
public int llCoast = 0;
|
||||
public int LL_COAST_TICKS = 60;
|
||||
|
||||
public Turret(Robot rob, MultipleTelemetry tele, Limelight3A cam) {
|
||||
this.TELE = tele;
|
||||
this.robot = rob;
|
||||
@@ -277,6 +280,12 @@ public class Turret {
|
||||
if (result.isValid() && !lockOffset && limelightUsed) {
|
||||
currentTrackOffset += bearingAlign(result);
|
||||
currentTrackCount++;
|
||||
|
||||
TELE.addData("LL Tracking: ", llCoast);
|
||||
|
||||
// Assume the last tracked value is always better than
|
||||
// any previous value, even if its not fully aligned.
|
||||
llCoast = LL_COAST_TICKS;
|
||||
// double bearingError = Math.abs(tagBearingDeg);
|
||||
//
|
||||
// if (bearingError > cameraBearingEqual) {
|
||||
@@ -307,9 +316,15 @@ public class Turret {
|
||||
// if (currentTrackCount > 20) {
|
||||
// offset = currentTrackOffset;
|
||||
// }
|
||||
lightColor = Color.LightRed;
|
||||
currentTrackOffset = 0.0;
|
||||
currentTrackCount = 0;
|
||||
if (llCoast <= 0) {
|
||||
TELE.addData("LL No Track: ", llCoast);
|
||||
lightColor = Color.LightRed;
|
||||
currentTrackOffset = 0.0;
|
||||
currentTrackCount = 0;
|
||||
} else {
|
||||
TELE.addData("LL Coasting: ", llCoast);
|
||||
llCoast--;
|
||||
}
|
||||
}
|
||||
|
||||
// Apply accumulated offset
|
||||
|
||||
Reference in New Issue
Block a user