Call Flap Controller

Ben-Mertz · Nov 15, 2019 · ca9f165 · ca9f165
1 parent e8d0581
commit ca9f165
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/Controllers.f90 b/src/Controllers.f90
@@ -349,15 +349,16 @@ SUBROUTINE FlapControl(avrSWAP, CntrPar, LocalVar, objInst)
         TYPE(ObjectInstances), INTENT(INOUT)      :: objInst
 
         ! Flap control
-
-        LocalVar%Flp_Angle(1) = CntrPar%Flp_Angle * D2R
-        LocalVar%Flp_Angle(2) = CntrPar%Flp_Angle * D2R
-        LocalVar%Flp_Angle(3) = CntrPar%Flp_Angle * D2R
-
-        ! Send to AVRSwap
-        avrSWAP(120) = LocalVar%Flp_Angle(1)
-        avrSWAP(121) = LocalVar%Flp_Angle(2)
-        avrSWAP(122) = LocalVar%Flp_Angle(3)
-
+        IF (CntrPar%Flp_Mode) THEN
+            LocalVar%Flp_Angle(1) = CntrPar%Flp_Angle * D2R
+            LocalVar%Flp_Angle(2) = CntrPar%Flp_Angle * D2R
+            LocalVar%Flp_Angle(3) = CntrPar%Flp_Angle * D2R
+            ! Send to AVRSwap
+            avrSWAP(120) = LocalVar%Flp_Angle(1)
+            avrSWAP(121) = LocalVar%Flp_Angle(2)
+            avrSWAP(122) = LocalVar%Flp_Angle(3)
+        ELSE
+            RETURN
+        ENDIF
     END SUBROUTINE FlapControl
 END MODULE Controllers
diff --git a/src/DISCON.F90 b/src/DISCON.F90
@@ -73,7 +73,8 @@ SUBROUTINE DISCON(avrSWAP, aviFAIL, accINFILE, avcOUTNAME, avcMSG) BIND (C, NAME
     CALL VariableSpeedControl(avrSWAP, CntrPar, LocalVar, objInst)
     CALL PitchControl(avrSWAP, CntrPar, LocalVar, objInst)
     CALL YawRateControl(avrSWAP, CntrPar, LocalVar, objInst)
-
+    CALL FlapControl(avrSWAP, CntrPar, LocalVar, objInst)
+
     CALL Debug(LocalVar, CntrPar, avrSWAP, RootName, SIZE(avcOUTNAME))
 END IF