From b02cc4e61fbef5ca9b3309e3968122085814379f Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Sat, 10 Oct 2020 20:20:24 +0100
Subject: [PATCH] Hide all FAC warnings on PFD when FAC1+2 failed, replace with
 SPD LIM red alert

---
 Models/Instruments/PFD/PFD.nas     | 586 +++++++++++++++--------------
 Models/Instruments/PFD/res/pfd.svg |  30 +-
 2 files changed, 324 insertions(+), 292 deletions(-)

diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas
index dac46673..4ee867ef 100644
--- a/Models/Instruments/PFD/PFD.nas
+++ b/Models/Instruments/PFD/PFD.nas
@@ -1210,7 +1210,13 @@ var canvas_PFD_1 = {
 			}
 			
 			me["ASI_scale"].setTranslation(0, me.ASI * 6.6);
-			me["ASI_max"].setTranslation(0, me.ASImax * -6.6);
+			
+			if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
+				me["ASI_max"].setTranslation(0, me.ASImax * -6.6);
+				me["ASI_max"].show();
+			} else {
+				me["ASI_max"].hide();
+			}
 			
 			if (!fmgc.FMGCInternal.takeoffState and fmgc.FMGCInternal.phase >= 1 and !wow1.getValue() and !wow2.getValue()) {
 				me.FMGC_vls = fmgc.FMGCInternal.vls_min;
@@ -1245,16 +1251,24 @@ var canvas_PFD_1 = {
 				} else {
 					me.ALPHAvsw = me.FMGC_vsw - 30 - me.ASI;
 				}
-				me["VLS_min"].setTranslation(0, me.VLSmin * -6.6);
-				me["VLS_min"].show();
-				me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6);
-				me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6);
-				me["ALPHA_SW"].setTranslation(0, me.ALPHAvsw * -6.6);
-				if (getprop("/it-fbw/law") == 0) {
-					me["ALPHA_PROT"].show();
-					me["ALPHA_MAX"].show();
-					me["ALPHA_SW"].hide();
+				
+				if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
+					me["VLS_min"].setTranslation(0, me.VLSmin * -6.6);
+					me["VLS_min"].show();
+					if (getprop("/it-fbw/law") == 0) {
+						me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6);
+						me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6);
+						me["ALPHA_PROT"].show();
+						me["ALPHA_MAX"].show();
+						me["ALPHA_SW"].hide();
+					} else {
+						me["ALPHA_PROT"].hide();
+						me["ALPHA_MAX"].hide();
+						me["ALPHA_SW"].setTranslation(0, me.ALPHAvsw * -6.6);
+						me["ALPHA_SW"].show();
+					}
 				} else {
+					me["VLS_min"].hide();
 					me["ALPHA_PROT"].hide();
 					me["ALPHA_MAX"].hide();
 					me["ALPHA_SW"].show();
@@ -1411,145 +1425,147 @@ var canvas_PFD_1 = {
 				}
 			}
 			
