diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index 94554474..bbea2086 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -104,7 +104,6 @@ var extra_time = props.globals.getNode("FMGC/internal/extra-time", 1); var state1 = props.globals.getNode("engines/engine[0]/state", 1); var state2 = props.globals.getNode("engines/engine[1]/state", 1); var engrdy = props.globals.getNode("engines/ready", 1); - var alt_airport = props.globals.getNode("FMGC/internal/alt-airport", 1); var pri_utc = props.globals.getNode("FMGC/internal/pri-utc", 1); var alt_utc = props.globals.getNode("FMGC/internal/alt-utc", 1); @@ -166,8 +165,6 @@ var dh = props.globals.getNode("FMGC/internal/dh", 1); var ldg_config_3_set = props.globals.getNode("FMGC/internal/ldg-config-3-set", 1); var ldg_config_f_set = props.globals.getNode("FMGC/internal/ldg-config-f-set", 1); -var min_speed = props.globals.getNode("FMGC/internal/minspeed", 1); - # GA PERF # Fetch nodes into vectors diff --git a/Nasal/MCDU/FUELPRED.nas b/Nasal/MCDU/FUELPRED.nas index be6247bb..75e878fc 100644 --- a/Nasal/MCDU/FUELPRED.nas +++ b/Nasal/MCDU/FUELPRED.nas @@ -3,12 +3,8 @@ # Copyright (c) 2020 Matthew Maring (hayden2000) # From INIT-B -var zfwcg = props.globals.getNode("FMGC/internal/zfwcg", 1); -var zfwcgSet = props.globals.getNode("FMGC/internal/zfwcg-set", 1); var zfw = props.globals.getNode("FMGC/internal/zfw", 1); -var zfwSet = props.globals.getNode("FMGC/internal/zfw-set", 1); var block = props.globals.getNode("FMGC/internal/block", 1); -var blockSet = props.globals.getNode("FMGC/internal/block-set", 1); var taxi_fuel = props.globals.getNode("FMGC/internal/taxi-fuel", 1); var trip_fuel = props.globals.getNode("FMGC/internal/trip-fuel", 1); var trip_time = props.globals.getNode("FMGC/internal/trip-time", 1); @@ -25,17 +21,6 @@ var trip_wind = props.globals.getNode("FMGC/internal/trip-wind", 1); var extra_fuel = props.globals.getNode("FMGC/internal/extra-fuel", 1); var extra_time = props.globals.getNode("FMGC/internal/extra-time", 1); -# FUELPRED Specials -var alt_airport = props.globals.getNode("FMGC/internal/alt-airport", 1); -var pri_utc = props.globals.getNode("FMGC/internal/pri-utc", 1); -var alt_utc = props.globals.getNode("FMGC/internal/alt-utc", 1); -var pri_efob = props.globals.getNode("FMGC/internal/pri-efob", 1); -var alt_efob = props.globals.getNode("FMGC/internal/alt-efob", 1); -var fob = props.globals.getNode("FMGC/internal/fob", 1); -var gw = props.globals.getNode("FMGC/internal/gw", 1); -var cg = props.globals.getNode("FMGC/internal/cg", 1); - - var fuelPredInput = func(key, i) { var scratchpad = getprop("MCDU[" ~ i ~ "]/scratchpad"); if (key == "L3") { diff --git a/Nasal/MCDU/INITB.nas b/Nasal/MCDU/INITB.nas index 1de0e9b9..bc521be2 100644 --- a/Nasal/MCDU/INITB.nas +++ b/Nasal/MCDU/INITB.nas @@ -2,12 +2,8 @@ # Copyright (c) 2020 Matthew Maring (hayden2000) -var zfwcg = props.globals.getNode("FMGC/internal/zfwcg", 1); -var zfwcgSet = props.globals.getNode("FMGC/internal/zfwcg-set", 1); var zfw = props.globals.getNode("FMGC/internal/zfw", 1); -var zfwSet = props.globals.getNode("FMGC/internal/zfw-set", 1); var block = props.globals.getNode("FMGC/internal/block", 1); -var blockSet = props.globals.getNode("FMGC/internal/block-set", 1); var taxi_fuel = props.globals.getNode("FMGC/internal/taxi-fuel", 1); var trip_fuel = props.globals.getNode("FMGC/internal/trip-fuel", 1); var trip_time = props.globals.getNode("FMGC/internal/trip-time", 1); diff --git a/Nasal/MCDU/MCDU.nas b/Nasal/MCDU/MCDU.nas index e08ac7d7..7c1c56df 100644 --- a/Nasal/MCDU/MCDU.nas +++ b/Nasal/MCDU/MCDU.nas @@ -111,6 +111,7 @@ var MCDU_reset = func(i) { setprop("FMGC/internal/ldg-config-3-set", 0); setprop("FMGC/internal/ldg-config-f-set", 1); + #RADNAV setprop("FMGC/internal/ils1freq-set", 0); setprop("FMGC/internal/ils1crs-set", 0); setprop("FMGC/internal/vor1freq-set", 0); @@ -119,6 +120,8 @@ var MCDU_reset = func(i) { setprop("FMGC/internal/vor2crs-set", 0); setprop("FMGC/internal/adf1freq-set", 0); setprop("FMGC/internal/adf2freq-set", 0); + + #ACCONFIC setprop("FMGC/internal/navdatabase", "01JAN-28JAN"); setprop("FMGC/internal/navdatabase2", "29JAN-26FEB"); setprop("FMGC/internal/navdatabasecode", "AB20170101");