fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into FMGC

Browse source
This commit is contained in:
legoboyvdlp R 2020-03-24 13:28:31 +00:00
commit 91cf4d1db1
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Models/Instruments/MCDU/MCDU.nas
View file

@ -1701,7 +1701,7 @@ var canvas_MCDU_base = {
me["Simple_R6S"].setText("NEXT ");
if (zfwSet.getValue() == 1 and blockSet.getValue() == 1) {
lbs1000 = KG2LB * num(zfw.getValue() + block.getValue());
lbs1000 = num(zfw.getValue() + block.getValue());
tgt_f = ((0.4352 * lbs1000) + 51.006) * 1.47;
setprop("FMGC/internal/f-speed", tgt_f);
@ -1836,7 +1836,7 @@ var canvas_MCDU_base = {
me["Simple_R6S"].setText("NEXT ");
if (zfwSet.getValue() == 1 and blockSet.getValue() == 1) {
lbs1000 = KG2LB * num(zfw.getValue() + block.getValue());
lbs1000 = num(zfw.getValue() + block.getValue());
tgt_f = ((0.4352 * lbs1000) + 51.006) * 1.47;
setprop("FMGC/internal/f-speed", tgt_f);
@ -1968,7 +1968,7 @@ var canvas_MCDU_base = {
me["Simple_R5S"].setText("ENG OUT ACC");
if (zfwSet.getValue() == 1 and blockSet.getValue() == 1) {
lbs1000 = KG2LB * num(zfw.getValue() + block.getValue());
lbs1000 = num(zfw.getValue() + block.getValue());
tgt_f = ((0.4352 * lbs1000) + 51.006) * 1.47;
setprop("FMGC/internal/f-speed", tgt_f);

10
gui/dialogs/refuel.nas
View file

@ -523,31 +523,31 @@ var refuelClass = {
var actual_fuel = pts.Consumables.Fuel.totalFuelLbs.getValue();
}
if (me._fuelPreselectAmount >= 10.0) {
if (me._fuelPreselectAmount >= 9.95) {
me._FQI_pre.setText(sprintf("%2.1f", me._fuelPreselectAmount));
} else {
me._FQI_pre.setText(sprintf("%2.2f", me._fuelPreselectAmount));
}
if (me._fuelLeftAmount >= 10.0) {
if (me._fuelLeftAmount >= 9.95) {
me._FQI_L.setText(sprintf("%2.1f", me._fuelLeftAmount));
} else {
me._FQI_L.setText(sprintf("%2.2f", me._fuelLeftAmount));
}
if (me._fuelCenterAmount >= 10.0) {
if (me._fuelCenterAmount >= 9.95) {
me._FQI_C.setText(sprintf("%2.1f", me._fuelCenterAmount));
} else {
me._FQI_C.setText(sprintf("%2.2f", me._fuelCenterAmount));
}
if (me._fuelRightAmount >= 10.0) {
if (me._fuelRightAmount >= 9.95) {
me._FQI_R.setText(sprintf("%2.1f", me._fuelRightAmount));
} else {
me._FQI_R.setText(sprintf("%2.2f", me._fuelRightAmount));
}
if (me._fuelTotalAmount >= 10.0) {
if (me._fuelTotalAmount >= 9.95) {
me._FQI_actual.setText(sprintf("%2.1f", actual_fuel / 1000));
} else {
me._FQI_actual.setText(sprintf("%2.2f", actual_fuel / 1000));