-			if (flap_config.getValue() == '1') {
-				me["F_target"].hide();
-				me["clean_speed"].hide();
+			if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
+				if (flap_config.getValue() == '1') {
+					me["F_target"].hide();
+					me["clean_speed"].hide();
+					
+					tgt_S = fmgc.FMGCInternal.slat;
 				
-				tgt_S = fmgc.FMGCInternal.slat;
-			
-				if (tgt_S <= 30) {
-					me.Strgt = 0 - me.ASI;
-				} else if (tgt_S >= 420) {
-					me.Strgt = 390 - me.ASI;
-				} else {
-					me.Strgt = tgt_S - 30 - me.ASI;
-				}
-			
-				me.SPDstrgtdiff = tgt_S - ind_spd;
-			
-				if (me.SPDstrgtdiff >= -42 and me.SPDstrgtdiff <= 42) {
-					me["S_target"].show();
-					me["S_target"].setTranslation(0, me.Strgt * -6.6);
+					if (tgt_S <= 30) {
+						me.Strgt = 0 - me.ASI;
+					} else if (tgt_S >= 420) {
+						me.Strgt = 390 - me.ASI;
+					} else {
+						me.Strgt = tgt_S - 30 - me.ASI;
+					}
+				
+					me.SPDstrgtdiff = tgt_S - ind_spd;
+				
+					if (me.SPDstrgtdiff >= -42 and me.SPDstrgtdiff <= 42 and gear_agl.getValue() >= 400) {
+						me["S_target"].show();
+						me["S_target"].setTranslation(0, me.Strgt * -6.6);
+					} else {
+						me["S_target"].hide();
+					}
+					
+					tgt_flap = 200;
+					me.flaptrgt = tgt_flap - 30 - me.ASI;
+					
+					me.SPDflaptrgtdiff = tgt_flap - ind_spd;
+				
+					if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
+						me["flap_max"].show();
+						me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
+					} else {
+						me["flap_max"].hide();
+					}
+				} else if (flap_config.getValue() == '2') {
+					me["S_target"].hide();
+					me["clean_speed"].hide();
+					
+					tgt_F = fmgc.FMGCInternal.flap2;
+					
+					if (tgt_F <= 30) {
+						me.Ftrgt = 0 - me.ASI;
+					} else if (tgt_F >= 420) {
+						me.Ftrgt = 390 - me.ASI;
+					} else {
+						me.Ftrgt = tgt_F - 30 - me.ASI;
+					}
+				
+					me.SPDftrgtdiff = tgt_F - ind_spd;
+				
+					if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42 and gear_agl.getValue() >= 400) {
+						me["F_target"].show();
+						me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
+					} else {
+						me["F_target"].hide();
+					}
+					
+					tgt_flap = 185;
+					me.flaptrgt = tgt_flap - 30 - me.ASI;
+					
+					me.SPDflaptrgtdiff = tgt_flap - ind_spd;
+				
+					if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
+						me["flap_max"].show();
+						me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
+					} else {
+						me["flap_max"].hide();
+					}
+				} else if (flap_config.getValue() == '3') {
+					me["S_target"].hide();
+					me["clean_speed"].hide();
+					
+					tgt_F = fmgc.FMGCInternal.flap3;
+						
+					if (tgt_F <= 30) {
+						me.Ftrgt = 0 - me.ASI;
+					} else if (tgt_F >= 420) {
+						me.Ftrgt = 390 - me.ASI;
+					} else {
+						me.Ftrgt = tgt_F - 30 - me.ASI;
+					}
+				
+					me.SPDftrgtdiff = tgt_F - ind_spd;
+				
+					if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42 and gear_agl.getValue() >= 400) {
+						me["F_target"].show();
+						me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
+					} else {
+						me["F_target"].hide();
+					}
+					
+					tgt_flap = 177;
+					me.flaptrgt = tgt_flap - 30 - me.ASI;
+					
+					me.SPDflaptrgtdiff = tgt_flap - ind_spd;
+				
+					if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
+						me["flap_max"].show();
+						me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
+					} else {
+						me["flap_max"].hide();
+					}
+				} else if (flap_config.getValue() == '4') {
+					me["S_target"].hide();
+					me["F_target"].hide();
+					me["clean_speed"].hide();	
+					me["flap_max"].hide();
 				} else {
 					me["S_target"].hide();
-				}
-				
-				tgt_flap = 200;
-				me.flaptrgt = tgt_flap - 30 - me.ASI;
-				
-				me.SPDflaptrgtdiff = tgt_flap - ind_spd;
-			
-				if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
-					me["flap_max"].show();
-					me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
-				} else {
-					me["flap_max"].hide();
-				}
-			} else if (flap_config.getValue() == '2') {
-				me["S_target"].hide();
-				me["clean_speed"].hide();
-				
-				tgt_F = fmgc.FMGCInternal.flap2;
-				
-				if (tgt_F <= 30) {
-					me.Ftrgt = 0 - me.ASI;
-				} else if (tgt_F >= 420) {
-					me.Ftrgt = 390 - me.ASI;
-				} else {
-					me.Ftrgt = tgt_F - 30 - me.ASI;
-				}
-			
-				me.SPDftrgtdiff = tgt_F - ind_spd;
-			
-				if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42) {
-					me["F_target"].show();
-					me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
-				} else {
 					me["F_target"].hide();
-				}
-				
-				tgt_flap = 185;
-				me.flaptrgt = tgt_flap - 30 - me.ASI;
-				
-				me.SPDflaptrgtdiff = tgt_flap - ind_spd;
-			
-				if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
-					me["flap_max"].show();
-					me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
-				} else {
-					me["flap_max"].hide();
-				}
-			} else if (flap_config.getValue() == '3') {
-				me["S_target"].hide();
-				me["clean_speed"].hide();
-				
-				tgt_F = fmgc.FMGCInternal.flap3;
 					
-				if (tgt_F <= 30) {
-					me.Ftrgt = 0 - me.ASI;
-				} else if (tgt_F >= 420) {
-					me.Ftrgt = 390 - me.ASI;
-				} else {
-					me.Ftrgt = tgt_F - 30 - me.ASI;
-				}
-			
-				me.SPDftrgtdiff = tgt_F - ind_spd;
-			
-				if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42) {
-					me["F_target"].show();
-					me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
-				} else {
-					me["F_target"].hide();
-				}
+					tgt_clean = fmgc.FMGCInternal.clean;
+					
+					me.cleantrgt = tgt_clean - 30 - me.ASI;
+					me.SPDcleantrgtdiff = tgt_clean - ind_spd;
 				
