Revert "bugfix"

This reverts commit 3277eeb76d.

Conflicts:
	Nasal/LGCIU.nas
This commit is contained in:
Jonathan Redpath 2017-01-03 16:54:45 +00:00
parent cfde3e334b
commit 13e94270e4

View file

@ -25,7 +25,6 @@ var lgciu_one_init = func {
setprop("/controls/lgciu[0]/inuse",1); #the LGCIUs switch between eachother on each gear cycle. eg if one LGCIU fails put the gear down and bring them up again to reset setprop("/controls/lgciu[0]/inuse",1); #the LGCIUs switch between eachother on each gear cycle. eg if one LGCIU fails put the gear down and bring them up again to reset
setprop("/controls/lgciu[0]/hasbeenret",0); #has the gear been retracted with LGCIU1? setprop("/controls/lgciu[0]/hasbeenret",0); #has the gear been retracted with LGCIU1?
setprop("/controls/lgciu[0]/fail",0); #0 = no 1 = yes setprop("/controls/lgciu[0]/fail",0); #0 = no 1 = yes
setprop("/controls/lgciu[0]/emermanext",0); #0 = no 1 = extended can only be retracted if green hyd is available
} }
var lgciu_two_init = func { var lgciu_two_init = func {
@ -174,16 +173,21 @@ setprop("/controls/lgciu[0]/hasbeenret",1); #we have put gear up on lgciu no 1
setprop("/controls/lgciu[0]/inuse",1); #we want to keep active LGCIU on no 1 setprop("/controls/lgciu[0]/inuse",1); #we want to keep active LGCIU on no 1
setprop("/controls/lgciu[0]/gearlever",0); #0 = retracted, 1 = extended setprop("/controls/lgciu[0]/gearlever",0); #0 = retracted, 1 = extended
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
setprop("/controls/lgciu[1]/gearlever",0); #0 = retracted, 1 = extended setprop("/controls/lgciu[1]/gearlever",0); #0 = retracted, 1 = extended
>>>>>>> parent of 266e6c0... Revert: Nasal error, failure not required at this time >>>>>>> parent of 266e6c0... Revert: Nasal error, failure not required at this time
=======
>>>>>>> parent of 3277eeb... bugfix
} else { } else {
if ((inuse2 == 1) and (isgearupordown == 0) and (hydsupp == 1)) { if ((inuse2 == 1) and (isgearupordown == 0) and (hydsupp == 1)) {
setprop("/controls/lgciu[1]/hasbeenret",1); #we have put gear up on lgciu no 2 setprop("/controls/lgciu[1]/hasbeenret",1); #we have put gear up on lgciu no 2
setprop("/controls/lgciu[1]/inuse",1); #we want to keep active LGCIU on no 2 setprop("/controls/lgciu[1]/inuse",1); #we want to keep active LGCIU on no 2
setprop("/controls/lgciu[0]/gearlever",0); #0 = retracted, 1 = extended setprop("/controls/lgciu[0]/gearlever",0); #0 = retracted, 1 = extended
setprop("/controls/lgciu[1]/gearlever",0); #0 = retracted, 1 = extended setprop("/controls/lgciu[1]/gearlever",0); #0 = retracted, 1 = extended
} else {
} }
} }
}); });
@ -236,6 +240,7 @@ setprop("/controls/lgciu[0]/inuse",0);
setprop("/controls/lgciu[0]/gearlever",1); #0 = retracted, 1 = extended setprop("/controls/lgciu[0]/gearlever",1); #0 = retracted, 1 = extended
setprop("/controls/lgciu[1]/gearlever",1); #0 = retracted, 1 = extended setprop("/controls/lgciu[1]/gearlever",1); #0 = retracted, 1 = extended
} }
}
); );
# No 1 failed # No 1 failed
@ -246,7 +251,6 @@ setprop("/controls/lgciu[0]/inuse",0);
setprop("/controls/lgciu[1]/inuse",1); setprop("/controls/lgciu[1]/inuse",1);
print("LGCIU No 1... Failed!"); print("LGCIU No 1... Failed!");
} else { } else {
print("LGCIU No 1... Serviceable!");
} }
}); });