fix: do not consider control inputs from faulted controllers

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
Octol1ttle · May 17, 2024 · ab14a8c · ab14a8c
1 parent 1044950
commit ab14a8c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/api/IPitchController.java b/src/main/java/ru/octol1ttle/flightassistant/computers/api/IPitchController.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.Nullable;
 
-public interface IPitchController {
+public interface IPitchController extends IComputer {
     /**
      * Gets the target pitch that this controller wants
      * @return a {@link ControlInput} with {@link ControlInput#target} being the target pitch

diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/impl/autoflight/HeadingController.java b/src/main/java/ru/octol1ttle/flightassistant/computers/impl/autoflight/HeadingController.java
@@ -34,6 +34,9 @@ public void tick() {
         }
         List<ControlInput> inputs = new ArrayList<>();
         for (IHeadingController controller : controllers) {
+            if (ComputerRegistry.isFaulted(controller.getClass())) {
+                continue;
+            }
             ControlInput input = controller.getHeadingInput();
             if (input != null) {
                 inputs.add(input);

diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/impl/autoflight/PitchController.java b/src/main/java/ru/octol1ttle/flightassistant/computers/impl/autoflight/PitchController.java
@@ -41,6 +41,9 @@ public void tick() {
 
         List<ControlInput> inputs = new ArrayList<>();
         for (IPitchController controller : controllers) {
+            if (ComputerRegistry.isFaulted(controller.getClass())) {
+                continue;
+            }
             ControlInput input = controller.getPitchInput();
             if (input != null) {
                 inputs.add(input);

diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/impl/autoflight/RollController.java b/src/main/java/ru/octol1ttle/flightassistant/computers/impl/autoflight/RollController.java
@@ -55,6 +55,9 @@ public void tick() {
 
         List<ControlInput> inputs = new ArrayList<>();
         for (IRollController controller : controllers) {
+            if (ComputerRegistry.isFaulted(controller.getClass())) {
+                continue;
+            }
             ControlInput input = controller.getRollInput();
             if (input != null) {
                 inputs.add(input);

diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/impl/safety/PitchLimitComputer.java b/src/main/java/ru/octol1ttle/flightassistant/computers/impl/safety/PitchLimitComputer.java
@@ -47,7 +47,7 @@ public Pair<Float, Float> getSafePitches(Predicate<ComputerConfig.ProtectionMode
         float minimum = -90.0f;
         float maximum = 90.0f;
         for (IPitchLimiter limiter : limiters) {
-            if (!predicate.test(limiter.getProtectionMode()) || ComputerRegistry.isFaulted(limiter.getClass())) {
+            if (ComputerRegistry.isFaulted(limiter.getClass()) || !predicate.test(limiter.getProtectionMode())) {
                 continue;
             }
 
@@ -60,7 +60,7 @@ public Pair<Float, Float> getSafePitches(Predicate<ComputerConfig.ProtectionMode
 
     public boolean blockPitchChange(Direction direction, Predicate<ComputerConfig.ProtectionMode> predicate) {
         for (IPitchLimiter limiter : limiters) {
-            if (!predicate.test(limiter.getProtectionMode()) || ComputerRegistry.isFaulted(limiter.getClass())) {
+            if (ComputerRegistry.isFaulted(limiter.getClass()) || !predicate.test(limiter.getProtectionMode())) {
                 continue;
             }