-				tgt_flap = 177;
-				me.flaptrgt = tgt_flap - 30 - me.ASI;
+					if (me.SPDcleantrgtdiff >= -42 and me.SPDcleantrgtdiff <= 42) {
+						me["clean_speed"].show();
+						me["clean_speed"].setTranslation(0, me.cleantrgt * -6.6);
+					} else {
+						me["clean_speed"].hide();
+					}	
+					
+					tgt_flap = 230;
+					me.flaptrgt = tgt_flap - 30 - me.ASI;
+					
+					me.SPDflaptrgtdiff = tgt_flap - ind_spd;
 				
-				me.SPDflaptrgtdiff = tgt_flap - ind_spd;
-			
-				if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
-					me["flap_max"].show();
-					me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
-				} else {
-					me["flap_max"].hide();
+					if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
+						me["flap_max"].show();
+						me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
+					} else {
+						me["flap_max"].hide();
+					}
 				}
-			} else if (flap_config.getValue() == '4') {
-				me["S_target"].hide();
-				me["F_target"].hide();
-				me["clean_speed"].hide();	
-				me["flap_max"].hide();
 			} else {
 				me["S_target"].hide();
 				me["F_target"].hide();
-				
-				tgt_clean = fmgc.FMGCInternal.clean;
-				
-				me.cleantrgt = tgt_clean - 30 - me.ASI;
-				me.SPDcleantrgtdiff = tgt_clean - ind_spd;
-			
-				if (me.SPDcleantrgtdiff >= -42 and me.SPDcleantrgtdiff <= 42) {
-					me["clean_speed"].show();
-					me["clean_speed"].setTranslation(0, me.cleantrgt * -6.6);
-				} else {
-					me["clean_speed"].hide();
-				}	
-				
-				tgt_flap = 230;
-				me.flaptrgt = tgt_flap - 30 - me.ASI;
-				
-				me.SPDflaptrgtdiff = tgt_flap - ind_spd;
-			
-				if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
-					me["flap_max"].show();
-					me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
-				} else {
-					me["flap_max"].hide();
-				}
-			}
-			
-			if (gear_agl.getValue() < 400) {
-				me["S_target"].hide();
-				me["F_target"].hide();
+				me["clean_speed"].hide();
+				me["flap_max"].hide();
 			}
 			
 			me.ASItrend = dmc.DMController.DMCs[0].outputs[6].getValue() - me.ASI;
@@ -1949,7 +1965,13 @@ var canvas_PFD_2 = {
 			}
 			
 			me["ASI_scale"].setTranslation(0, me.ASI * 6.6);
