diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-APU.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-APU.nas index f1b448e5..ebbed9c4 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-APU.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-APU.nas @@ -179,7 +179,6 @@ var canvas_lowerECAMPageApu = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -189,26 +188,28 @@ var canvas_lowerECAMPageApu = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -219,11 +220,6 @@ var canvas_lowerECAMPageApu = return ["APUN-needle","APUEGT-needle","APUN","APUEGT","APUAvail","APUFlapOpen","APUBleedValve","APUBleedOnline","APUBleedValveCrossBar","APUGenOnline","APUGenOff","APUGentext","APUGenLoad","APUGenbox","APUGenVolt","APUGenHz","APUBleedPSI","APUfuelLO","APU-low-oil","text3724","text3728","text3732"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -237,7 +233,7 @@ var canvas_lowerECAMPageApu = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -245,12 +241,17 @@ var canvas_lowerECAMPageApu = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-bleed.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-bleed.nas index 0535e6d9..6aba6de0 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-bleed.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-bleed.nas @@ -388,7 +388,6 @@ var canvas_lowerECAMPageBleed = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -398,26 +397,28 @@ var canvas_lowerECAMPageBleed = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -436,11 +437,6 @@ var canvas_lowerECAMPageBleed = "BLEED-Pack-1-Flow-Valve-Cross","BLEED-Pack-2-Flow-Valve-Cross","BLEED-Pack-1-connection","BLEED-Pack-2-connection"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -454,7 +450,7 @@ var canvas_lowerECAMPageBleed = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -462,12 +458,17 @@ var canvas_lowerECAMPageBleed = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-cond.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-cond.nas index 174aff80..f8c9052a 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-cond.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-cond.nas @@ -76,7 +76,6 @@ var canvas_lowerECAMPageCond = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -86,26 +85,28 @@ var canvas_lowerECAMPageCond = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -117,11 +118,6 @@ var canvas_lowerECAMPageCond = "CONDDuctTempAFT","CONDDuctTempFWD","CONDTempCKPT","CONDTempAFT","CONDTempFWD","CONDHotAirValveCross"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -135,7 +131,7 @@ var canvas_lowerECAMPageCond = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -143,12 +139,17 @@ var canvas_lowerECAMPageCond = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas index ccd49ce4..a2935c5d 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas @@ -137,7 +137,6 @@ var canvas_lowerECAMPageCruise = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -147,26 +146,28 @@ var canvas_lowerECAMPageCruise = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -177,11 +178,6 @@ var canvas_lowerECAMPageCruise = return["Oil1","Oil2","OilUnit","FUsed1","FUsed2","FUsed","VIB1N1","VIB1N2","VIB2N1","VIB2N2","deltaPSI","LDGELEV-AUTO","LDGELEV","CABVS","CABALT","VS-Arrow-UP","VS-Arrow-DN","CKPT-TEMP","FWD-TEMP","AFT-TEMP","Fused-weight-unit"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -195,7 +191,7 @@ var canvas_lowerECAMPageCruise = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -203,12 +199,17 @@ var canvas_lowerECAMPageCruise = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas index e1ab7414..a8d95f61 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas @@ -201,7 +201,6 @@ var canvas_lowerECAMPageDoor = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -211,26 +210,28 @@ var canvas_lowerECAMPageDoor = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -244,11 +245,6 @@ var canvas_lowerECAMPageDoor = "Cabin4LeftSlide","Cabin4Right","Cabin4RightLbl","Cabin4RightLine","Cabin4RightSlide","DOOROXY-REGUL-LO-PR","DOOROXY-PR","DOOROXY-OxyIndicator","DOOR-VS","DOOR-VS-Container"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -262,7 +258,7 @@ var canvas_lowerECAMPageDoor = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -270,12 +266,17 @@ var canvas_lowerECAMPageDoor = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-elec.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-elec.nas index 3ea9e4e0..087f4da3 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-elec.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-elec.nas @@ -668,7 +668,6 @@ var canvas_lowerECAMPageElec = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -678,26 +677,28 @@ var canvas_lowerECAMPageElec = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -714,11 +715,6 @@ var canvas_lowerECAMPageElec = "ELEC-ACESS-SHED-label","ELEC-DCBAT-label","ELEC-DCESS-label","ELEC-DC2-label","ELEC-DC1-label","ELEC-AC1-label","ELEC-AC2-label","ELEC-ACESS-label","ELEC-Line-ESSTR-DCESS-off","ELEC-Line-Emergen-ESSTR-off","STATINV-group","StatVolt","StatHz"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -732,7 +728,7 @@ var canvas_lowerECAMPageElec = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -740,12 +736,17 @@ var canvas_lowerECAMPageElec = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-eng.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-eng.nas index 6e917dcd..f7604974 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-eng.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-eng.nas @@ -130,7 +130,6 @@ var canvas_lowerECAMPageEng = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -140,26 +139,28 @@ var canvas_lowerECAMPageEng = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -172,11 +173,6 @@ var canvas_lowerECAMPageEng = "VIB-N1-1","VIB-N1-2","VIB-N2-1","VIB-N2-2"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -190,7 +186,7 @@ var canvas_lowerECAMPageEng = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -198,12 +194,17 @@ var canvas_lowerECAMPageEng = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-fctl.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-fctl.nas index 2bdf3c8f..2faec720 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-fctl.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-fctl.nas @@ -466,7 +466,6 @@ var canvas_lowerECAMPageFctl = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -476,26 +475,28 @@ var canvas_lowerECAMPageFctl = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -509,11 +510,6 @@ var canvas_lowerECAMPageFctl = "spoiler5Lf","ailLscale","ailRscale","path4249","path4249-3","path4249-3-6-7","path4249-3-6-7-5","path4249-3-6","pitchTrimStatus","rudderTrimInd"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -527,7 +523,7 @@ var canvas_lowerECAMPageFctl = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -535,12 +531,17 @@ var canvas_lowerECAMPageFctl = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-fuel.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-fuel.nas index d86417bc..7d441c76 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-fuel.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-fuel.nas @@ -450,7 +450,6 @@ var canvas_lowerECAMPageFuel = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -460,26 +459,28 @@ var canvas_lowerECAMPageFuel = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -495,11 +496,6 @@ var canvas_lowerECAMPageFuel = "Fused-weight-unit","FFlow-weight-unit","FOB-weight-unit","FUEL-ENG-Master-1-Cross","FUEL-ENG-Master-2-Cross","FUEL-Pump-Left-1-Square","FUEL-Pump-Left-2-Square","FUEL-Pump-Center-1-Square","FUEL-Pump-Center-2-Square","FUEL-Pump-Right-1-Square","FUEL-Pump-Right-2-Square"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -513,7 +509,7 @@ var canvas_lowerECAMPageFuel = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -521,12 +517,17 @@ var canvas_lowerECAMPageFuel = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-hyd.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-hyd.nas index 58be67a7..8be74e8d 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-hyd.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-hyd.nas @@ -409,7 +409,6 @@ var canvas_lowerECAMPageHyd = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -419,26 +418,28 @@ var canvas_lowerECAMPageHyd = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -452,11 +453,6 @@ var canvas_lowerECAMPageHyd = "LO-AIR-PRESS-Yellow","LO-AIR-PRESS-Blue","OVHT-Green","OVHT-Blue","OVHT-Yellow","Quantity-Indicator-Green","Quantity-Indicator-Blue","Quantity-Indicator-Yellow","Green-label","Blue-label","Yellow-label","Fire-Valve-Yellow-Cross","Fire-Valve-Green-Cross","path5561","path5561-4","path5561-5"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -470,7 +466,7 @@ var canvas_lowerECAMPageHyd = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -478,12 +474,17 @@ var canvas_lowerECAMPageHyd = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-press.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-press.nas index f971357e..21ace13e 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-press.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-press.nas @@ -100,7 +100,6 @@ var canvas_lowerECAMPagePress = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -110,26 +109,28 @@ var canvas_lowerECAMPagePress = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -142,11 +143,6 @@ var canvas_lowerECAMPagePress = "PRESS-Pack-1","PRESS-Pack-2"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -160,7 +156,7 @@ var canvas_lowerECAMPagePress = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -168,12 +164,17 @@ var canvas_lowerECAMPagePress = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-sts.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-sts.nas index a89a41c7..e06a08d0 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-sts.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-sts.nas @@ -25,7 +25,6 @@ var canvas_lowerECAMPageSts = obj.update_items = [ ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -35,26 +34,28 @@ var canvas_lowerECAMPageSts = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -65,13 +66,9 @@ var canvas_lowerECAMPageSts = return["Bulk","BulkLine","BulkLbl","Exit1L","Exit1R","Cabin1Left","Cabin1LeftLbl","Cabin1LeftLine","Cabin1LeftSlide","Cabin1Right","Cabin1RightLbl","Cabin1RightLine","Cabin1RightSlide","Cabin2Left","Cabin2LeftLbl", "Cabin2LeftLine","Cabin2LeftSlide","Cabin2Right","Cabin2RightLbl","Cabin2RightLine","Cabin2RightSlide","Cabin3Left","Cabin3LeftLbl","Cabin3LeftLine","Cabin3LeftSlide","Cabin3Right","Cabin3RightLbl","Cabin3RightLine","Cabin3RightSlide","AvionicsLine1", "AvionicsLbl1","AvionicsLine2","AvionicsLbl2","Cargo1Line","Cargo1Lbl","Cargo1Door","Cargo2Line","Cargo2Lbl","Cargo2Door","ExitLSlide","ExitLLine","ExitLLbl","ExitRSlide","ExitRLine","ExitRLbl","Cabin4Left","Cabin4LeftLbl","Cabin4LeftLine", - "Cabin4LeftSlide","Cabin4Right","Cabin4RightLbl","Cabin4RightLine","Cabin4RightSlide","DOOROXY-REGUL-LO-PR"];}, + "Cabin4LeftSlide","Cabin4Right","Cabin4RightLbl","Cabin4RightLine","Cabin4RightSlide","DOOROXY-REGUL-LO-PR"]; + }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -85,7 +82,7 @@ var canvas_lowerECAMPageSts = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -93,12 +90,17 @@ var canvas_lowerECAMPageSts = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower(); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-wheel.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-wheel.nas index b3aebf60..7031b7ba 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-wheel.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-wheel.nas @@ -584,7 +584,6 @@ var canvas_lowerECAMPageWheel = }), ]; - obj.displayedGForce = 0; obj.updateItemsBottom = [ props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { obj.units = val; @@ -594,26 +593,28 @@ var canvas_lowerECAMPageWheel = obj["GW-weight-unit"].setText("LBS"); } }), - props.UpdateManager.FromHashValue("hour", nil, func(val) { + props.UpdateManager.FromHashValue("hour", 1, func(val) { obj["UTCh"].setText(sprintf("%02d", val)); }), - props.UpdateManager.FromHashValue("minute", nil, func(val) { + props.UpdateManager.FromHashValue("minute", 1, func(val) { obj["UTCm"].setText(sprintf("%02d", val)); }), props.UpdateManager.FromHashValue("gForce", 0.05, func(val) { - if (obj.displayedGForce) { - obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); - } + obj["GLoad"].setText("G.LOAD " ~ sprintf("%3.1f", val)); }), props.UpdateManager.FromHashValue("gForceDisplay", nil, func(val) { - if ((val == 1 and !obj.displayedGForce) or (val != 0 and obj.displayedGForce)) { - obj.displayedGForce = 1; + if (val) { obj["GLoad"].show(); } else { - obj.displayedGForce = 0; obj["GLoad"].hide(); } }), + props.UpdateManager.FromHashValue("satTemp", 0.5, func(val) { + obj["SAT"].setText(sprintf("%+2.0f", val)); + }), + props.UpdateManager.FromHashValue("tatTemp", 0.5, func(val) { + obj["TAT"].setText(sprintf("%+2.0f", val)); + }), ]; return obj; }, @@ -632,11 +633,6 @@ var canvas_lowerECAMPageWheel = "releaseL3","releaseL4","releaseR3","releaseR4"]; }, updateBottom: func(notification) { - foreach(var update_item_bottom; me.updateItemsBottom) - { - update_item_bottom.update(notification); - } - if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (me.units) { me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100))); @@ -650,7 +646,7 @@ var canvas_lowerECAMPageWheel = } if (dmc.DMController.DMCs[1].outputs[4] != nil) { - me["SAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[4].getValue())); + notification.satTemp = dmc.DMController.DMCs[1].outputs[4].getValue(); me["SAT"].setColor(0.0509,0.7529,0.2941); } else { me["SAT"].setText(sprintf("%s", "XX")); @@ -658,12 +654,17 @@ var canvas_lowerECAMPageWheel = } if (dmc.DMController.DMCs[1].outputs[5] != nil) { - me["TAT"].setText(sprintf("%+2.0f", dmc.DMController.DMCs[1].outputs[5].getValue())); + notification.tatTemp = dmc.DMController.DMCs[1].outputs[5].getValue(); me["TAT"].setColor(0.0509,0.7529,0.2941); } else { me["TAT"].setText(sprintf("%s", "XX")); me["TAT"].setColor(0.7333,0.3803,0); } + + foreach(var update_item_bottom; me.updateItemsBottom) + { + update_item_bottom.update(notification); + } }, update: func(notification) { me.updatePower();