From 154e78643d98551ece329a920f916f5b8e538193 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 10 Dec 2016 11:26:57 -0500 Subject: [PATCH] MAN THR added, EPR updated, Shadow removed forever --- A320-main.xml | 15 +- Models/A319-200-IAE.xml | 12 +- Models/A320-200-IAE.xml | 10 - Models/A321-200-IAE.xml | 10 - Models/Effects/NEOreflect.eff | 2 +- Models/Effects/res/shadow.ac | 23 --- Models/Effects/res/shadow.png | Bin 10091 -> 0 bytes Models/Effects/shadow.xml | 73 -------- Models/FlightDeck/a320.flightdeck.xml | 20 +- Models/Instruments/PFD/PFD1.xml | 171 ++++++++++-------- Models/Instruments/PFD/PFD2.xml | 171 ++++++++++-------- .../Instruments/Upper-ECAM/Upper-ECAM-IAE.xml | 50 +++-- Nasal/systems.nas | 2 +- Nasal/thrust.nas | 32 ++-- Systems/engine-timing.xml | 4 +- Systems/thrust.xml | 124 +++++++++---- 16 files changed, 352 insertions(+), 367 deletions(-) delete mode 100644 Models/Effects/res/shadow.ac delete mode 100644 Models/Effects/res/shadow.png delete mode 100644 Models/Effects/shadow.xml diff --git a/A320-main.xml b/A320-main.xml index 9a4124e1..69e9f26f 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -55,10 +55,10 @@ Spoilers Aircraft/A320Family/Systems/a320-spoilers.xml - + Systems/fl2070_sound.xml - - + + Systems/pfd.xml @@ -298,15 +298,6 @@ false 0.94 - - none - 0 - -0.59 - 0 - 0.72 - 0.98 - 1 - false diff --git a/Models/A319-200-IAE.xml b/Models/A319-200-IAE.xml index f009fa08..8a574061 100644 --- a/Models/A319-200-IAE.xml +++ b/Models/A319-200-IAE.xml @@ -14,17 +14,7 @@ Fuselage Aircraft/A320Family/Models/Fuselages/a319.fuselage.xml - - - - shadow - Aircraft/A320Family/Models/Effects/shadow.xml - - 20.38 - -4.26 - 1.5 - - + Flightdeck diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index f6dbf927..760ca812 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -14,16 +14,6 @@ Fuselage Aircraft/A320Family/Models/Fuselages/a320.fuselage.xml - - - - shadow - Aircraft/A320Family/Models/Effects/shadow.xml - - 20.38 - -4.26 - 1.5 - diff --git a/Models/A321-200-IAE.xml b/Models/A321-200-IAE.xml index 91cbe996..2494a161 100644 --- a/Models/A321-200-IAE.xml +++ b/Models/A321-200-IAE.xml @@ -15,16 +15,6 @@ Aircraft/A320Family/Models/Fuselages/a321.fuselage.xml - - - shadow - Aircraft/A320Family/Models/Effects/shadow.xml - - 20.38 - -4.26 - 1.5 - - Flightdeck diff --git a/Models/Effects/NEOreflect.eff b/Models/Effects/NEOreflect.eff index 57490dce..9cb4e214 100644 --- a/Models/Effects/NEOreflect.eff +++ b/Models/Effects/NEOreflect.eff @@ -1,6 +1,6 @@ - Aircraft/A320neo/Models/Effects/NEOreflect + Aircraft/A320Family/Models/Effects/NEOreflect Effects/reflect diff --git a/Models/Effects/res/shadow.ac b/Models/Effects/res/shadow.ac deleted file mode 100644 index 38293055..00000000 --- a/Models/Effects/res/shadow.ac +++ /dev/null @@ -1,23 +0,0 @@ -AC3Db -MATERIAL "ac3dmat14" rgb 0.8 0.8 0.8 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.2 0.2 0.2 shi 128 trans 0 -OBJECT world -kids 1 -OBJECT poly -name "shadow" -loc 0 0 6.09085e-007 -texture "shadow.png" -crease 45.000000 -numvert 4 --18.785 0 17.05 -18.785 0 17.05 -18.785 0 -17.05 --18.785 0 -17.05 -numsurf 1 -SURF 0x10 -mat 0 -refs 4 -0 0 0 -1 1 0 -2 1 1 -3 0 1 -kids 0 diff --git a/Models/Effects/res/shadow.png b/Models/Effects/res/shadow.png deleted file mode 100644 index fb6e9ef7eb4e7d40072a1d945fc0c04ff246b745..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10091 zcmX9^1z1z>7v2~lEgiy;k`4)pjRr?ZcZzg(gQO^-prjy-mKxmxN;tYII?{DrWG@GeT&xN?Gq(IM_DpS>g{@=N$|ts z6ks4N8o37(z#!|$vFTe;KZk*(@YSz`*M0}L4kf;H!h7LzR>yiEs4)GTq|ZJf__+@# zUe>j6236=tH~iZDF`j|n1Ul|QJIHi9-tW4hJl6U4dJkp94a+%|2`x1$RX);vIJh?pO^H z7(*y!Maq^$t-XwgD=eA;xS$|wIz1`7GG=0^$U7@)lueU*z6uUHs(WP54nCSvyEd_# zHRT*drf|YECymXUL^*TTAS13_>%z$bhh0Pl#=#pDnU6JM0AY}D&BxFZX0@eEFo2E$ zk~&b~vfTU95-NuS@*;1>23BekH1Mwh&|2b(ToS+QBJ!EBG5{=w>@MRbhbA5wepRn= z{WcGB)uPDL$htr=3&CacYj`nPKeTi$5W2yOm8-xo0Qg7jOcE-}qs^2_dZDX^XU&E6 zB^h>g)d4}V^?1yhyUM%1n!8=2I6>Arke~TNg!u|#D;jypeT!ym5AR$V9GZ;gYfz7q zdrIr{{pw?5BFV8OxF3f2V`Ai1>gv@{XdwN6<3YBX=Dg{hZ!?|*5-vT!B#E(Uf0$SOWAG>M=d$PO_J_`1c*zhe? zx84^9h?pYar#$CwFlnGXfc(HLp_D3_LD=YthCXC=iP<&rRg-8UfCXzJyvcS{uh~Xg zZ+9S%j?}N;4Qm9y>8v;iKS6)T>JeXi8M!$J7L7AnKkm7V>Io(-3?d%kyWN!nm6R#l z^7Ofh$84I8tlk>n&QY{WznO8-;lLj5_c*wy{)Zl*(|?m);@S^}*_2KUl>Qjt=|$eZ ztFX6gAmUs~syf|3F7ELE(3sr{GqdO?<~2VCdSP9tppv#-1P1L)f1;?N|Anj2#NIyM z^x<=TQYrBanQjLsHM=nOLL@3_E)_+&$f~rfY%839hZH=NR%6Z)Z5i_@a;oq7(tJ?~ zAG0tP7<9T2t6xjLbptw(Kp>08#r>JPYQh)dGtN{L?A?FNk$lQqePbXif+oTC2bVrX zBjarF=|mZ;pGcQ4*Gp~bzFZtEY`Xf*jcrkf=TV6z$iSaOVZ~Dnv6XmtGYlbC1YeqS z#`UBb{WdS-Lho-xE!>se2x9hRSRaD)Za{R^(-^=3%>Si-Ljcq8nK*#Rj}2vuIvVgt zo?^PN;S-{?9;Moo-VE6_e8vr%Xt-P2SV~&tZ^1~2t zAVr&r4g_0);;xg7vkN=Ny27on;x4Xetr>cvyW5b~Jyt1St_4Pla%NIly-90*ZY*XO zZa`F{$b^hDwYgD7$L#sUB+Y_58;_aG14M>z*qTzyjo>6(F`5O!kr>4Un7PWq=mGRg*5cCEei}1{TK94`lm=kY04ZN^7NE7z`=-wv3n~GDf&|L~3Jt$6NUy*3 z{uspPW{vg#-KF2B&Li!UAbrWW3>}}IB;Y;?TB=}SatVROjb*-v3)+J<6k7wq&jBlK zIYN*?t_C`0d{B^9b%2%W*qoHys&7*TFvsn=QFlQ{5@`@&00DWhx8v6u@l^k!exj`r zX&XJjR6RT>dKhcvk|3+(`2!l_p}Nny+8LL(O$wH?jS4mF%Q0lu*js|pYfaNN$Iy5A zE2`5YCi)r|UQI<+)pZ8s>#_iHx8Cbv%6s-pRnN?o8*^%KBOFVD(3yC7H#LKof(@NrryyJ7frpaL$XDRRer4TUDe+#u=x_5v4)^7W-!gsl~Jh7Dw4s$+It zMyOeY2fd3M^fe;y8+S{NQ0naSdO70Vv$L`s8>k3oxEF)Hcx{@?R!}7>IiNe~^V2uS2E(Mbb_GvYM5GF?IBHg`Ywd-*6w?7 z>)wq|xb|k{+`|>Ss#*r*-2Is`o_t$Qb^hZKjPeW5z_VcD;|{s6N=cO$oRMC>k?2E? zxr7tMNQSs4S7iX=dTjH%&*xWpzk!XUjcf#uM0N{B+3IWRbjP_(O;$hvUN{O zDM$;5iZObFtKj|8YK1?N47+xaxjGy{@K0ri6sxIlR!(4U(%(_P6djBXl#iwHp8PDB zPiSld@1w>ku5VtnX!~q!EMMO=%rX1{+H@D~>={V-T&f~I zPH%c4|Ej(VIaC23;EZ9udcDizFYr{Y2RXGa!)^mz>@JmL8JcFD-ijb{M{*4q{`c4}){v!d0}_a*_#5+12fF`}ChnaD7b%DM``!#skM08+I=*OP zyl(`@^Z(wZsIDR(HPo+?KxKT3o(AN=d@449aQ_0Ogw2_RBW@iI3McN!(W$@L8L3T@ z$K`;D0t>{Lciq=rDLxIwbYF?*o%2BGK2WtXc#Slj8KRR8mw*Pzh*i&C2fxV0wh!1Z=u-^SgYE+M#Yg-oo$pu9lmUEm6}aBO z8gddB$B2nK3w}bT8?*XzZ-gV$y&w?yKi z59W~ddKi&dL0HuY=1h6qH*m@1QCEXj80?G5)oRQ+`R&4o-|Mo6uXbK_aC*PUB-NTx zJ+Vum1{S_7V-~T2=n}oePv&RhP=BNifM1m}3w-Sz?n{hJGJxb3`AB*-Mt5gRb~ocs zEJT0~I{UR8>hK99p-^i9&;;-Nzc4V`bbL9xo4r76PI_q&o;=MXdvzU(Rs+C3skWk) zMW`Tvu%tB`XVTH^bq4CDA_ds+rqTDH*%&f{X9fL!H(`K~U!UfuL=^OPNzS2x82w5c zmt!e|$1J@_wy9~1k%ePEW<_z=#*~vi?!?Vc_jH~;`*y3%WNL0Zs@?P^EJVUE04$c@ z@Vu$0+(qak|C>RI-Tfqfv;jBV-9~2NK7v8DsK_rtk|OS9uw@$h3;Q8}`M<=X<$NKi;ryU)gSS5oL+0sAOD-$RtT*i=(>UW#r-39mo{MB5m5Z{D^sBtqurY-C`o$*osiqc5LJ;tr@u$xhoshnN7< z0%6M31S%)t920$Myct~X^9Ga4u5_?s!!d+pSFWTW>t}_Ua5MALgu2ccuHRGi@)VQL zCe7YIa>m6&*RQr}&Cssd*CCS5NW9=4&4BS{9|^uFf_koB=ID9#!wwwgMy;?h

