1
0
Fork 0

Merge branch 'dev' into 3D

This commit is contained in:
Jonathan Redpath 2022-04-26 18:39:30 +01:00
commit 8591bf30c9

View file

@ -170,10 +170,10 @@ var canvas_upperECAM = {
obj["FlapDots"].hide();
}
}),
props.UpdateManager.FromHashValue("flexTemp", 1, func(val) {
props.UpdateManager.FromHashValue("flexTemp", 0.5, func(val) {
obj["FlxLimTemp"].setText(sprintf("%2.0d",val));
}),
props.UpdateManager.FromHashValue("slatLocked", nil, func(val) {
props.UpdateManager.FromHashValue("slatLocked", 1, func(val) {
if (val) {
if (slatLockGoing == 0) {
slatLockGoing = 1;
@ -188,10 +188,10 @@ var canvas_upperECAM = {
];
obj.update_items_fadec_powered_n1 = [
props.UpdateManager.FromHashValue("N1_1", 0.01, func(val) {
props.UpdateManager.FromHashValue("N1_1", 0.1, func(val) {
obj["N11-needle"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashValue("N1_2", 0.01, func(val) {
props.UpdateManager.FromHashValue("N1_2", 0.1, func(val) {
obj["N12-needle"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashValue("N1_actual_1", 0.025, func(val) {
@ -202,23 +202,23 @@ var canvas_upperECAM = {
obj["N12"].setText(sprintf("%s", math.floor(val + 0.05)));
obj["N12-decimal"].setText(sprintf("%s", int(10 * math.mod(val + 0.05, 1))));
}),
props.UpdateManager.FromHashValue("N1_lim", 0.01, func(val) {
props.UpdateManager.FromHashValue("N1_lim", 0.1, func(val) {
obj["N11-ylim"].setRotation((val + 90) * D2R);
obj["N12-ylim"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashValue("N1thr_1", 0.01, func(val) {
props.UpdateManager.FromHashValue("N1thr_1", 0.1, func(val) {
obj["N11-thr"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashValue("N1thr_2", 0.01, func(val) {
props.UpdateManager.FromHashValue("N1thr_2", 0.1, func(val) {
obj["N12-thr"].setRotation((val + 90) * D2R);
}),
];
obj.update_items_fadec_powered_epr = [
props.UpdateManager.FromHashValue("EPR_1", 0.0001, func(val) {
props.UpdateManager.FromHashValue("EPR_1", 0.1, func(val) {
obj["EPR1-needle"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashValue("EPR_2", 0.0001, func(val) {
props.UpdateManager.FromHashValue("EPR_2", 0.1, func(val) {
obj["EPR2-needle"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashValue("EPR_actual_1", 0.0001, func(val) {
@ -231,14 +231,14 @@ var canvas_upperECAM = {
obj["EPR2"].setText(sprintf("%1.0f", math.floor(epr2)));
obj["EPR2-decimal"].setText(sprintf("%03d", (epr2 - int(epr2)) * 1000));
}),
props.UpdateManager.FromHashValue("EPR_lim", 0.0001, func(val) {
props.UpdateManager.FromHashValue("EPR_lim", 0.1, func(val) {
obj["EPR1-ylim"].setRotation((val + 90) * D2R);
obj["EPR2-ylim"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashValue("EPRthr_1", 0.0001, func(val) {
props.UpdateManager.FromHashValue("EPRthr_1", 0.1, func(val) {
obj["EPR1-thr"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashValue("EPRthr_2", 0.0001, func(val) {
props.UpdateManager.FromHashValue("EPRthr_2", 0.1, func(val) {
obj["EPR2-thr"].setRotation((val + 90) * D2R);
}),
];
@ -379,13 +379,13 @@ var canvas_upperECAM = {
props.UpdateManager.FromHashValue("egt_1", 0.5, func(val) {
obj["EGT1"].setText(sprintf("%s", math.round(val)));
}),
props.UpdateManager.FromHashValue("egt_1_needle", 0.01, func(val) {
props.UpdateManager.FromHashValue("egt_1_needle", 0.1, func(val) {
obj["EGT1-needle"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashValue("egt_2", 0.5, func(val) {
obj["EGT2"].setText(sprintf("%s", math.round(val)));
}),
props.UpdateManager.FromHashValue("egt_2_needle", 0.01, func(val) {
props.UpdateManager.FromHashValue("egt_2_needle", 0.1, func(val) {
obj["EGT2-needle"].setRotation((val + 90) * D2R);
}),
];