-			me["ASI_max"].setTranslation(0, me.ASImax * -6.6);
+			
+			if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
+				me["ASI_max"].setTranslation(0, me.ASImax * -6.6);
+				me["ASI_max"].show();
+			} else {
+				me["ASI_max"].hide();
+			}
 			
 			if (!fmgc.FMGCInternal.takeoffState and fmgc.FMGCInternal.phase >= 1 and !wow1.getValue() and !wow2.getValue()) {
 				me.FMGC_vls = fmgc.FMGCInternal.vls_min;
@@ -1984,19 +2006,27 @@ var canvas_PFD_2 = {
 				} else {
 					me.ALPHAvsw = me.FMGC_vsw - 30 - me.ASI;
 				}
-				me["VLS_min"].setTranslation(0, me.VLSmin * -6.6);
-				me["VLS_min"].show();
-				me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6);
-				me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6);
-				me["ALPHA_SW"].setTranslation(0, me.ALPHAvsw * -6.6);
-				if (getprop("/it-fbw/law") == 0) {
-					me["ALPHA_PROT"].show();
-					me["ALPHA_MAX"].show();
-					me["ALPHA_SW"].hide();
+				
+				if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
+					me["VLS_min"].setTranslation(0, me.VLSmin * -6.6);
+					me["VLS_min"].show();
+					if (getprop("/it-fbw/law") == 0) {
+						me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6);
+						me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6);
+						me["ALPHA_PROT"].show();
+						me["ALPHA_MAX"].show();
+						me["ALPHA_SW"].hide();
+					} else {
+						me["ALPHA_PROT"].hide();
+						me["ALPHA_MAX"].hide();
+						me["ALPHA_SW"].setTranslation(0, me.ALPHAvsw * -6.6);
+						me["ALPHA_SW"].show();
+					}
 				} else {
+					me["VLS_min"].hide();
 					me["ALPHA_PROT"].hide();
 					me["ALPHA_MAX"].hide();
-					me["ALPHA_SW"].show();
+					me["ALPHA_SW"].hide();
 				}
 			}
 			
@@ -2150,145 +2180,147 @@ var canvas_PFD_2 = {
 				}
 			}
 			
