From 352b3d0f579e804d4f0bf7ab84de39e5e4ce707d Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Fri, 22 Sep 2023 23:38:04 -0500 Subject: [PATCH] WIP: RevHubTestSuite: eager return if testComplete in state is true. --- .../diagnostics/rev_hub_test_suite/RevHubTestSuiteEngine.java | 1 + .../states/RevHubTestSuiteAnalogTestsState.java | 4 ++++ .../states/RevHubTestSuiteMotorTestsState.java | 3 +++ .../states/RevHubTestSuiteServoTestsState.java | 3 +++ 4 files changed, 11 insertions(+) diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/RevHubTestSuiteEngine.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/RevHubTestSuiteEngine.java index ee512a5..1aa5374 100644 --- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/RevHubTestSuiteEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/RevHubTestSuiteEngine.java @@ -22,6 +22,7 @@ public class RevHubTestSuiteEngine extends CyberarmEngine { this.robot = new RevHubTestSuiteRobot(); addState(new RevHubTestSuiteHubSelectionState(robot)); + addState(new RevHubTestSuiteMotorTestsState(robot)); addState(new RevHubTestSuiteServoTestsState(robot)); addState(new RevHubTestSuiteAnalogTestsState(robot)); diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteAnalogTestsState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteAnalogTestsState.java index f3f5140..08990bc 100644 --- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteAnalogTestsState.java +++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteAnalogTestsState.java @@ -10,5 +10,9 @@ public class RevHubTestSuiteAnalogTestsState extends RevTestSuiteTestState { @Override public void exec() { super.exec(); + + if (testComplete) + return; + } } diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java index 0d2b3ea..d61e9b9 100644 --- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java +++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java @@ -33,6 +33,9 @@ public class RevHubTestSuiteMotorTestsState extends RevTestSuiteTestState { public void exec() { super.exec(); + if (testComplete) + return; + switch (stage) { case MOTOR_ENCODER_STEADY: { test_encoder_steady(); diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteServoTestsState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteServoTestsState.java index 93c064e..9cf1351 100644 --- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteServoTestsState.java +++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteServoTestsState.java @@ -24,6 +24,9 @@ public class RevHubTestSuiteServoTestsState extends RevTestSuiteTestState { public void exec() { super.exec(); + if (testComplete) + return; + test_servos(); if (stage.ordinal() > STAGE.SERVO_SWEEP.ordinal()) {