merge conf

Nasal/LGCIU.nas

@@ -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]/hasbeenret",0); #has the gear been retracted with LGCIU1?
 	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 {
@@ -53,7 +52,6 @@ var lgciu_two_init = func {
 	setprop("/controls/lgciu[1]/emermanext",0); #0 = no 1 = extended can only be retracted if green hyd is available
 	setprop("/controls/lgciu[0]/init",1); #these two properties say that 'everything is ready now'
 	setprop("/controls/lgciu[1]/init",1); 
-
 }
 
 
@@ -170,13 +168,11 @@ if ((inuse1 == 1) and (isgearupordown == 0) and (hydsupp == 1)) {
 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]/gearlever",0); #0 = retracted, 1 = extended
-setprop("/controls/lgciu[1]/gearlever",0); #0 = retracted, 1 = extended
 
 } else {
 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]/inuse",1); #we want to keep active LGCIU on no 2
-setprop("/controls/lgciu[0]/gearlever",0); #0 = retracted, 1 = extended
 setprop("/controls/lgciu[1]/gearlever",0); #0 = retracted, 1 = extended
 } else {
 }
@@ -191,20 +187,18 @@ var hasbeen1 = getprop("/controls/lgciu[0]/hasbeenret");
 var hasbeen2 = getprop("/controls/lgciu[1]/hasbeenret");
 var isgearupordown = getprop("/controls/gear/gear-down");
 var hydsupp = getprop("/controls/lgciu[0]/hyd/greensupply");
-var no1fail = getprop("/controls/lgciu[0]/fail");
-var no2fail = getprop("/controls/lgciu[1]/fail");
 if ((inuse1 == 1) and (isgearupordown == 1) and (hasbeen1 == 1) and (hydsupp == 1)) {
 setprop("/controls/lgciu[0]/hasbeenret",0); #reset retraction sensor
 setprop("/controls/lgciu[0]/inuse",0); #we want to switch to no 2 after putting the gear down
 setprop("/controls/lgciu[1]/inuse",1);
 setprop("/controls/lgciu[0]/gearlever",1); #0 = retracted, 1 = extended
-setprop("/controls/lgciu[1]/gearlever",1); #0 = retracted, 1 = extended
+} else {
-} else if ((inuse2 == 1) and (isgearupordown == 1) and (hasbeen2 == 1) and (hydsupp == 1)) {
+if ((inuse2 == 1) and (isgearupordown == 1) and (hasbeen2 == 1) and (hydsupp == 1)) {
 setprop("/controls/lgciu[1]/hasbeenret",0); #reset retraction sensor
 setprop("/controls/lgciu[0]/inuse",1); #we want to switch to no 1 after putting the gear down
 setprop("/controls/lgciu[1]/inuse",0);
-setprop("/controls/lgciu[0]/gearlever",1); #0 = retracted, 1 = extended
 setprop("/controls/lgciu[1]/gearlever",1); #0 = retracted, 1 = extended
+<<<<<<< HEAD
 } else if ((inuse1 == 1) and (isgearupordown == 1) and (hasbeen1 == 1) and (hydsupp ==1) and (no2fail == 1)) {
 setprop("/controls/lgciu[0]/hasbeenret",0); #reset retraction sensor
 setprop("/controls/lgciu[0]/inuse",1); #we want to switch to no 2 after putting the gear down but we cant because it is failed
@@ -229,7 +223,6 @@ setprop("/controls/lgciu[0]/inuse",0);
 setprop("/controls/lgciu[1]/inuse",1);
 print("LGCIU No 1... Failed!");
 } else {
-print("LGCIU No 1... Serviceable!");
 }
 });
 
@@ -244,3 +237,4 @@ print("LGCIU No 2... Failed!");
 print("LGCIU No 2... Serviceable!");
 }
 });
+