-			if (flap_config.getValue() == '1') {
-				me["F_target"].hide();
-				me["clean_speed"].hide();
+			if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
+				if (flap_config.getValue() == '1') {
+					me["F_target"].hide();
+					me["clean_speed"].hide();
+					
+					tgt_S = fmgc.FMGCInternal.slat;
 				
-				tgt_S = fmgc.FMGCInternal.slat;
-			
-				if (tgt_S <= 30) {
-					me.Strgt = 0 - me.ASI;
-				} else if (tgt_S >= 420) {
-					me.Strgt = 390 - me.ASI;
-				} else {
-					me.Strgt = tgt_S - 30 - me.ASI;
-				}
-			
-				me.SPDstrgtdiff = tgt_S - ind_spd;
-			
-				if (me.SPDstrgtdiff >= -42 and me.SPDstrgtdiff <= 42) {
-					me["S_target"].show();
-					me["S_target"].setTranslation(0, me.Strgt * -6.6);
+					if (tgt_S <= 30) {
+						me.Strgt = 0 - me.ASI;
+					} else if (tgt_S >= 420) {
+						me.Strgt = 390 - me.ASI;
+					} else {
+						me.Strgt = tgt_S - 30 - me.ASI;
+					}
+				
+					me.SPDstrgtdiff = tgt_S - ind_spd;
+				
+					if (me.SPDstrgtdiff >= -42 and me.SPDstrgtdiff <= 42 and gear_agl.getValue() >= 400) {
+						me["S_target"].show();
+						me["S_target"].setTranslation(0, me.Strgt * -6.6);
+					} else {
+						me["S_target"].hide();
+					}
+					
+					tgt_flap = 200;
+					me.flaptrgt = tgt_flap - 30 - me.ASI;
+					
+					me.SPDflaptrgtdiff = tgt_flap - ind_spd;
+				
+					if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
+						me["flap_max"].show();
+						me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
+					} else {
+						me["flap_max"].hide();
+					}
+				} else if (flap_config.getValue() == '2') {
+					me["S_target"].hide();
+					me["clean_speed"].hide();
+					
+					tgt_F = fmgc.FMGCInternal.flap2;
+					
+					if (tgt_F <= 30) {
+						me.Ftrgt = 0 - me.ASI;
+					} else if (tgt_F >= 420) {
+						me.Ftrgt = 390 - me.ASI;
+					} else {
+						me.Ftrgt = tgt_F - 30 - me.ASI;
+					}
+				
+					me.SPDftrgtdiff = tgt_F - ind_spd;
+				
+					if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42 and gear_agl.getValue() >= 400) {
+						me["F_target"].show();
+						me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
+					} else {
+						me["F_target"].hide();
+					}
+					
+					tgt_flap = 185;
+					me.flaptrgt = tgt_flap - 30 - me.ASI;
+					
+					me.SPDflaptrgtdiff = tgt_flap - ind_spd;
+				
+					if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
+						me["flap_max"].show();
+						me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
+					} else {
+						me["flap_max"].hide();
+					}
+				} else if (flap_config.getValue() == '3') {
+					me["S_target"].hide();
+					me["clean_speed"].hide();
+					
+					tgt_F = fmgc.FMGCInternal.flap3;
+						
+					if (tgt_F <= 30) {
+						me.Ftrgt = 0 - me.ASI;
+					} else if (tgt_F >= 420) {
+						me.Ftrgt = 390 - me.ASI;
+					} else {
+						me.Ftrgt = tgt_F - 30 - me.ASI;
+					}
+				
+					me.SPDftrgtdiff = tgt_F - ind_spd;
+				
+					if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42 and gear_agl.getValue() >= 400) {
+						me["F_target"].show();
+						me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
+					} else {
+						me["F_target"].hide();
+					}
+					
+					tgt_flap = 177;
+					me.flaptrgt = tgt_flap - 30 - me.ASI;
+					
+					me.SPDflaptrgtdiff = tgt_flap - ind_spd;
+				
+					if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
+						me["flap_max"].show();
+						me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
+					} else {
+						me["flap_max"].hide();
+					}
+				} else if (flap_config.getValue() == '4') {
+					me["S_target"].hide();
+					me["F_target"].hide();
+					me["clean_speed"].hide();	
+					me["flap_max"].hide();
 				} else {
 					me["S_target"].hide();
-				}
-				
-				tgt_flap = 200;
-				me.flaptrgt = tgt_flap - 30 - me.ASI;
-				
-				me.SPDflaptrgtdiff = tgt_flap - ind_spd;
-			
-				if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
-					me["flap_max"].show();
-					me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
-				} else {
-					me["flap_max"].hide();
-				}
-			} else if (flap_config.getValue() == '2') {
-				me["S_target"].hide();
-				me["clean_speed"].hide();
-				
-				tgt_F = fmgc.FMGCInternal.flap2;
-				
-				if (tgt_F <= 30) {
-					me.Ftrgt = 0 - me.ASI;
-				} else if (tgt_F >= 420) {
-					me.Ftrgt = 390 - me.ASI;
-				} else {
-					me.Ftrgt = tgt_F - 30 - me.ASI;
-				}
-			
-				me.SPDftrgtdiff = tgt_F - ind_spd;
-			
-				if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42) {
-					me["F_target"].show();
-					me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
-				} else {
 					me["F_target"].hide();
-				}
-				
-				tgt_flap = 185;
-				me.flaptrgt = tgt_flap - 30 - me.ASI;
-				
-				me.SPDflaptrgtdiff = tgt_flap - ind_spd;
-			
-				if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
-					me["flap_max"].show();
-					me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
-				} else {
-					me["flap_max"].hide();
-				}
-			} else if (flap_config.getValue() == '3') {
-				me["S_target"].hide();
-				me["clean_speed"].hide();
-				
-				tgt_F = fmgc.FMGCInternal.flap3;
 					
-				if (tgt_F <= 30) {
-					me.Ftrgt = 0 - me.ASI;
-				} else if (tgt_F >= 420) {
-					me.Ftrgt = 390 - me.ASI;
-				} else {
-					me.Ftrgt = tgt_F - 30 - me.ASI;
-				}
-			
-				me.SPDftrgtdiff = tgt_F - ind_spd;
-			
-				if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42) {
-					me["F_target"].show();
-					me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
-				} else {
-					me["F_target"].hide();
-				}
+					tgt_clean = fmgc.FMGCInternal.clean;
+					
+					me.cleantrgt = tgt_clean - 30 - me.ASI;
+					me.SPDcleantrgtdiff = tgt_clean - ind_spd;
 				
