diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index bca6a117..14e88beb 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -775,7 +775,11 @@ var canvas_MCDU_base = { var p = logs[i].state; if (p == 4) p = 3; # RETURN-IN me[rowsC[p]].setText(logs[i].time); - me[rowsR[p]].setText(sprintf("%3.1f ",logs[i].fob)); + if (acconfig_weight_kgs.getValue() == 1) { + me[rowsR[p]].setText(sprintf("%3.1f ",logs[i].fob * LBS2KGS)); + } else { + me[rowsR[p]].setText(sprintf("%3.1f ",logs[i].fob)); + } } } @@ -852,8 +856,8 @@ var canvas_MCDU_base = { me["Simple_R3S"].setText(sprintf("%-10s",(doorL4_pos.getValue() > 0.1) ? "OPEN" : "CLOSED")); me["Simple_R3"].setText(sprintf("%-10s",(doorR4_pos.getValue() > 0.1) ? "OPEN" : "CLOSED")); me["Simple_R4S"].setText(sprintf("%-10s",sprintf("%03.3f",pts.Velocities.groundspeed.getValue()))); - if (getprop("/options/system/weight-kgs") == 1) { - me["Simple_R4"].setText(sprintf("%-10s",sprintf("%03.1f",fmgc.FMGCInternal.fob * LBS2KGS ))); + if (acconfig_weight_kgs.getValue() == 1) { + me["Simple_R4"].setText(sprintf("%-10s",sprintf("%03.1f",fmgc.FMGCInternal.fob * LBS2KGS))); } else { me["Simple_R4"].setText(sprintf("%-10s",sprintf("%03.1f",fmgc.FMGCInternal.fob))); } diff --git a/Nasal/MCDU/FLIGHTLOG.nas b/Nasal/MCDU/FLIGHTLOG.nas index b12ac600..e9da0033 100644 --- a/Nasal/MCDU/FLIGHTLOG.nas +++ b/Nasal/MCDU/FLIGHTLOG.nas @@ -5,8 +5,8 @@ var OOOIReport = { new: func(state,time=0,fob="") { var report = {parents:[OOOIReport]}; report.state = state; - if (getprop("/options/system/weight-kgs") == 1) { - report.fob = (fob != "") ? fob : fmgc.FMGCInternal.fob * LBS2KGS + if (acconfig_weight_kgs.getValue() == 1) { + report.fob = (fob != "") ? fob : fmgc.FMGCInternal.fob * LBS2KGS; } else { report.fob = (fob != "") ? fob : fmgc.FMGCInternal.fob; }