Skip to content

Commit ae636c1

Browse files
kevinfreikevinfrei
committed
Removed the old Vision stuff, migrated to new Vision
1 parent b241d23 commit ae636c1

26 files changed

Lines changed: 265 additions & 812 deletions

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/Robot.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import org.firstinspires.ftc.twenty403.subsystem.ClawSubsystem;
88
import org.firstinspires.ftc.twenty403.subsystem.DrivebaseSubsystem;
99
import org.firstinspires.ftc.twenty403.subsystem.LiftSubsystem;
10-
import org.firstinspires.ftc.twenty403.subsystem.OdoSubsystem;
1110
import org.firstinspires.ftc.twenty403.subsystem.VisionSubsystem;
11+
import org.firstinspires.ftc.twenty403.subsystem.OdoSubsystem;
1212

1313
public class Robot implements Loggable {
1414

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/command/VisionCommand.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/command/VisionDuringTeleCommand.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/command/autonomous/left/AutoLeftParkingSelectionCycleCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public class AutoLeftParkingSelectionCycleCommand extends ChoiceCommand {
88

99
public AutoLeftParkingSelectionCycleCommand(Robot r) {
1010
super(
11-
new Pair<>(r.visionSystem.visionPipeline::left, new AutoLeftCycleLeft(r)),
12-
new Pair<>(r.visionSystem.visionPipeline::middle, new AutoLeftCycleMiddle(r)),
13-
new Pair<>(r.visionSystem.visionPipeline::right, new AutoLeftCycleRight(r))
11+
new Pair<>(r.visionSystem::left, new AutoLeftCycleLeft(r)),
12+
new Pair<>(r.visionSystem::middle, new AutoLeftCycleMiddle(r)),
13+
new Pair<>(r.visionSystem::right, new AutoLeftCycleRight(r))
1414
);
1515
}
1616
}

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/command/autonomous/left/AutoLeftParkingSelectionFullCycleCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ public class AutoLeftParkingSelectionFullCycleCommand extends ChoiceCommand {
1111
public AutoLeftParkingSelectionFullCycleCommand(Robot robot, DoubleSupplier currOpModeRunTime) {
1212
super(
1313
new Pair<>(
14-
robot.visionSystem.visionPipeline::left,
14+
robot.visionSystem::left,
1515
new AutoLeftFullCycle(
1616
robot,
1717
AutoConstants.Left.E_JUNCTION_TO_LEFT_PARK,
1818
currOpModeRunTime
1919
)
2020
),
2121
new Pair<>(
22-
robot.visionSystem.visionPipeline::middle,
22+
robot.visionSystem::middle,
2323
new AutoLeftFullCycle(
2424
robot,
2525
AutoConstants.Left.E_JUNCTION_TO_MIDDLE_PARK,
2626
currOpModeRunTime
2727
)
2828
),
2929
new Pair<>(
30-
robot.visionSystem.visionPipeline::right,
30+
robot.visionSystem::right,
3131
new AutoLeftFullCycle(
3232
robot,
3333
AutoConstants.Left.E_JUNCTION_TO_RIGHT_PARK,

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/command/autonomous/left/AutoLeftParkingSelectionJustParkCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public class AutoLeftParkingSelectionJustParkCommand extends ChoiceCommand {
88

99
public AutoLeftParkingSelectionJustParkCommand(Robot r) {
1010
super(
11-
new Pair<>(r.visionSystem.visionPipeline::left, new AutoLeftParkLeft(r)),
12-
new Pair<>(r.visionSystem.visionPipeline::middle, new AutoLeftParkMiddle(r)),
13-
new Pair<>(r.visionSystem.visionPipeline::right, new AutoLeftParkRight(r))
11+
new Pair<>(r.visionSystem::left, new AutoLeftParkLeft(r)),
12+
new Pair<>(r.visionSystem::middle, new AutoLeftParkMiddle(r)),
13+
new Pair<>(r.visionSystem::right, new AutoLeftParkRight(r))
1414
);
1515
}
1616
}

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/command/autonomous/left/AutoLeftParkingSelectionPreLoadCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public class AutoLeftParkingSelectionPreLoadCommand extends ChoiceCommand {
88

99
public AutoLeftParkingSelectionPreLoadCommand(Robot r) {
1010
super(
11-
new Pair<>(r.visionSystem.visionPipeline::left, new AutoLeftPreLoadLeft(r)),
12-
new Pair<>(r.visionSystem.visionPipeline::middle, new AutoLeftPreLoadMiddle(r)),
13-
new Pair<>(r.visionSystem.visionPipeline::right, new AutoLeftPreLoadRight(r))
11+
new Pair<>(r.visionSystem::left, new AutoLeftPreLoadLeft(r)),
12+
new Pair<>(r.visionSystem::middle, new AutoLeftPreLoadMiddle(r)),
13+
new Pair<>(r.visionSystem::right, new AutoLeftPreLoadRight(r))
1414
);
1515
}
1616
}

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/command/autonomous/right/AutoRightParkingSelectionCycleCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public class AutoRightParkingSelectionCycleCommand extends ChoiceCommand {
88

99
public AutoRightParkingSelectionCycleCommand(Robot r) {
1010
super(
11-
new Pair<>(r.visionSystem.visionPipeline::left, new AutoRightCycleLeft(r)),
12-
new Pair<>(r.visionSystem.visionPipeline::middle, new AutoRightCycleMiddle(r)),
13-
new Pair<>(r.visionSystem.visionPipeline::right, new AutoRightCycleRight(r))
11+
new Pair<>(r.visionSystem::left, new AutoRightCycleLeft(r)),
12+
new Pair<>(r.visionSystem::middle, new AutoRightCycleMiddle(r)),
13+
new Pair<>(r.visionSystem::right, new AutoRightCycleRight(r))
1414
);
1515
}
1616
}

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/command/autonomous/right/AutoRightParkingSelectionFullCycleCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ public AutoRightParkingSelectionFullCycleCommand(
1414
) {
1515
super(
1616
new Pair<>(
17-
robot.visionSystem.visionPipeline::left,
17+
robot.visionSystem::left,
1818
new AutoRightFullCycle(
1919
robot,
2020
AutoConstants.Right.W_JUNCTION_TO_LEFT_PARK,
2121
currOpModeRunTime
2222
)
2323
),
2424
new Pair<>(
25-
robot.visionSystem.visionPipeline::middle,
25+
robot.visionSystem::middle,
2626
new AutoRightFullCycle(
2727
robot,
2828
AutoConstants.Right.W_JUNCTION_TO_MIDDLE_PARK,
2929
currOpModeRunTime
3030
)
3131
),
3232
new Pair<>(
33-
robot.visionSystem.visionPipeline::right,
33+
robot.visionSystem::right,
3434
new AutoRightFullCycle(
3535
robot,
3636
AutoConstants.Right.W_JUNCTION_TO_RIGHT_PARK,

‎Twenty403/src/main/java/org/firstinspires/ftc/twenty403/command/autonomous/right/AutoRightParkingSelectionJustParkCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public class AutoRightParkingSelectionJustParkCommand extends ChoiceCommand {
88

99
public AutoRightParkingSelectionJustParkCommand(Robot r) {
1010
super(
11-
new Pair<>(r.visionSystem.visionPipeline::left, new AutoRightParkingLeft(r)),
12-
new Pair<>(r.visionSystem.visionPipeline::middle, new AutoRightParkingMiddle(r)),
13-
new Pair<>(r.visionSystem.visionPipeline::right, new AutoRightParkingRight(r))
11+
new Pair<>(r.visionSystem::left, new AutoRightParkingLeft(r)),
12+
new Pair<>(r.visionSystem::middle, new AutoRightParkingMiddle(r)),
13+
new Pair<>(r.visionSystem::right, new AutoRightParkingRight(r))
1414
);
1515
}
1616
}

0 commit comments

Comments
 (0)