fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
Jonathan Redpath 2022-05-05 15:47:54 +01:00
commit 103ca2f7f8
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Models/Instruments/PFD/PFD.nas
View file

@ -438,23 +438,18 @@ var canvas_pfd = {
}), }),
props.UpdateManager.FromHashList(["altimeterHpa","altimeterInhg","altimeterInhgModeLeft","altimeterInhgModeRight"], 0.005, func(val) { props.UpdateManager.FromHashList(["altimeterHpa","altimeterInhg","altimeterInhgModeLeft","altimeterInhgModeRight"], 0.005, func(val) {
if ((obj.number == 0 and val.altimeterInhgModeLeft == 0) or (obj.number == 1 and val.altimeterInhgModeRight == 0)) { if ((obj.number == 0 and val.altimeterInhgModeLeft == 0) or (obj.number == 1 and val.altimeterInhgModeRight == 0)) {
obj["QNH_setting"].setText(sprintf("%4.0f", val.altimeterHpa)); obj["QNH_setting"].setText(sprintf("%4d", val.altimeterHpa));
} else { } else {
obj["QNH_setting"].setText(sprintf("%2.2f", val.altimeterInhg)); obj["QNH_setting"].setText(sprintf("%2.2f", val.altimeterInhg));
} }
}), }),
props.UpdateManager.FromHashList(["altimeterStd","altitudeAutopilot"], 1, func(val) { props.UpdateManager.FromHashList(["altimeterStd","altitudeAutopilot"], 1, func(val) {
if (val.altimeterStd == 1) { if (val.altimeterStd == 1) {
if (val.altitudeAutopilot < 10000) { obj["ALT_digit_UP"].setText(sprintf("FL%3d", val.altitudeAutopilot / 100));
obj["ALT_digit_UP"].setText(sprintf("%s", "FL " ~ val.altitudeAutopilot / 100)); obj["ALT_digit_DN"].setText(sprintf("FL%3d", val.altitudeAutopilot / 100));
obj["ALT_digit_DN"].setText(sprintf("%s", "FL " ~ val.altitudeAutopilot / 100));
} else {
obj["ALT_digit_UP"].setText(sprintf("%s", "FL " ~ val.altitudeAutopilot / 100));
obj["ALT_digit_DN"].setText(sprintf("%s", "FL " ~ val.altitudeAutopilot / 100));
}
} else { } else {
obj["ALT_digit_UP"].setText(sprintf("%5.0f", val.altitudeAutopilot)); obj["ALT_digit_UP"].setText(sprintf("%5d", val.altitudeAutopilot));
obj["ALT_digit_DN"].setText(sprintf("%5.0f", val.altitudeAutopilot)); obj["ALT_digit_DN"].setText(sprintf("%5d", val.altitudeAutopilot));
} }
}), }),
props.UpdateManager.FromHashValue("managedSpd", 1, func(val) { props.UpdateManager.FromHashValue("managedSpd", 1, func(val) {

2
Nasal/Systems/electrical.nas
View file

@ -195,7 +195,7 @@ var ELEC = {
me.Fail.tr2Fault.setBoolValue(0); me.Fail.tr2Fault.setBoolValue(0);
}, },
loop: func() { loop: func() {
# Empty # Empty, required for Emesary
}, },
}; };

14
Nasal/Systems/tyresmoke.nas
View file

@ -10,26 +10,26 @@ var tyresmoke_2 = aircraft.tyresmoke.new(2, 0, 0.8, 0);
setlistener("/gear/gear[0]/position-norm", func { setlistener("/gear/gear[0]/position-norm", func {
if (pts.Gear.position[0].getValue()){ if (pts.Gear.position[0].getValue()){
run_tyresmoke0 = 1; run_tyresmoke0 = 1;
}else{ } else {
run_tyresmoke0 = 0; run_tyresmoke0 = 0;
} }
},1,0); }, 1, 0);
setlistener("/gear/gear[1]/position-norm", func { setlistener("/gear/gear[1]/position-norm", func {
if (pts.Gear.position[1].getValue()){ if (pts.Gear.position[1].getValue()){
run_tyresmoke1 = 1; run_tyresmoke1 = 1;
}else{ } else {
run_tyresmoke1 = 0; run_tyresmoke1 = 0;
} }
},1,0); }, 1, 0);
setlistener("/gear/gear[2]/position-norm", func { setlistener("/gear/gear[2]/position-norm", func {
if (pts.Gear.position[2].getValue()){ if (pts.Gear.position[2].getValue()){
run_tyresmoke2 = 1; run_tyresmoke2 = 1;
}else{ } else {
run_tyresmoke2 = 0; run_tyresmoke2 = 0;
} }
},1,0); }, 1, 0);
#============================ Rain =================================== #============================ Rain ===================================
aircraft.rain.init(); aircraft.rain.init();
@ -44,7 +44,7 @@ var tyresmoke_and_rain = func {
tyresmoke_2.update(); tyresmoke_2.update();
aircraft.rain.update(); aircraft.rain.update();
settimer(tyresmoke_and_rain, 0); settimer(tyresmoke_and_rain, 0);
}# end tyresmoke_and_rain }
# == fire it up === # == fire it up ===
tyresmoke_and_rain(); tyresmoke_and_rain();