-				tgt_flap = 177;
-				me.flaptrgt = tgt_flap - 30 - me.ASI;
+					if (me.SPDcleantrgtdiff >= -42 and me.SPDcleantrgtdiff <= 42) {
+						me["clean_speed"].show();
+						me["clean_speed"].setTranslation(0, me.cleantrgt * -6.6);
+					} else {
+						me["clean_speed"].hide();
+					}	
+					
+					tgt_flap = 230;
+					me.flaptrgt = tgt_flap - 30 - me.ASI;
+					
+					me.SPDflaptrgtdiff = tgt_flap - ind_spd;
 				
-				me.SPDflaptrgtdiff = tgt_flap - ind_spd;
-			
-				if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
-					me["flap_max"].show();
-					me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
-				} else {
-					me["flap_max"].hide();
+					if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
+						me["flap_max"].show();
+						me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
+					} else {
+						me["flap_max"].hide();
+					}
 				}
-			} else if (flap_config.getValue() == '4') {
-				me["S_target"].hide();
-				me["F_target"].hide();
-				me["clean_speed"].hide();	
-				me["flap_max"].hide();
 			} else {
 				me["S_target"].hide();
 				me["F_target"].hide();
-				
-				tgt_clean = fmgc.FMGCInternal.clean;
-				
-				me.cleantrgt = tgt_clean - 30 - me.ASI;
-				me.SPDcleantrgtdiff = tgt_clean - ind_spd;
-			
-				if (me.SPDcleantrgtdiff >= -42 and me.SPDcleantrgtdiff <= 42) {
-					me["clean_speed"].show();
-					me["clean_speed"].setTranslation(0, me.cleantrgt * -6.6);
-				} else {
-					me["clean_speed"].hide();
-				}	
-				
-				tgt_flap = 230;
-				me.flaptrgt = tgt_flap - 30 - me.ASI;
-				
-				me.SPDflaptrgtdiff = tgt_flap - ind_spd;
-			
-				if (me.SPDflaptrgtdiff >= -42 and me.SPDflaptrgtdiff <= 42) {
-					me["flap_max"].show();
-					me["flap_max"].setTranslation(0, me.flaptrgt * -6.6);
-				} else {
-					me["flap_max"].hide();
-				}
-			}
-			
-			if (gear_agl.getValue() < 400) {
-				me["S_target"].hide();
-				me["F_target"].hide();
+				me["clean_speed"].hide();
+				me["flap_max"].hide();
 			}
 			
 			me.ASItrend = dmc.DMController.DMCs[1].outputs[6].getValue() - me.ASI;
diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg
index 798ba86d..debff575 100644
--- a/Models/Instruments/PFD/res/pfd.svg
+++ b/Models/Instruments/PFD/res/pfd.svg
@@ -8,7 +8,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="pfd.svg"
-   inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
    id="svg2"
    version="1.1"
    viewBox="0 0 1024 1024"
@@ -39,15 +39,15 @@
      showguides="true"
      inkscape:current-layer="svg2"
      inkscape:window-maximized="1"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="886.5494"
-     inkscape:cx="916.44902"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:cy="403.87968"
+     inkscape:cx="219.11987"
      inkscape:zoom="2.1546825"
      showgrid="true"
      id="namedview371"
-     inkscape:window-height="1035"
-     inkscape:window-width="1920"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
      inkscape:pageshadow="2"
      inkscape:pageopacity="1"
      guidetolerance="10"
@@ -6659,18 +6659,18 @@
   <text
      inkscape:label="#text1607"
      id="spdLimError"
-     y="749.95782"
-     x="143.42143"
+     y="742.30011"
+     x="135.06754"
      style="font-style:normal;font-weight:normal;font-size:30.00000191px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75"
      xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:41.99999875px;line-height:0.5;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ff0000;fill-opacity:1;stroke-width:0.75"
-       y="749.95782"
-       x="143.42143"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:0.5;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ff0000;fill-opacity:1;stroke-width:0.75"
+       y="742.30011"
+       x="135.06754"
        id="tspan1605-4"
        sodipodi:role="line">SPD</tspan><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:41.99999875px;line-height:0.5;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ff0000;fill-opacity:1;stroke-width:0.75"
-       y="787.45782"
-       x="143.42143"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:0.5;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ff0000;fill-opacity:1;stroke-width:0.75"
+       y="779.80011"
+       x="135.06754"
        sodipodi:role="line"
        id="tspan1860">LIM</tspan></text>
 </svg>