diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index 83f2a92d..ced79130 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -166,7 +166,7 @@ var v2 = props.globals.getNode("FMGC/internal/v2", 1); var v2Set = props.globals.getNode("FMGC/internal/v2-set", 1); var clbReducFt = props.globals.getNode("systems/thrust/clbreduc-ft", 1); -var reducFt = props.globals.getNode("FMGC/internal/reduc-agl-ft", 1); # It's not AGL anymore +var reducFt = props.globals.getNode("FMGC/internal/accel-agl-ft", 1); # It's not AGL anymore var thrAccSet = props.globals.getNode("MCDUC/thracc-set", 1); var flapTO = props.globals.getNode("FMGC/internal/to-flap", 1); var THSTO = props.globals.getNode("FMGC/internal/to-ths", 1); diff --git a/Nasal/FMGC/FMGC-b.nas b/Nasal/FMGC/FMGC-b.nas index eb9be5cd..2f50adf9 100644 --- a/Nasal/FMGC/FMGC-b.nas +++ b/Nasal/FMGC/FMGC-b.nas @@ -155,7 +155,7 @@ var Text = { }; var Setting = { - reducAglFt: props.globals.initNode("/it-autoflight/settings/reduc-agl-ft", 1500, "INT"), # Changable from MCDU #eventually set to 1500 above runway + reducAglFt: props.globals.initNode("/it-autoflight/settings/accel-agl-ft", 1500, "INT"), # Changable from MCDU #eventually set to 1500 above runway }; var Sound = { diff --git a/Nasal/FMGC/FMGC.nas b/Nasal/FMGC/FMGC.nas index 6bed7535..aa9c3c0a 100644 --- a/Nasal/FMGC/FMGC.nas +++ b/Nasal/FMGC/FMGC.nas @@ -102,7 +102,7 @@ setprop("FMGC/internal/mng-spd", 157); setprop("FMGC/internal/mng-spd-cmd", 157); setprop("FMGC/internal/mng-kts-mach", 0); setprop("FMGC/internal/mach-switchover", 0); -setprop("it-autoflight/settings/reduc-agl-ft", 1500); #eventually set to 1500 above runway +setprop("it-autoflight/settings/accel-agl-ft", 1500); #eventually set to 1500 above runway setprop("it-autoflight/internal/vert-speed-fpm", 0); setprop("it-autoflight/output/fma-pwr", 0); setprop("instrumentation/nav[0]/nav-id", "XXX"); @@ -123,7 +123,7 @@ var FMGCinit = func { setprop("FMGC/internal/mng-spd-cmd", 157); setprop("FMGC/internal/mng-kts-mach", 0); setprop("FMGC/internal/mach-switchover", 0); - setprop("it-autoflight/settings/reduc-agl-ft", 1500); #eventually set to 1500 above runway + setprop("it-autoflight/settings/accel-agl-ft", 1500); #eventually set to 1500 above runway setprop("FMGC/internal/decel", 0); setprop("FMGC/internal/loc-source", "NAV0"); setprop("FMGC/internal/optalt", 0); @@ -193,7 +193,7 @@ var masterFMGC = maketimer(0.2, func { targetalt = getprop("it-autoflight/internal/alt"); targetvs = getprop("it-autoflight/input/vs"); targetfpa = getprop("it-autoflight/input/fpa"); - reduc_agl_ft = getprop("it-autoflight/settings/reduc-agl-ft"); + reduc_agl_ft = getprop("it-autoflight/settings/accel-agl-ft"); locarm = getprop("it-autopilot/output/loc-armed"); apprarm = getprop("it-autopilot/output/appr-armed"); gear0 = getprop("gear/gear[0]/wow"); @@ -512,11 +512,11 @@ var reset_FMGC = func { var various = maketimer(1, func { if (getprop("engines/engine[0]/state") == 3 and getprop("engines/engine[1]/state") != 3) { - setprop("it-autoflight/settings/reduc-agl-ft", getprop("FMGC/internal/eng-out-reduc")); + setprop("it-autoflight/settings/accel-agl-ft", getprop("FMGC/internal/eng-out-reduc")); } else if (getprop("engines/engine[0]/state") != 3 and getprop("engines/engine[1]/state") == 3) { - setprop("it-autoflight/settings/reduc-agl-ft", getprop("FMGC/internal/eng-out-reduc")); + setprop("it-autoflight/settings/accel-agl-ft", getprop("FMGC/internal/eng-out-reduc")); } else { - setprop("it-autoflight/settings/reduc-agl-ft", getprop("FMGC/internal/reduc-agl-ft")); + setprop("it-autoflight/settings/accel-agl-ft", getprop("FMGC/internal/accel-agl-ft")); } setprop("FMGC/internal/gw", math.round(getprop("fdm/jsbsim/inertia/weight-lbs"), 100)); diff --git a/Nasal/MCDU/MCDU.nas b/Nasal/MCDU/MCDU.nas index 71aea80c..7d5fb483 100644 --- a/Nasal/MCDU/MCDU.nas +++ b/Nasal/MCDU/MCDU.nas @@ -121,7 +121,7 @@ var MCDU_reset = func(i) { setprop("FMGC/internal/v2", 0); setprop("FMGC/internal/v2-set", 0); - setprop("FMGC/internal/reduc-agl-ft", "1500"); #eventually set to 1500 above runway + setprop("FMGC/internal/accel-agl-ft", "1500"); #eventually set to 1500 above runway setprop("MCDUC/thracc-set", 0); setprop("FMGC/internal/to-flap", 0); setprop("FMGC/internal/to-ths", "0.0"); diff --git a/Nasal/MCDU/PERFGA.nas b/Nasal/MCDU/PERFGA.nas index 6409965b..7eb46403 100644 --- a/Nasal/MCDU/PERFGA.nas +++ b/Nasal/MCDU/PERFGA.nas @@ -7,7 +7,7 @@ var perfGAInput = func(key, i) { if (key == "L5") { if (scratchpad == "CLR") { setprop("systems/thrust/clbreduc-ft", "1500"); - setprop("FMGC/internal/reduc-agl-ft", "1500"); + setprop("FMGC/internal/accel-agl-ft", "1500"); setprop("MCDUC/thracc-set", 0); setprop("MCDU[" ~ i ~ "]/scratchpad-msg", 0); setprop("MCDU[" ~ i ~ "]/scratchpad", ""); @@ -19,7 +19,7 @@ var perfGAInput = func(key, i) { var acc = size(thracc[1]); if (int(thrred) != nil and int(acc) != nil and (thrred >= 3 and thrred <= 5) and (acc >= 3 and acc <= 5)) { setprop("systems/thrust/clbreduc-ft", thracc[0]); - setprop("FMGC/internal/reduc-agl-ft", thracc[1]); + setprop("FMGC/internal/accel-agl-ft", thracc[1]); setprop("MCDUC/thracc-set", 1); setprop("MCDU[" ~ i ~ "]/scratchpad", ""); } else { diff --git a/Nasal/MCDU/PERFTO.nas b/Nasal/MCDU/PERFTO.nas index 2176884e..41af6db1 100644 --- a/Nasal/MCDU/PERFTO.nas +++ b/Nasal/MCDU/PERFTO.nas @@ -83,7 +83,7 @@ var perfTOInput = func(key, i) { } else if (key == "L5") { if (scratchpad == "CLR") { setprop("systems/thrust/clbreduc-ft", "1500"); - setprop("FMGC/internal/reduc-agl-ft", "1500"); + setprop("FMGC/internal/accel-agl-ft", "1500"); setprop("MCDUC/thracc-set", 0); setprop("MCDU[" ~ i ~ "]/scratchpad-msg", 0); setprop("MCDU[" ~ i ~ "]/scratchpad", ""); @@ -97,11 +97,11 @@ var perfTOInput = func(key, i) { var accs = size(acc); if (int(thrred) != nil and (thrreds == 4 or thrreds == 5) and thrred >= 1000 and thrred <= 39000 and int(acc) != nil and (accs == 4 or accs == 5) and acc >= 1000 and acc <= 39000) { setprop("systems/thrust/clbreduc-ft", int(thrred / 10) * 10); - setprop("FMGC/internal/reduc-agl-ft", int(acc / 10) * 10); + setprop("FMGC/internal/accel-agl-ft", int(acc / 10) * 10); setprop("MCDUC/thracc-set", 1); setprop("MCDU[" ~ i ~ "]/scratchpad", ""); } else if (thrreds == 0 and int(acc) != nil and (accs == 4 or accs == 5) and acc >= 1000 and acc <= 39000) { - setprop("FMGC/internal/reduc-agl-ft", int(acc / 10) * 10); + setprop("FMGC/internal/accel-agl-ft", int(acc / 10) * 10); setprop("MCDU[" ~ i ~ "]/scratchpad", ""); } else { notAllowed(i);