k( 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 b0B{-cPPyalMY_7-o#stVMN7F_(K`BnEVmqt diff --git a/Models/Effects/shadow.xml b/Models/Effects/shadow.xml deleted file mode 100644 index ec1127f5..00000000 --- a/Models/Effects/shadow.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - res/shadow.ac - - - - - shadow - select - - - /sim/rendering/rembrandt/enabled - - - - - Effects/model-transparent - shadow - - - - Effects/shadow - shadow - - - - - translate - shadow - /controls/lighting/shad-light-alt - 0.301 - - 0 - 0 - -1 - - - - - rotate - shadow - /orientation/roll-deg -

- 0 - 0 - 0 -
- - -1 - 0 - 0 - - - - - rotate - shadow - /orientation/pitch-deg -
- 0 - 0 - 0 -
- - 0 - 1 - 0 - - - - diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index ee113a08..d66103b4 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -1956,9 +1956,13 @@ 0.0000010 0.5999933 0.6000035 - 0.7999935 - 0.8000046 - 0.9499946 + 0.6499935 + 0.6500037 + 0.7799944 + 0.7800046 + 0.8299946 + 0.8300048 + 0.9499953 0.9500055 1.0000055 @@ -2009,9 +2013,13 @@ 0.0000010 0.5999933 0.6000035 - 0.7999935 - 0.8000046 - 0.9499946 + 0.6499935 + 0.6500037 + 0.7799944 + 0.7800046 + 0.8299946 + 0.8300048 + 0.9499953 0.9500055 1.0000055 diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml index bb2cee4d..2a4f35ff 100644 --- a/Models/Instruments/PFD/PFD1.xml +++ b/Models/Instruments/PFD/PFD1.xml @@ -799,7 +799,7 @@ 0.00091828 0.0326226 - 0.0531781 + 0.0581781 center-center yz-plane @@ -823,7 +823,7 @@ 0.00091828 0.0436226 - 0.0531781 + 0.0581781 center-center yz-plane @@ -998,6 +998,14 @@ /it-autoflight/output/athr 1 + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + /systems/thrust/state1 MCT @@ -1006,14 +1014,6 @@ /systems/thrust/state2 MCT - - /systems/thrust/state3 - MCT - - - /systems/thrust/state4 - MCT - /systems/thrust/state1 TOGA @@ -1022,14 +1022,6 @@ /systems/thrust/state2 TOGA - - /systems/thrust/state3 - TOGA - - - /systems/thrust/state4 - TOGA - @@ -1295,14 +1287,6 @@ /systems/thrust/state2 CL - - /systems/thrust/state3 - CL - - - /systems/thrust/state4 - CL - @@ -1326,14 +1310,6 @@ /systems/thrust/state2 MAN - - /systems/thrust/state3 - MAN - - - /systems/thrust/state4 - MAN - /systems/thrust/state1 CL @@ -1342,15 +1318,15 @@ /systems/thrust/state2 CL - - /systems/thrust/state3 - CL - - - /systems/thrust/state4 - CL - + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + /systems/thrust/state1 MCT @@ -1359,14 +1335,6 @@ /systems/thrust/state2 MCT - - /systems/thrust/state3 - MCT - - - /systems/thrust/state4 - MCT - /systems/thrust/state1 TOGA @@ -1375,14 +1343,6 @@ /systems/thrust/state2 TOGA - - /systems/thrust/state3 - TOGA - - - /systems/thrust/state4 - TOGA - @@ -1397,6 +1357,14 @@ 1 + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + /systems/thrust/state1 MCT @@ -1405,14 +1373,6 @@ /systems/thrust/state2 MCT - - /systems/thrust/state3 - MCT - - - /systems/thrust/state4 - MCT - /systems/thrust/state1 TOGA @@ -1421,14 +1381,6 @@ /systems/thrust/state2 TOGA - - /systems/thrust/state3 - TOGA - - - /systems/thrust/state4 - TOGA - @@ -1532,6 +1484,29 @@ + + athr-thr-fma + + 0.00091828 + -0.0546226 + 0.0630781 + + center-center + yz-plane + text-value + THR + autopilot/serviceable + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + + athr-box-fma @@ -1583,6 +1558,14 @@ /systems/thrust/state2 MCT + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + @@ -1642,6 +1625,45 @@ + + select + athr-thr-fma + + + + /it-autoflight/output/athr + 1 + + + /systems/thrust/state1 + TOGA + + + /systems/thrust/state2 + TOGA + + + /systems/thrust/state1 + MCT + + + /systems/thrust/state2 + MCT + + + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + + + + + + athr-lvrclb-fma @@ -1815,6 +1837,7 @@ athr-man-fma athr-toga-fma athr-mct-fma + athr-thr-fma athr-box-fma athr-lvrclb-fma vs-num diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml index 45fdb0b9..dd7de912 100644 --- a/Models/Instruments/PFD/PFD2.xml +++ b/Models/Instruments/PFD/PFD2.xml @@ -799,7 +799,7 @@ 0.00091828 0.0326226 - 0.0531781 + 0.0581781 center-center yz-plane @@ -823,7 +823,7 @@ 0.00091828 0.0436226 - 0.0531781 + 0.0581781 center-center yz-plane @@ -998,6 +998,14 @@ /it-autoflight/output/athr 1 + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + /systems/thrust/state1 MCT @@ -1006,14 +1014,6 @@ /systems/thrust/state2 MCT - - /systems/thrust/state3 - MCT - - - /systems/thrust/state4 - MCT - /systems/thrust/state1 TOGA @@ -1022,14 +1022,6 @@ /systems/thrust/state2 TOGA - - /systems/thrust/state3 - TOGA - - - /systems/thrust/state4 - TOGA - @@ -1295,14 +1287,6 @@ /systems/thrust/state2 CL - - /systems/thrust/state3 - CL - - - /systems/thrust/state4 - CL - @@ -1326,14 +1310,6 @@ /systems/thrust/state2 MAN - - /systems/thrust/state3 - MAN - - - /systems/thrust/state4 - MAN - /systems/thrust/state1 CL @@ -1342,15 +1318,15 @@ /systems/thrust/state2 CL - - /systems/thrust/state3 - CL - - - /systems/thrust/state4 - CL - + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + /systems/thrust/state1 MCT @@ -1359,14 +1335,6 @@ /systems/thrust/state2 MCT - - /systems/thrust/state3 - MCT - - - /systems/thrust/state4 - MCT - /systems/thrust/state1 TOGA @@ -1375,14 +1343,6 @@ /systems/thrust/state2 TOGA - - /systems/thrust/state3 - TOGA - - - /systems/thrust/state4 - TOGA - @@ -1397,6 +1357,14 @@ 1 + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + /systems/thrust/state1 MCT @@ -1405,14 +1373,6 @@ /systems/thrust/state2 MCT - - /systems/thrust/state3 - MCT - - - /systems/thrust/state4 - MCT - /systems/thrust/state1 TOGA @@ -1421,14 +1381,6 @@ /systems/thrust/state2 TOGA - - /systems/thrust/state3 - TOGA - - - /systems/thrust/state4 - TOGA - @@ -1532,6 +1484,29 @@ + + athr-thr-fma + + 0.00091828 + -0.0546226 + 0.0630781 + + center-center + yz-plane + text-value + THR + autopilot/serviceable + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + + athr-box-fma @@ -1583,6 +1558,14 @@ /systems/thrust/state2 MCT + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + @@ -1642,6 +1625,45 @@ + + select + athr-thr-fma + + + + /it-autoflight/output/athr + 1 + + + /systems/thrust/state1 + TOGA + + + /systems/thrust/state2 + TOGA + + + /systems/thrust/state1 + MCT + + + /systems/thrust/state2 + MCT + + + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state2 + MAN THR + + + + + + athr-lvrclb-fma @@ -1815,6 +1837,7 @@ athr-man-fma athr-toga-fma athr-mct-fma + athr-thr-fma athr-box-fma athr-lvrclb-fma vs-num diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml index 51078bad..0901fde7 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml @@ -1085,15 +1085,20 @@ thrpos1 controls/engines/engine[0]/throttle - 0.00000 05 - 0.34198 64 - 0.59999102 - 0.60000103 - 0.79999103 - 0.80000107 - 0.94999107 - 0.95000111 - 1.00000111 + 0.0000005 + 0.1956033 + 0.4299964 + 0.5999982 + 0.6000083 + 0.6499983 + 0.6500084 + 0.7799988 + 0.7800089 + 0.8299989 + 0.8300090 + 0.9499992 + 0.9500093 + 1.0000093
0 @@ -1112,15 +1117,20 @@ thrpos2 controls/engines/engine[1]/throttle - 0.00000 05 - 0.34198 64 - 0.59999102 - 0.60000103 - 0.79999103 - 0.80000107 - 0.94999107 - 0.95000111 - 1.00000111 + 0.0000005 + 0.1956033 + 0.4299964 + 0.5999982 + 0.6000083 + 0.6499983 + 0.6500084 + 0.7799988 + 0.7800089 + 0.8299989 + 0.8300090 + 0.9499992 + 0.9500093 + 1.0000093
0 @@ -1185,7 +1195,7 @@ n11 engines/engine/n1 - 23 0 + 20 0 40 47 100159 110170 @@ -1207,7 +1217,7 @@ n12 engines/engine[1]/n1 - 23 0 + 20 0 40 47 100159 110170 diff --git a/Nasal/systems.nas b/Nasal/systems.nas index 55fcdc84..fef26987 100644 --- a/Nasal/systems.nas +++ b/Nasal/systems.nas @@ -185,7 +185,7 @@ setlistener("/sim/signals/fdm-initialized", func { setprop("/it-autoflight/settings/land-enable", 1); # Enable or disable automatic landing. setprop("/it-autoflight/autoland/flare-altitude", 40); # Altitude when the flare mode starts in an autoland. setprop("/controls/engines/thrust-limit", "TOGA"); - setprop("/controls/engines/epr-limit", 1.379); + setprop("/controls/engines/epr-limit", 1.301); setprop("/controls/engines/n1-limit", 97.8); }); diff --git a/Nasal/thrust.nas b/Nasal/thrust.nas index fef1d36d..466f03c2 100644 --- a/Nasal/thrust.nas +++ b/Nasal/thrust.nas @@ -6,7 +6,7 @@ setlistener("/sim/signals/fdm-initialized", func { setprop("/systems/thrust/state1", "IDLE"); setprop("/systems/thrust/state2", "IDLE"); setprop("/systems/thrust/lvrclb", "0"); - setprop("/systems/thrust/clbreduc-ft", "2000"); + setprop("/systems/thrust/clbreduc-ft", "1500"); lvrclb(); print("Thrust System ... Done!") }); @@ -16,17 +16,22 @@ setlistener("/controls/engines/engine[0]/throttle", func { if (thrr < 0.05) { setprop("/systems/thrust/state1", "IDLE"); atoff_request(); - } else if (thrr >= 0.05 and thrr < 0.60) { + } else if (thrr >= 0.01 and thrr < 0.60) { setprop("/systems/thrust/state1", "MAN"); - } else if (thrr >= 0.60 and thrr < 0.80) { + } else if (thrr >= 0.60 and thrr < 0.65) { setprop("/systems/thrust/state1", "CL"); - } else if (thrr >= 0.80 and thrr < 0.95) { + } else if (thrr >= 0.65 and thrr < 0.78) { + setprop("/systems/thrust/state1", "MAN THR"); + } else if (thrr >= 0.78 and thrr < 0.83) { setprop("/it-autoflight/input/athr", 1); - setprop("/controls/engines/engine[0]/throttle-fdm", 0.94); + setprop("/controls/engines/engine[0]/throttle-fdm", 0.90); setprop("/systems/thrust/state1", "MCT"); + } else if (thrr >= 0.83 and thrr < 0.95) { + setprop("/it-autoflight/input/athr", 1); + setprop("/systems/thrust/state1", "MAN THR"); } else if (thrr >= 0.95) { setprop("/it-autoflight/input/athr", 1); - setprop("/controls/engines/engine[0]/throttle-fdm", 0.98); + setprop("/controls/engines/engine[0]/throttle-fdm", 0.95); setprop("/systems/thrust/state1", "TOGA"); } }); @@ -36,17 +41,22 @@ setlistener("/controls/engines/engine[1]/throttle", func { if (thrr < 0.05) { setprop("/systems/thrust/state2", "IDLE"); atoff_request(); - } else if (thrr >= 0.05 and thrr < 0.60) { + } else if (thrr >= 0.01 and thrr < 0.60) { setprop("/systems/thrust/state2", "MAN"); - } else if (thrr >= 0.60 and thrr < 0.80) { + } else if (thrr >= 0.60 and thrr < 0.65) { setprop("/systems/thrust/state2", "CL"); - } else if (thrr >= 0.80 and thrr < 0.95) { + } else if (thrr >= 0.65 and thrr < 0.78) { + setprop("/systems/thrust/state2", "MAN THR"); + } else if (thrr >= 0.78 and thrr < 0.83) { setprop("/it-autoflight/input/athr", 1); - setprop("/controls/engines/engine[1]/throttle-fdm", 0.94); + setprop("/controls/engines/engine[1]/throttle-fdm", 0.90); setprop("/systems/thrust/state2", "MCT"); + } else if (thrr >= 0.83 and thrr < 0.95) { + setprop("/it-autoflight/input/athr", 1); + setprop("/systems/thrust/state2", "MAN THR"); } else if (thrr >= 0.95) { setprop("/it-autoflight/input/athr", 1); - setprop("/controls/engines/engine[1]/throttle-fdm", 0.98); + setprop("/controls/engines/engine[1]/throttle-fdm", 0.95); setprop("/systems/thrust/state2", "TOGA"); } }); diff --git a/Systems/engine-timing.xml b/Systems/engine-timing.xml index b54dc463..45960eb2 100644 --- a/Systems/engine-timing.xml +++ b/Systems/engine-timing.xml @@ -14,7 +14,7 @@ 180.988 231.000 351.060 - 105.01.380 + 105.01.322 @@ -33,7 +33,7 @@ 180.988 231.000 351.060 - 105.01.380 + 105.01.322 diff --git a/Systems/thrust.xml b/Systems/thrust.xml index b4c4b18a..0094b0a7 100644 --- a/Systems/thrust.xml +++ b/Systems/thrust.xml @@ -1,7 +1,7 @@ - + @@ -14,8 +14,12 @@ /controls/engines/engine[0]/throttle - 0.00.00 - 0.60.90 + 0.000.00 + 0.600.83 + 0.650.83 + 0.780.90 + 0.830.90 + 0.950.95
 @@ -31,8 +35,12 @@ /controls/engines/engine[1]/throttle - 0.00.00 - 0.60.90 + 0.000.00 + 0.600.83 + 0.650.83 + 0.780.90 + 0.830.90 + 0.950.95
 @@ -47,6 +55,10 @@ + + /systems/thrust/state1 + MAN THR + /systems/thrust/state1 CL @@ -64,26 +76,32 @@ - + - /it-autoflight/output/athr - 0 + /systems/thrust/state1 + MAN THR - + - /systems/thrust/state1 - CL + /it-autoflight/output/athr + 0 - - /systems/thrust/state1 - MAN - - - /systems/thrust/state1 - IDLE - - - + + + /systems/thrust/state1 + CL + + + /systems/thrust/state1 + MAN + + + /systems/thrust/state1 + IDLE + + + + /controls/engines/engine[0]/throttle-man @@ -112,6 +130,15 @@ /controls/engines/engine[0]/throttle-fdm noise-spike + + + + /systems/thrust/state1 + MAN THR + + + 1 + @@ -168,7 +195,7 @@ - 0.05 + 0.2 @@ -189,6 +216,10 @@ + + /systems/thrust/state2 + MAN THR + /systems/thrust/state2 CL @@ -206,26 +237,32 @@ - + - /it-autoflight/output/athr - 0 + /systems/thrust/state2 + MAN THR - + - /systems/thrust/state2 - CL + /it-autoflight/output/athr + 0 - - /systems/thrust/state2 - MAN - - - /systems/thrust/state2 - IDLE - - - + + + /systems/thrust/state2 + CL + + + /systems/thrust/state2 + MAN + + + /systems/thrust/state2 + IDLE + + + + /controls/engines/engine[1]/throttle-man @@ -254,6 +291,15 @@ /controls/engines/engine[1]/throttle-fdm noise-spike + + + + /systems/thrust/state2 + MAN THR + + + 1 + @@ -310,7 +356,7 @@ - 0.05 + 0.2