Add normal/small for rte reserve, fix block clr bug
This commit is contained in:
Matthew Maring
parent
d1be8b117a
commit
bb7f78d567
3 changed files with 74 additions and 9 deletions
|
|
@ -128,7 +128,9 @@ 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);
|
||||
var rte_rsv = props.globals.getNode("/FMGC/internal/rte-rsv", 1);
|
||||
var rte_rsv_set = props.globals.getNode("/FMGC/internal/rte-rsv-set", 1);
|
||||
var rte_percent = props.globals.getNode("/FMGC/internal/rte-percent", 1);
|
||||
var rte_percent_set = props.globals.getNode("/FMGC/internal/rte-percent-set", 1);
|
||||
var alt_fuel = props.globals.getNode("/FMGC/internal/alt-fuel", 1);
|
||||
var alt_time = props.globals.getNode("/FMGC/internal/alt-time", 1);
|
||||
var final_fuel = props.globals.getNode("/FMGC/internal/final-fuel", 1);
|
||||
|
|
@ -1560,7 +1562,6 @@ var canvas_MCDU_base = {
|
|||
if (!getprop("/FMGC/internal/fuel-request-set")) {
|
||||
me["Simple_L2"].setText("---.-/----");
|
||||
me["Simple_L3"].setText("---.-");
|
||||
me["Simple_C3"].show();
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
me["Simple_L4"].setText("---.-/----");
|
||||
me["Simple_C4"].hide();
|
||||
|
|
@ -1591,7 +1592,6 @@ var canvas_MCDU_base = {
|
|||
if (getprop("/FMGC/internal/block-calculating")) {
|
||||
me["Simple_L2"].setText("---.-/----");
|
||||
me["Simple_L3"].setText("---.-");
|
||||
me["Simple_C3"].show();
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
me["Simple_L4"].setText("---.-/----");
|
||||
me["Simple_C4"].hide();
|
||||
|
|
@ -1617,7 +1617,6 @@ var canvas_MCDU_base = {
|
|||
if (!getprop("/FMGC/internal/block-confirmed")) {
|
||||
me["Simple_L2"].setText("---.-/----");
|
||||
me["Simple_L3"].setText("---.-");
|
||||
me["Simple_C3"].show();
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
me["Simple_L4"].setText("---.-/----");
|
||||
me["Simple_C4"].hide();
|
||||
|
|
@ -1643,8 +1642,9 @@ var canvas_MCDU_base = {
|
|||
if (getprop("/FMGC/internal/fuel-calculating")) {
|
||||
me["Simple_L2"].setText("---.-/----");
|
||||
me["Simple_L3"].setText("---.-");
|
||||
me["Simple_C3"].show();
|
||||
if (rte_set.getValue() == 1) {
|
||||
if (rte_rsv_set.getValue() == 1) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else if (rte_percent_set.getValue() == 1) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
|
|
@ -1679,8 +1679,38 @@ var canvas_MCDU_base = {
|
|||
#setprop("/FMGC/internal/tow", num(block.getValue() + zfw.getValue() - taxi_fuel.getValue()));
|
||||
#setprop("/FMGC/internal/lw", num(tow.getValue() - trip_fuel.getValue()));
|
||||
me["Simple_L2"].setText(sprintf("%.1f/" ~ trip_time.getValue(), trip_fuel.getValue()));
|
||||
me["Simple_L3"].setText(sprintf("%.1f/", rte_rsv.getValue()) ~ sprintf("%.1f", rte_percent.getValue()));
|
||||
me["Simple_C3"].hide();
|
||||
me["Simple_L3"].setText(sprintf("%.1f", rte_rsv.getValue()));
|
||||
if (rte_rsv_set.getValue() == 1) {
|
||||
if (num(rte_rsv.getValue()) > 9.9 and num(rte_percent.getValue()) > 9.9) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else if (num(rte_rsv.getValue()) > 9.9) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else if (num(rte_percent.getValue()) > 9.9) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
}
|
||||
} else if (rte_percent_set.getValue() == 1) {
|
||||
if (num(rte_rsv.getValue()) > 9.9 and num(rte_percent.getValue()) > 9.9) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else if (num(rte_rsv.getValue()) > 9.9) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else if (num(rte_percent.getValue()) > 9.9) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
}
|
||||
} else {
|
||||
if (num(rte_rsv.getValue()) > 9.9 and num(rte_percent.getValue()) > 9.9) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else if (num(rte_rsv.getValue()) > 9.9) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else if (num(rte_percent.getValue()) > 9.9) {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
} else {
|
||||
me["Simple_C3"].setText(sprintf("/%.1f ", rte_percent.getValue()));
|
||||
}
|
||||
}
|
||||
me["Simple_L4"].setText(sprintf("%.1f", alt_fuel.getValue()));
|
||||
me["Simple_C4"].show();
|
||||
if (alt_fuel_set.getValue() == 1) {
|
||||
|
|
@ -1767,10 +1797,15 @@ var canvas_MCDU_base = {
|
|||
me["Simple_L1"].setFontSize(small);
|
||||
}
|
||||
|
||||
if (rte_set.getValue() == 1) {
|
||||
if (rte_rsv_set.getValue() == 1) {
|
||||
me["Simple_L3"].setFontSize(normal);
|
||||
me["Simple_C3"].setFontSize(small);
|
||||
} else if (rte_percent_set.getValue() == 1) {
|
||||
me["Simple_L3"].setFontSize(small);
|
||||
me["Simple_C3"].setFontSize(normal);
|
||||
} else {
|
||||
me["Simple_L3"].setFontSize(small);
|
||||
me["Simple_C3"].setFontSize(small);
|
||||
}
|
||||
|
||||
if (alt_fuel_set.getValue() == 1) {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@ var initInputB = func(key, i) {
|
|||
} else if (key == "L3" and getprop("/FMGC/internal/block-confirmed") and !getprop("/FMGC/internal/fuel-calculating")) {
|
||||
if (scratchpad == "CLR") {
|
||||
setprop("/FMGC/internal/rte-rsv", 0.05 * num(getprop("/FMGC/internal/trip-fuel")));
|
||||
setprop("/FMGC/internal/rte-rsv-set", 0);
|
||||
setprop("/FMGC/internal/rte-percent", 5.0);
|
||||
setprop("/FMGC/internal/rte-percent-set", 0);
|
||||
setprop("/FMGC/internal/fuel-calculating", 1);
|
||||
setprop("/MCDU[" ~ i ~ "]/scratchpad-msg", 0);
|
||||
setprop("/MCDU[" ~ i ~ "]/scratchpad", "");
|
||||
|
|
@ -45,13 +47,17 @@ var initInputB = func(key, i) {
|
|||
var perc = num(split("/", scratchpad)[1]);
|
||||
if (perc != nil and perc >= 0.0 and perc <= 15.0) {
|
||||
setprop("/FMGC/internal/rte-rsv", num(perc) / 100 * num(getprop("/FMGC/internal/trip-fuel")));
|
||||
setprop("/FMGC/internal/rte-rsv-set", 0);
|
||||
setprop("/FMGC/internal/rte-percent", perc);
|
||||
setprop("/FMGC/internal/rte-percent-set", 1);
|
||||
setprop("/FMGC/internal/fuel-calculating", 1);
|
||||
setprop("/MCDU[" ~ i ~ "]/scratchpad", "");
|
||||
}
|
||||
} else if (tfs >= 1 and tfs <= 4 and tf != nil and tf >= 0 and tf <= 21.7 and tf / num(getprop("/FMGC/internal/trip-fuel")) <= 0.15) {
|
||||
setprop("/FMGC/internal/rte-rsv", scratchpad);
|
||||
setprop("/FMGC/internal/rte-rsv-set", 1);
|
||||
setprop("/FMGC/internal/rte-percent", scratchpad / num(getprop("/FMGC/internal/trip-fuel")) * 100);
|
||||
setprop("/FMGC/internal/rte-percent-set", 0);
|
||||
setprop("/FMGC/internal/fuel-calculating", 1);
|
||||
setprop("/MCDU[" ~ i ~ "]/scratchpad", "");
|
||||
} else {
|
||||
|
|
@ -188,6 +194,29 @@ var initInputB = func(key, i) {
|
|||
if (scratchpad == "CLR") {
|
||||
setprop("/FMGC/internal/block", 0.0);
|
||||
setprop("/FMGC/internal/block-set", 0);
|
||||
setprop("/FMGC/internal/taxi-fuel", 0.4);
|
||||
setprop("/FMGC/internal/taxi-fuel-set", 0);
|
||||
setprop("/FMGC/internal/trip-fuel", 0);
|
||||
setprop("/FMGC/internal/trip-time", "0000");
|
||||
setprop("/FMGC/internal/rte-rsv", 0);
|
||||
setprop("/FMGC/internal/rte-rsv-set", 0);
|
||||
setprop("/FMGC/internal/rte-percent", 5.0);
|
||||
setprop("/FMGC/internal/rte-percent-set", 0);
|
||||
setprop("/FMGC/internal/alt-fuel", 0);
|
||||
setprop("/FMGC/internal/alt-fuel-set", 0);
|
||||
setprop("/FMGC/internal/alt-time", "0000");
|
||||
setprop("/FMGC/internal/final-fuel", 0);
|
||||
setprop("/FMGC/internal/final-fuel-set", 0);
|
||||
setprop("/FMGC/internal/final-time", "0030");
|
||||
setprop("/FMGC/internal/final-time-set", 0);
|
||||
setprop("/FMGC/internal/min-dest-fob", 0);
|
||||
setprop("/FMGC/internal/min-dest-fob-set", 0);
|
||||
setprop("/FMGC/internal/tow", 0);
|
||||
setprop("/FMGC/internal/lw", 0);
|
||||
setprop("/FMGC/internal/trip-wind", "HD000");
|
||||
setprop("/FMGC/internal/fffq-sensor", "FF+FQ");
|
||||
setprop("/FMGC/internal/extra-fuel", 0);
|
||||
setprop("/FMGC/internal/extra-time", "0000");
|
||||
setprop("/FMGC/internal/fuel-request-set", 0);
|
||||
setprop("/FMGC/internal/fuel-calculating", 0);
|
||||
setprop("/FMGC/internal/block-calculating", 0);
|
||||
|
|
|
|||
|
|
@ -99,8 +99,9 @@ var MCDU_reset = func(i) {
|
|||
setprop("/FMGC/internal/trip-fuel", 0);
|
||||
setprop("/FMGC/internal/trip-time", "0000");
|
||||
setprop("/FMGC/internal/rte-rsv", 0);
|
||||
setprop("/FMGC/internal/rte-rsv-set", 0);
|
||||
setprop("/FMGC/internal/rte-percent", 5.0);
|
||||
setprop("/FMGC/internal/rte-set", 0);
|
||||
setprop("/FMGC/internal/rte-percent-set", 0);
|
||||
setprop("/FMGC/internal/alt-fuel", 0);
|
||||
setprop("/FMGC/internal/alt-fuel-set", 0);
|
||||
setprop("/FMGC/internal/alt-time", "0000");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue