Merge pull request #1 from it0uchpods/master

ITAF Update
This commit is contained in:
Brandon Amaro 2017-04-14 20:21:25 -07:00 committed by GitHub
commit e718a4ed10
2 changed files with 6 additions and 5 deletions

View file

@ -64,7 +64,7 @@ setlistener("/it-autoflight/mode/vert", func {
setprop("/modes/pfd/fma/pitch-mode", "OP DES"); setprop("/modes/pfd/fma/pitch-mode", "OP DES");
} else if (vert == "FPA") { } else if (vert == "FPA") {
setprop("/modes/pfd/fma/pitch-mode", "FPA"); setprop("/modes/pfd/fma/pitch-mode", "FPA");
} else if (vert == "LAND 3") { } else if (vert == "LAND") {
setprop("/modes/pfd/fma/pitch-mode", "LAND"); setprop("/modes/pfd/fma/pitch-mode", "LAND");
} else if (vert == "FLARE") { } else if (vert == "FLARE") {
setprop("/modes/pfd/fma/pitch-mode", "FLARE"); setprop("/modes/pfd/fma/pitch-mode", "FLARE");

View file

@ -1,6 +1,6 @@
# IT AUTOFLIGHT System Controller # IT AUTOFLIGHT System Controller
# Joshua Davidson (it0uchpods) # Joshua Davidson (it0uchpods)
# V3.0.0 Build 169 # V3.0.0 Build 171
# This program is 100% GPL! # This program is 100% GPL!
print("IT-AUTOFLIGHT: Please Wait!"); print("IT-AUTOFLIGHT: Please Wait!");
@ -58,7 +58,7 @@ var ap_init = func {
setprop("/it-autoflight/mode/lat", "T/O"); setprop("/it-autoflight/mode/lat", "T/O");
setprop("/it-autoflight/mode/vert", "T/O CLB"); setprop("/it-autoflight/mode/vert", "T/O CLB");
setprop("/it-autoflight/mode/prof", "NONE"); setprop("/it-autoflight/mode/prof", "NONE");
setprop("/it-autoflight/input/spd-kts", 200); setprop("/it-autoflight/input/spd-kts", 250);
setprop("/it-autoflight/input/spd-mach", 0.68); setprop("/it-autoflight/input/spd-mach", 0.68);
update_armst.start(); update_armst.start();
thrustmode(); thrustmode();
@ -294,7 +294,7 @@ var vertical = func {
setprop("/it-autoflight/output/loc-armed", 1); setprop("/it-autoflight/output/loc-armed", 1);
} }
if ((getprop("/it-autoflight/output/vert") == 2) or (getprop("/it-autoflight/output/vert") == 6)) { if ((getprop("/it-autoflight/output/vert") == 2) or (getprop("/it-autoflight/output/vert") == 6)) {
# Do nothing because G/S or LAND 3 or FLARE is active # Do nothing because G/S or LAND or FLARE is active
} else { } else {
setprop("/instrumentation/nav[0]/gs-rate-of-climb", 0); setprop("/instrumentation/nav[0]/gs-rate-of-climb", 0);
setprop("/instrumentation/nav[1]/gs-rate-of-climb", 0); setprop("/instrumentation/nav[1]/gs-rate-of-climb", 0);
@ -359,7 +359,7 @@ var vertical = func {
thrustmode(); thrustmode();
} else if (vertset == 6) { } else if (vertset == 6) {
setprop("/it-autoflight/output/vert", 6); setprop("/it-autoflight/output/vert", 6);
setprop("/it-autoflight/mode/vert", "LAND 3"); setprop("/it-autoflight/mode/vert", "LAND");
setprop("/it-autoflight/mode/arm", " "); setprop("/it-autoflight/mode/arm", " ");
thrustmode(); thrustmode();
alandt.stop(); alandt.stop();
@ -749,6 +749,7 @@ var apparmcheck = func {
} }
var make_appr_active = func { var make_appr_active = func {
prof_sys_stop();
setprop("/it-autoflight/output/appr-armed", 0); setprop("/it-autoflight/output/appr-armed", 0);
setprop("/it-autoflight/output/vert", 2); setprop("/it-autoflight/output/vert", 2);
setprop("/it-autoflight/mode/vert", "G/S"); setprop("/it-autoflight/mode/vert", "G/S");