Merge branch 'develop' into eggert/acs-ctrl-action-cmds

2023-02-24 09:18:25 +01:00
parent 89518a035a 104d9647fe
commit 7392012a00
45 changed files with 852 additions and 475 deletions
--- a/mission/controller/acs/Guidance.cpp
+++ b/mission/controller/acs/Guidance.cpp
@ -111,8 +111,7 @@ void Guidance::targetQuatPtgSingleAxis(timeval now, double posSatE[3], double ve
      if (sightAngleSun < critSightAngle) {
        strBlindAvoidFlag = true;
      }
-    }
-    else {
+    } else {
      if (sightAngleSun < blindEnd * exclAngle) {
        double normBlindRefRate = acsParameters.targetModeControllerParameters.blindRotRate;
        double blindRefRate[3] = {0, 0, 0};