diff --git a/A320-main.xml b/A320-main.xml index de5022c8..28e1372c 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -717,6 +717,13 @@ + + + 0 + 0 + 0 + + 0 0 diff --git a/Models/Instruments/Radio/Radio1.xml b/Models/Instruments/Radio/Radio1.xml index ea769585..8774a319 100644 --- a/Models/Instruments/Radio/Radio1.xml +++ b/Models/Instruments/Radio/Radio1.xml @@ -8,7 +8,7 @@ - res/Radio1.ac + res/Radio.ac @@ -1027,48 +1027,10 @@ controls/radio/rmp[0]/on 1 - - - systems/radio/rmp[0]/sel_chan - vhf2 - - - systems/radio/rmp[0]/sel_chan - vhf3 - - - systems/radio/rmp[0]/sel_chan - hf1 - - - systems/radio/rmp[0]/sel_chan - hf2 - - - systems/radio/rmp[1]/sel_chan - vhf1 - - - systems/radio/rmp[1]/sel_chan - vhf3 - - - systems/radio/rmp[1]/sel_chan - hf1 - - - systems/radio/rmp[1]/sel_chan - hf2 - - - systems/radio/rmp[2]/sel_chan - vhf1 - - - systems/radio/rmp[2]/sel_chan - vhf2 - - + + systems/radio/rmp[0]/sel-light + 1 + @@ -1390,18 +1352,6 @@ systems/electrical/bus/dc-ess 25 - - - - systems/radio/rmp[0]/sel_chan - vhf3 - - - instrumentation/comm[2]/frequencies/selected-mhz - 0 - - - @@ -1431,61 +1381,6 @@ - - - select - rmp-active-vhf3-data - - - - controls/switches/annun-test - 1 - - - controls/radio/rmp[0]/on - 1 - - - systems/electrical/bus/dc-ess - 25 - - - systems/radio/rmp[0]/sel_chan - vhf3 - - - instrumentation/comm[2]/frequencies/selected-mhz - 0 - - - - - - - rmp-active-vhf3-data - - -0.23205 - -0.21625 - -0.12582 - 90 - - center-center - xy-plane - text-value - data - autopilot/servicable - false - led.txf - true - false - false - 0.008 - - 32 - 32 - - - select @@ -1541,18 +1436,6 @@ systems/electrical/bus/dc-ess 25 - - - - systems/radio/rmp[0]/sel_chan - vhf3 - - - systems/radio/rmp[0]/vhf3-standby - 0 - - - @@ -1582,61 +1465,6 @@ - - - select - rmp-standby-vhf3-data - - - - controls/switches/annun-test - 1 - - - controls/radio/rmp[0]/on - 1 - - - systems/electrical/bus/dc-ess - 25 - - - systems/radio/rmp[0]/sel_chan - vhf3 - - - systems/radio/rmp[0]/vhf3-standby - 0 - - - - - - - rmp-standby-vhf3-data - - -0.23205 - -0.14896 - -0.12582 - 90 - - center-center - xy-plane - text-value - data - autopilot/servicable - false - led.txf - true - false - false - 0.008 - - 32 - 32 - - - select @@ -1679,10 +1507,8 @@ material rmp-active rmp-active-test - rmp-active-vhf3-data rmp-standby rmp-standby-test - rmp-standby-vhf3-data 0.89 0.37 diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml index be7ac934..82a952ba 100644 --- a/Models/Instruments/Radio/Radio2.xml +++ b/Models/Instruments/Radio/Radio2.xml @@ -8,7 +8,7 @@ - res/Radio1.ac + res/Radio.ac @@ -56,7 +56,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -83,7 +83,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -110,7 +110,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -137,7 +137,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -164,7 +164,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -190,7 +190,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -222,11 +222,11 @@ true nasal - + - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -253,7 +253,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -280,7 +280,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -307,7 +307,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -329,9 +329,9 @@ property-adjust systems/radio/rmp[1]/vhf3-standby 0.025 + 0.025 0.0 1.0 - 0.025 true decimal @@ -340,7 +340,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -365,7 +365,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -396,7 +396,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -423,7 +423,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -439,9 +439,9 @@ property-adjust systems/radio/rmp[1]/vhf2-standby -0.025 - 0.025 0.0 1.0 + 0.025 true decimal @@ -450,7 +450,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -472,9 +472,9 @@ property-adjust systems/radio/rmp[1]/vhf3-standby -0.025 - 0.025 0.0 1.0 + 0.025 true decimal @@ -483,7 +483,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -508,7 +508,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -543,7 +543,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -569,7 +569,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -595,7 +595,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -627,7 +627,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -653,7 +653,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -685,7 +685,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -711,7 +711,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -737,7 +737,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -769,7 +769,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -795,7 +795,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -867,7 +867,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -898,7 +898,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -928,7 +928,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -958,7 +958,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -987,7 +987,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1020,55 +1020,17 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 controls/radio/rmp[1]/on 1 - - - systems/radio/rmp[0]/sel_chan - vhf2 - - - systems/radio/rmp[0]/sel_chan - vhf3 - - - systems/radio/rmp[0]/sel_chan - hf1 - - - systems/radio/rmp[0]/sel_chan - hf2 - - - systems/radio/rmp[1]/sel_chan - vhf1 - - - systems/radio/rmp[1]/sel_chan - vhf3 - - - systems/radio/rmp[1]/sel_chan - hf1 - - - systems/radio/rmp[1]/sel_chan - hf2 - - - systems/radio/rmp[2]/sel_chan - vhf1 - - - systems/radio/rmp[2]/sel_chan - vhf2 - - + + systems/radio/rmp[1]/sel-light + 1 + @@ -1086,7 +1048,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1113,7 +1075,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1140,7 +1102,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1167,7 +1129,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1194,7 +1156,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1221,7 +1183,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1248,7 +1210,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1275,7 +1237,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1302,7 +1264,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1329,7 +1291,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1356,7 +1318,7 @@ - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 @@ -1387,21 +1349,9 @@ 1 - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 - - - - systems/radio/rmp[1]/sel_chan - vhf3 - - - instrumentation/comm[2]/frequencies/selected-mhz - 0 - - - @@ -1431,61 +1381,6 @@ - - - select - rmp-active-vhf3-data - - - - controls/switches/annun-test - 1 - - - controls/radio/rmp[1]/on - 1 - - - systems/electrical/bus/dc2 - 25 - - - systems/radio/rmp[1]/sel_chan - vhf3 - - - instrumentation/comm[2]/frequencies/selected-mhz - 0 - - - - - - - rmp-active-vhf3-data - - -0.23205 - -0.21625 - -0.12582 - 90 - - center-center - xy-plane - text-value - data - autopilot/servicable - false - led.txf - true - false - false - 0.008 - - 32 - 32 - - - select @@ -1538,21 +1433,9 @@ 1 - systems/electrical/bus/dc2 + systems/electrical/bus/dc-ess 25 - - - - systems/radio/rmp[1]/sel_chan - vhf3 - - - systems/radio/rmp[1]/vhf3-standby - 0 - - - @@ -1582,61 +1465,6 @@ - - - select - rmp-standby-vhf3-data - - - - controls/switches/annun-test - 1 - - - controls/radio/rmp[1]/on - 1 - - - systems/electrical/bus/dc2 - 25 - - - systems/radio/rmp[1]/sel_chan - vhf3 - - - systems/radio/rmp[1]/vhf3-standby - 0 - - - - - - - rmp-standby-vhf3-data - - -0.23205 - -0.14896 - -0.12582 - 90 - - center-center - xy-plane - text-value - data - autopilot/servicable - false - led.txf - true - false - false - 0.008 - - 32 - 32 - - - select @@ -1679,10 +1507,8 @@ material rmp-active rmp-active-test - rmp-active-vhf3-data rmp-standby rmp-standby-test - rmp-standby-vhf3-data 0.89 0.37 diff --git a/Models/Instruments/Radio/res/Radio1.ac b/Models/Instruments/Radio/res/Radio.ac similarity index 100% rename from Models/Instruments/Radio/res/Radio1.ac rename to Models/Instruments/Radio/res/Radio.ac diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index 4b9e5f00..c1f7252b 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -32,6 +32,7 @@ setprop("/engines/engine[1]/oil-qt-actual", qty2); ########## # Lights # ########## + var beacon_switch = props.globals.getNode("/controls/switches/beacon", 2); var beacon = aircraft.light.new("/sim/model/lights/beacon", [0.1, 1], "/controls/lighting/beacon"); var strobe_switch = props.globals.getNode("/controls/switches/strobe", 2); @@ -209,6 +210,7 @@ var systemsLoop = maketimer(0.1, func { libraries.ECAM.loop(); libraries.BUTTONS.update(); fadec.FADEC.loop(); + rmp.rmpUpdate(); if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/switches/cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or getprop("/controls/gear/brake-parking") == 0)) { setprop("/controls/switches/cart", 0); diff --git a/Nasal/rmp.nas b/Nasal/rmp.nas index 6d7aae88..e30dd3bd 100644 --- a/Nasal/rmp.nas +++ b/Nasal/rmp.nas @@ -7,29 +7,31 @@ # GLOBAL TODO add stuff for HF1, HF2, VOR, LS and ADF -var rmp_update = nil; +var chan_rmp1_v = "vhr1"; +var chan_rmp2_v = "vhr2"; +var chan_rmp3_v = "vhr3"; var act_vhf1 = props.globals.getNode("/instrumentation/comm[0]/frequencies/selected-mhz"); var act_vhf2 = props.globals.getNode("/instrumentation/comm[1]/frequencies/selected-mhz"); var act_vhf3 = props.globals.getNode("/instrumentation/comm[2]/frequencies/selected-mhz"); -var act_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/active-display", "123.900", "STRING"); -var stby_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/standby-display", "118.700", "STRING"); -var stby_rmp1_vhf1 = props.globals.initNode("/systems/radio/rmp[0]/vhf1-standby", 118.7, "DOUBLE"); -var stby_rmp1_vhf2 = props.globals.initNode("/systems/radio/rmp[0]/vhf2-standby", 123.12, "DOUBLE"); -var stby_rmp1_vhf3 = props.globals.initNode("/systems/radio/rmp[0]/vhf3-standby", 121.5, "DOUBLE"); +var act_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/active-display", "118.700", "STRING"); +var stby_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/standby-display", "121.400", "STRING"); +var stby_rmp1_vhf1 = props.globals.initNode("/systems/radio/rmp[0]/vhf1-standby", 121.4, "DOUBLE"); +var stby_rmp1_vhf2 = props.globals.initNode("/systems/radio/rmp[0]/vhf2-standby", 122.6, "DOUBLE"); +var stby_rmp1_vhf3 = props.globals.initNode("/systems/radio/rmp[0]/vhf3-standby", 123.2, "DOUBLE"); -var act_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/active-display", "127.900", "STRING"); -var stby_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/standby-display", "123.125", "STRING"); -var stby_rmp2_vhf1 = props.globals.initNode("/systems/radio/rmp[1]/vhf1-standby", 118.7, "DOUBLE"); -var stby_rmp2_vhf2 = props.globals.initNode("/systems/radio/rmp[1]/vhf2-standby", 123.12, "DOUBLE"); -var stby_rmp2_vhf3 = props.globals.initNode("/systems/radio/rmp[1]/vhf3-standby", 121.5, "DOUBLE"); +var act_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/active-display", "119.400", "STRING"); +var stby_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/standby-display", "122.600", "STRING"); +var stby_rmp2_vhf1 = props.globals.initNode("/systems/radio/rmp[1]/vhf1-standby", 121.4, "DOUBLE"); +var stby_rmp2_vhf2 = props.globals.initNode("/systems/radio/rmp[1]/vhf2-standby", 122.6, "DOUBLE"); +var stby_rmp2_vhf3 = props.globals.initNode("/systems/radio/rmp[1]/vhf3-standby", 123.2, "DOUBLE"); -var act_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/active-display", "127.900", "STRING"); -var stby_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/standby-display", "123.125", "STRING"); -var stby_rmp3_vhf1 = props.globals.initNode("/systems/radio/rmp[2]/vhf1-standby", 118.7, "DOUBLE"); -var stby_rmp3_vhf2 = props.globals.initNode("/systems/radio/rmp[2]/vhf2-standby", 123.12, "DOUBLE"); -var stby_rmp3_vhf3 = props.globals.initNode("/systems/radio/rmp[2]/vhf3-standby", 121.5, "DOUBLE"); +var act_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/active-display", "data", "STRING"); +var stby_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/standby-display", "123.200", "STRING"); +var stby_rmp3_vhf1 = props.globals.initNode("/systems/radio/rmp[2]/vhf1-standby", 121.4, "DOUBLE"); +var stby_rmp3_vhf2 = props.globals.initNode("/systems/radio/rmp[2]/vhf2-standby", 122.6, "DOUBLE"); +var stby_rmp3_vhf3 = props.globals.initNode("/systems/radio/rmp[2]/vhf3-standby", 123.2, "DOUBLE"); var chan_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/sel_chan", "vhf1", "STRING"); var chan_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/sel_chan", "vhf2", "STRING"); @@ -39,6 +41,14 @@ var pwr_sw_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/on", 0, "BOOL") var pwr_sw_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/on", 0, "BOOL"); var pwr_sw_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/on", 0, "BOOL"); +var sel_light_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/sel-light", 0, "BOOL"); +var sel_light_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/sel-light", 0, "BOOL"); +var sel_light_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/sel-light", 0, "BOOL"); + +var am_mode_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/am-active", 0, "BOOL"); +var am_mode_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/am-active", 0, "BOOL"); +var am_mode_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/am-active", 0, "BOOL"); + var init = func() { for(var i = 0; i < 3; i += 1) { setprop("/systems/radio/rmp[" ~ i ~ "]/hf1-standby", 510); @@ -51,10 +61,48 @@ var init = func() { pwr_sw_rmp1.setBoolValue(0); pwr_sw_rmp2.setBoolValue(0); pwr_sw_rmp3.setBoolValue(0); +} + +var rmpUpdate = func() { + chan_rmp1_v = chan_rmp1.getValue(); + chan_rmp2_v = chan_rmp2.getValue(); + chan_rmp3_v = chan_rmp3.getValue(); - var rmp_update = maketimer(0.2, func { - rmp_refresh.update(); - }); + # SEL lights + if (chan_rmp1_v == "vhf2" or chan_rmp1_v == "vhf3" or chan_rmp1_v == "hf1" or chan_rmp1_v == "hf2" or chan_rmp2_v == "vhf1" or chan_rmp2_v == "vhf3" or chan_rmp2_v == "hf1" or chan_rmp2_v == "hf2" or chan_rmp3_v == "vhf1" or chan_rmp3_v == "vhf2") { + if (sel_light_rmp1.getBoolValue() != 1) { + sel_light_rmp1.setBoolValue(1); + } + if (sel_light_rmp2.getBoolValue() != 1) { + sel_light_rmp2.setBoolValue(1); + } + if (sel_light_rmp3.getBoolValue() != 1) { + sel_light_rmp3.setBoolValue(1); + } + } else { + if (sel_light_rmp1.getBoolValue() != 0) { + sel_light_rmp1.setBoolValue(0); + } + if (sel_light_rmp2.getBoolValue() != 0) { + sel_light_rmp2.setBoolValue(0); + } + if (sel_light_rmp3.getBoolValue() != 0) { + sel_light_rmp3.setBoolValue(0); + } + } + + # Disable AM mode if not in HF + if (chan_rmp1_v != "hf1" and chan_rmp1_v != "hf2" and am_mode_rmp1.getBoolValue() == 1) { + am_mode_rmp1.setBoolValue(0); + } + + if (chan_rmp2_v != "hf1" and chan_rmp2_v != "hf2" and am_mode_rmp2.getBoolValue() == 1) { + am_mode_rmp2.setBoolValue(0); + } + + if (chan_rmp3_v != "hf1" and chan_rmp3_v != "hf2" and am_mode_rmp3.getBoolValue() == 1) { + am_mode_rmp3.setBoolValue(0); + } } var update_active_vhf = func(vhf) { @@ -85,15 +133,23 @@ var update_active_vhf = func(vhf) { act_display_rmp2.setValue(act); } } - } else { + } else if (vhf == 3) { if (sel1 == "vhf3" or sel2 == "vhf3") { var act = sprintf("%3.3f", act_vhf3.getValue()); if (sel1 == "vhf3") { - act_display_rmp1.setValue(act); + if (act == 0) { + act_display_rmp1.setValue("data"); + } else { + act_display_rmp1.setValue(act); + } } if (sel2 == "vhf3") { - act_display_rmp2.setValue(act); + if (act == 0) { + act_display_rmp2.setValue("data"); + } else { + act_display_rmp2.setValue(act); + } } } } @@ -132,7 +188,7 @@ var update_chan_sel = func(rmp_no) { var chan = chan_rmp1.getValue(); if (chan == "vhf1") { update_stby_vhf(rmp_no, 1); - } else if (chan == "vhf1") { + } else if (chan == "vhf2") { update_stby_vhf(rmp_no, 2); } else { update_stby_vhf(rmp_no, 3); @@ -160,7 +216,6 @@ var update_chan_sel = func(rmp_no) { } var transfer = func(rmp_no) { - rmp_no = rmp_no - 1; var sel_chan = getprop("/systems/radio/rmp[" ~ rmp_no ~ "]/sel_chan"); diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index dace3be3..2d628ccf 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -82,7 +82,7 @@ velocities/mach fbw/roll/gain-switch - 0 1 + 0 1 0.2 -26.2 0.0 0.9 -15.5 0.0 @@ -96,7 +96,7 @@ velocities/mach fbw/roll/gain-switch - 0 1 + 0 1 0.2 -45.5 0.0 0.9 -36.0 0.0 @@ -110,7 +110,7 @@ velocities/mach fbw/roll/gain-switch - 0 1 + 0 1 0.2 -2.1 0.0 0.9 -1.1 0.0 @@ -124,9 +124,9 @@ velocities/mach fbw/pitch/gain-switch - 0 1 - 0.2 28 0 - 0.9 23 0 + 0 1 + 0.2 28 0 + 0.9 23 0 @@ -138,9 +138,9 @@ velocities/mach fbw/pitch/gain-switch - 0 1 - 0.2 61 0 - 0.9 45 0 + 0 1 + 0.2 61 0 + 0.9 45 0 @@ -152,9 +152,9 @@ velocities/mach fbw/pitch/gain-switch - 0 1 - 0.2 2.9 0.0 - 0.9 1.3 0.0 + 0 1 + 0.2 2.9 0.0 + 0.9 1.3 0.0 @@ -166,7 +166,7 @@ velocities/mach fbw/yaw/gain-switch - 0 1 + 0 1 0.2 -7.5 0.0 0.9 -1.5 0.0 @@ -180,9 +180,9 @@ velocities/mach fbw/yaw/gain-switch - 0 1 - 0.2 5.01 0.00 - 0.9 1.05 0.00 + 0 1 + 0.2 5.01 0.00 + 0.9 1.05 0.00 @@ -194,9 +194,9 @@ velocities/mach fbw/yaw/gain-switch - 0 1 - 0.2 1.03 0.00 - 0.9 0.79 0.00 + 0 1 + 0.2 1.03 0.00 + 0.9 0.79 0.00 @@ -279,11 +279,11 @@ attitude/roll-rad fbw/roll/a-i - -1 0 1 - -0.575959 0.261799 0.000000 0.000000 - -0.575958 0.000000 0.000000 0.000000 - 0.575958 0.000000 0.000000 0.000000 - 0.575959 0.000000 0.000000 -0.261799 + -1 0 1 + -0.575959 0.261799 0.000000 0.000000 + -0.575958 0.000000 0.000000 0.000000 + 0.575958 0.000000 0.000000 0.000000 + 0.575959 0.000000 0.000000 -0.261799 @@ -310,11 +310,11 @@ attitude/roll-radfbw/roll/a-i - -1 0 1 - -1.169370 0.261799 0.000000 0.000000 - -1.169369 0.000000 0.000000 0.000000 - 1.169369 0.000000 0.000000 0.000000 - 1.169370 0.000000 0.000000 -0.261799 + -1 0 1 + -1.169370 0.261799 0.000000 0.000000 + -1.169369 0.000000 0.000000 0.000000 + 1.169369 0.000000 0.000000 0.000000 + 1.169370 0.000000 0.000000 -0.261799
@@ -369,11 +369,11 @@ attitude/roll-radfbw/roll/a-i - -1 0 1 - -0.698132 0.261799 0.000000 0.000000 - -0.698131 0.000000 0.000000 0.000000 - 0.698131 0.000000 0.000000 0.000000 - 0.698132 0.000000 0.000000 -0.261799 + -1 0 1 + -0.698132 0.261799 0.000000 0.000000 + -0.698131 0.000000 0.000000 0.000000 + 0.698131 0.000000 0.000000 0.000000 + 0.698132 0.000000 0.000000 -0.261799
@@ -523,9 +523,9 @@ velocities/mach position/wow - 0 1 - 0.2 0.5 1.0 - 0.9 0.1 1.0 + 0 1 + 0.2 0.5 1.0 + 0.9 0.1 1.0 @@ -615,8 +615,8 @@ /position/gear-agl-ft - 5 0.2 - 30 0.1 + 5 0.2 + 30 0.1
@@ -779,11 +779,11 @@ attitude/pitch-rad fbw/pitch/g-pi-switched - -1 0 1 - -0.261799 0.000000 0.000000 0.087266 - -0.261798 0.000000 0.000000 0.000000 - 0.523598 0.000000 0.000000 0.000000 - 0.523599 -0.087266 0.000000 0.000000 + -1 0 1 + -0.261799 0.000000 0.000000 0.087266 + -0.261798 0.000000 0.000000 0.000000 + 0.523598 0.000000 0.000000 0.000000 + 0.523599 -0.087266 0.000000 0.000000 @@ -818,9 +818,9 @@ attitude/pitch-radfbw/pitch/g-pi-switched - -1 0 - 0.523598 -0.026180 0.000000 - 0.523599 -0.087266 0.000000 + -1 0 + 0.523598 -0.026180 0.000000 + 0.523599 -0.087266 0.000000
@@ -1066,7 +1066,7 @@ /controls/flight/rudderfbw/fmgc/enabled - 0 1 + 0 1 -1.00 -1 0 -0.04 0 0 0.04 0 0 @@ -1192,8 +1192,8 @@
/velocities/airspeed-kt - 62 1.0 - 116 0.0 + 62 1.0 + 116 0.0
@@ -1204,8 +1204,8 @@ /velocities/airspeed-kt - 72 1.0 - 121 0.0 + 72 1.0 + 121 0.0
@@ -1222,8 +1222,8 @@ spoilers/anti-droop-cmd - 0.5 0.0 - 1.0 1.0 + 0.5 0.0 + 1.0 1.0
@@ -1521,9 +1521,9 @@ velocities/mach atmosphere/density-altitude - 0 43000 - 0.0 1.00 0.850 - 0.9 0.02 0.750 + 0 43000 + 0.0 1.00 0.850 + 0.9 0.02 0.750 @@ -1534,9 +1534,9 @@ velocities/mach atmosphere/density-altitude - 0 43000 - 0.0 1.00 0.850 - 0.9 0.02 0.750 + 0 43000 + 0.0 1.00 0.850 + 0.9 0.02 0.750 @@ -1547,9 +1547,9 @@ velocities/mach atmosphere/density-altitude - 0 43000 - 0.0 1.00 0.850 - 0.9 0.02 0.750 + 0 43000 + 0.0 1.00 0.850 + 0.9 0.02 0.750 @@ -1563,34 +1563,34 @@ /velocities/airspeed-kt - 160.00 25.000 - 162.15 23.649 - 165.02 22.226 - 168.64 21.015 - 172.25 19.734 - 176.59 18.595 - 181.67 17.525 - 186.75 16.385 - 191.83 15.316 - 197.65 14.318 - 205.65 13.247 - 212.93 12.318 - 219.48 11.462 - 227.48 10.533 - 236.96 9.7450 - 246.43 8.8863 - 255.18 8.0990 - 266.12 7.4525 - 277.06 6.7704 - 288.00 6.0884 - 299.67 5.5124 - 311.35 5.0075 - 323.03 4.5736 - 335.44 4.2104 - 347.13 3.9186 - 358.81 3.6979 - 370.50 3.5482 - 380.00 3.4000 + 160.00 25.000 + 162.15 23.649 + 165.02 22.226 + 168.64 21.015 + 172.25 19.734 + 176.59 18.595 + 181.67 17.525 + 186.75 16.385 + 191.83 15.316 + 197.65 14.318 + 205.65 13.247 + 212.93 12.318 + 219.48 11.462 + 227.48 10.533 + 236.96 9.7450 + 246.43 8.8863 + 255.18 8.0990 + 266.12 7.4525 + 277.06 6.7704 + 288.00 6.0884 + 299.67 5.5124 + 311.35 5.0075 + 323.03 4.5736 + 335.44 4.2104 + 347.13 3.9186 + 358.81 3.6979 + 370.50 3.5482 + 380.00 3.4000
@@ -1737,7 +1737,8 @@ - + + @@ -1751,6 +1752,10 @@ /systems/electrical/bus/dc2 ge 25 + + + + /controls/flight/flaps @@ -1900,9 +1905,9 @@ /velocities/groundspeed-kt hydraulics/tiller/switch - -1 0 1 - 30.000 -70.0 0 70.0 - 30.001 -10.0 0 10.0 + -1 0 1 + 30.000 -70.0 0 70.0 + 30.001 -10.0 0 10.0 diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml index 5df5e0e7..64ca89e1 100644 --- a/Systems/fmgc-drivers.xml +++ b/Systems/fmgc-drivers.xml @@ -9,11 +9,9 @@ - - - - - + + + IAS 5 SECOND PREDICTOR false @@ -22,7 +20,7 @@ 5.0 0.0 - + IAS 10 SECOND PREDICTOR false @@ -49,7 +47,7 @@ 5.0 0.0 - + MACH 10 SECOND PREDICTOR false @@ -67,16 +65,13 @@ 15.0 0.0 - - - - - + + + AUTOLAND FD FPM gain 1.0 - 0.05 @@ -89,12 +84,11 @@ /it-autoflight/internal/target-fpm-c2 - + AUTOLAND FPM gain 1.0 - 0.05
@@ -111,12 +105,11 @@ /it-autoflight/internal/target-fpm-c - + FMGC MNG SPD gain 1.0 - 0.05 @@ -138,7 +131,6 @@ FMGC MNG MACH gain 1.0 - 0.05 @@ -164,7 +156,6 @@ FMGC Target IAS PFD gain 1.0 - 0.1 @@ -193,10 +184,11 @@ /FMGC/internal/target-ias-pfd - + KTS INPUT FILTER false + noise-spike true output @@ -218,32 +210,6 @@ /it-autoflight/settings/togaspd /it-autoflight/internal/flch-kts - noise-spike - - - - - - /it-autoflight/output/vert - 4 - - - /it-autoflight/output/vert - 7 - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 100 - @@ -257,6 +223,10 @@ 7 + + /it-autoflight/input/kts-mach + 0 + /gear/gear[1]/wow 0 @@ -269,43 +239,33 @@ 5 + 100 MACH INPUT FILTER false + noise-spike true output - - /it-autoflight/input/spd-mach - + /it-autoflight/input/spd-mach /it-autoflight/internal/flch-mach - noise-spike - - - - - /it-autoflight/output/vert - 4 - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 1 - + + + /it-autoflight/output/vert + 4 + + + /it-autoflight/output/vert + 7 + + - /it-autoflight/output/vert - 4 + /it-autoflight/input/kts-mach + 1 /gear/gear[1]/wow @@ -319,8 +279,9 @@ 0.05 + 1 - + IAS SYNC gain @@ -333,8 +294,16 @@ - 0.5 - /instrumentation/airspeed-indicator/indicated-speed-kt + + + + + /instrumentation/airspeed-indicator/indicated-speed-kt + 0.5 + + + + /it-autoflight/input/spd-kts @@ -350,8 +319,22 @@ - 0.5 - /instrumentation/airspeed-indicator/indicated-mach + + +
+ + + + /instrumentation/airspeed-indicator/indicated-mach + 1000 + + 0.5 + + + 1000 +
+ + /it-autoflight/input/spd-mach @@ -365,9 +348,7 @@ /orientation/heading-deg - - /orientation/heading-magnetic-deg - + /orientation/heading-magnetic-deg0/it-autoflight/internal/heading-deg/instrumentation/pfd/heading-deg @@ -475,30 +456,16 @@ /autopilot/route-manager/wp[0]/true-bearing-deg /it-autoflight/internal/drift-angle-deg - -1 + -1.0 /orientation/heading-deg - -1 + -1.0 - - - - - /it-autoflight/output/lat - 0 - - - /it-autoflight/output/lat - 1 - - - - 0 - + 0/it-autoflight/internal/heading-error-deg -180 @@ -522,7 +489,10 @@ - /it-autoflight/internal/vert-speed-fpm + + /it-autoflight/internal/vert-speed-fpm + 0.5 + @@ -532,31 +502,18 @@ VERT SPEED FILTER false + noise-spike true output - - /it-autoflight/input/vs - + /it-autoflight/input/vs /it-autoflight/internal/vs - noise-spike - - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 2000 - + + /it-autoflight/output/vert + 1 + /gear/gear[1]/wow 0 @@ -569,8 +526,9 @@ 300 + 2000 - + NAV ERROR DEG false @@ -589,7 +547,7 @@ 180 - + INTERNAL VERTICAL SPEED COMPUTER false @@ -830,49 +788,13 @@ /it-autoflight/internal/fpa - - - - - + + + IT-CONTROLLER: TARGET ROLL CMD false - true - output - - /it-autoflight/internal/target-roll-deg - - /it-autoflight/internal/target-roll-fd noise-spike - 15 - - - - FD: ROLL - false - gain - 1.0 - - - - - /it-autoflight/output/lat - 4 - - - /it-autoflight/output/lat - 5 - - - - - - /it-autoflight/internal/target-roll-fd - /orientation/roll-deg - - - @@ -886,9 +808,37 @@ + 0 + + /it-autoflight/internal/target-roll-deg + /it-autoflight/internal/target-roll-fd + + + + + /it-autoflight/output/fd1 + 1 + + + /it-autoflight/output/fd1 + 1 + + + + 50 + + 15 + + + + FD: ROLL + false + gain + 1.0 + - 0 + /it-autoflight/internal/target-roll-fd /orientation/roll-deg @@ -897,7 +847,7 @@ -30 30 - + FD: PITCH false diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml index ed8a1e6e..352f7eac 100644 --- a/Systems/fmgc-pitch.xml +++ b/Systems/fmgc-pitch.xml @@ -9,10 +9,8 @@ - - - - + + ALTITUDE CAPTURE/HOLD @@ -29,33 +27,19 @@ - + /it-autoflight/output/vert 8 - + - /it-autoflight/internal/alt - - - - - /it-autoflight/output/vert - 8 - - /it-autoflight/internal/mng-alt - - /it-autoflight/internal/target-fpm - - - /it-autoflight/internal/min-vs - - - /it-autoflight/internal/max-vs - + /it-autoflight/internal/alt + /it-autoflight/internal/target-fpm + /it-autoflight/internal/min-vs + /it-autoflight/internal/max-vs - + FPA HOLD false @@ -87,15 +71,9 @@ - - /it-autoflight/internal/fpa - - - /it-autoflight/input/fpa - - - /it-autoflight/internal/target-fpm-d - + /it-autoflight/internal/fpa + /it-autoflight/input/fpa + /it-autoflight/internal/target-fpm-d @@ -106,9 +84,6 @@
- 1.0 - 0.1 - 0.0 2.0 0.002 @@ -215,9 +190,7 @@ /it-autoflight/internal/flch-mach 1000.0 - - /it-autoflight/internal/target-fpm-b - + /it-autoflight/internal/target-fpm-b @@ -237,9 +210,6 @@ -60 - 1.0 - 0.1 - 0.0 2.5 0.001 @@ -505,9 +475,7 @@ - - /it-autoflight/internal/vert-speed-fpm - + /it-autoflight/internal/vert-speed-fpm @@ -590,9 +558,7 @@ /it-autoflight/internal/nav1-rate-of-climb-fpm - - /it-autoflight/internal/target-pitch-deg - + /it-autoflight/internal/target-pitch-deg @@ -711,21 +677,15 @@ -15 30 - + System Command: Pitch Rate false gain 0.15 - - /orientation/pitch-deg - - - /it-autoflight/internal/target-pitch-deg - - - /fdm/jsbsim/fbw/fmgc/pitch-cmd - + /orientation/pitch-deg + /it-autoflight/internal/target-pitch-deg + /fdm/jsbsim/fbw/fmgc/pitch-cmd -0.3 0.3 diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml index 662a5d59..3ae2b94c 100644 --- a/Systems/fmgc-roll-yaw.xml +++ b/Systems/fmgc-roll-yaw.xml @@ -9,11 +9,9 @@ - - - - - + + + ROLL CONTROLLER: HDG/LNAV false @@ -51,25 +49,17 @@ - - /it-autoflight/internal/heading-error-deg - - - 0 - - - /it-autoflight/internal/target-roll-deg - + /it-autoflight/internal/heading-error-deg + 0 + /it-autoflight/internal/target-roll-deg -1.8 -0.000001 /it-autoflight/internal/bank-limit - -1 + -1.0 - - /it-autoflight/internal/bank-limit - + /it-autoflight/internal/bank-limit @@ -104,43 +94,20 @@ - - - - /it-autoflight/settings/use-backcourse - 0 - - - /it-autoflight/internal/nav-heading-error-deg - - - - - /it-autoflight/settings/use-backcourse - 1 - - - /it-autoflight/internal/nav-bc-heading-error-deg - - - 0.0 - - - /it-autoflight/internal/target-roll-deg - + /it-autoflight/internal/nav-heading-error-deg + 0 + /it-autoflight/internal/target-roll-deg -2.8 -0.0001 /it-autoflight/internal/bank-limit - -1 + -1.0 - - /it-autoflight/internal/bank-limit - + /it-autoflight/internal/bank-limit - + ROLL DEG SYNC false @@ -172,50 +139,16 @@ /it-autoflight/internal/target-roll-deg /it-autoflight/internal/bank-limit - -1 + -1.0 - - /it-autoflight/internal/bank-limit - + /it-autoflight/internal/bank-limit IT-CONTROLLER: TARGET ROLL CMD false - true - output - - /it-autoflight/internal/target-roll-deg - - /it-autoflight/internal/target-roll noise-spike - 6 - - - - System Command: Roll Rate - false - gain - -0.1 - /orientation/roll-deg - - - - - - /it-autoflight/output/lat - 4 - - - /it-autoflight/output/lat - 5 - - - - /it-autoflight/internal/target-roll - - @@ -229,17 +162,63 @@ 0 - - - /fdm/jsbsim/fbw/fmgc/roll-cmd - + + /it-autoflight/internal/target-roll-deg + /it-autoflight/internal/target-roll + + + + + /it-autoflight/output/ap1 + 1 + + + /it-autoflight/output/ap2 + 1 + + + /it-autoflight/output/fd1 + 1 + + + /it-autoflight/output/fd2 + 1 + + + + 50 + + + + + + /it-autoflight/output/ap1 + 1 + + + /it-autoflight/output/ap2 + 1 + + + + 15 + + 6 + + + + System Command: Roll Rate + false + gain + -0.1 + /orientation/roll-deg + /it-autoflight/internal/target-roll + /fdm/jsbsim/fbw/fmgc/roll-cmd -0.32 0.32 - - - + RUDDER VORLOC TRK @@ -252,12 +231,8 @@ - - /it-autoflight/internal/nav-heading-error-deg - - - 0 - + /it-autoflight/internal/nav-heading-error-deg + 0 /it-autoflight/internal/rudder-cmd @@ -275,21 +250,7 @@ -0.05 - - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - -0.02 - + -0.02 0 -0.15 @@ -299,28 +260,32 @@ IT-CONTROLLER: RUDDER CMD false + noise-spike true output - - /it-autoflight/output/lat - 4 - - - 0 - - - - - /it-autoflight/output/lat - 4 - + + + + /it-autoflight/output/ap1 + 1 + + + /it-autoflight/output/ap2 + 1 + + + + /it-autoflight/output/lat + 4 + + /it-autoflight/internal/rudder-cmd - /fdm/jsbsim/fbw/fmgc/yaw-cmd - noise-spike + 0 + /fdm/jsbsim/fbw/fmgc/yaw-cmd 0.6 diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml index 4bb11f75..1b861561 100644 --- a/Systems/fmgc-thrust.xml +++ b/Systems/fmgc-thrust.xml @@ -7,54 +7,31 @@ --> - - - - - + + + KTS INPUT FILTER false + noise-spike true output - - /it-autoflight/input/spd-kts - + /it-autoflight/input/spd-kts /it-autoflight/internal/kts - noise-spike - - - - - /it-autoflight/output/thr-mode - 0 - - - /it-autoflight/output/athr - 0 - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 200 - + + /it-autoflight/output/athr + 1 + /it-autoflight/output/thr-mode 0 - /it-autoflight/output/athr - 1 + /it-autoflight/input/kts-mach + 0 /gear/gear[1]/wow @@ -68,50 +45,30 @@ 10 + 200 MACH INPUT FILTER false + noise-spike true output - - /it-autoflight/input/spd-mach - + /it-autoflight/input/spd-mach /it-autoflight/internal/mach - noise-spike - - - - - /it-autoflight/output/thr-mode - 0 - - - /it-autoflight/output/athr - 0 - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 2 - + + /it-autoflight/output/athr + 1 + /it-autoflight/output/thr-mode 0 - /it-autoflight/output/athr + /it-autoflight/input/kts-mach 1 @@ -126,6 +83,7 @@ 0.1 + 2 @@ -250,28 +208,15 @@ - - /instrumentation/airspeed-indicator/indicated-speed-kt - - - /it-autoflight/internal/kts - - - /controls/engines/throttle-cmd-pid - + /instrumentation/airspeed-indicator/indicated-speed-kt + /it-autoflight/internal/kts + /controls/engines/throttle-cmd-pid 0.055 - 1.0 - 0.1 - 0.0 9.0 0.00001 - - /controls/engines/idle-limit - - - /controls/engines/throttle-pid-max - + /controls/engines/idle-limit + /controls/engines/throttle-pid-max @@ -390,22 +335,13 @@ /it-autoflight/internal/mach 1000.0 - - /controls/engines/throttle-cmd-pid - + /controls/engines/throttle-cmd-pid 0.055 - 1.0 - 0.1 - 0.0 9.0 0.00001 - - /controls/engines/idle-limit - - - /controls/engines/throttle-pid-max - + /controls/engines/idle-limit + /controls/engines/throttle-pid-max @@ -512,12 +448,8 @@ - - 0.0 - - - /controls/engines/throttle-cmd-pid - + 0.0 + /controls/engines/throttle-cmd-pid @@ -623,12 +555,8 @@ - - 1.0 - - - /controls/engines/throttle-cmd-pid - + 1.0 + /controls/engines/throttle-cmd-pid @@ -725,12 +653,10 @@ - 1 + 1.0 - 0 - - /controls/engines/throttle-cmd-pid - + 0.0 + /controls/engines/throttle-cmd-pid diff --git a/revision.txt b/revision.txt index 8eb54da3..a5e41183 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4679 \ No newline at end of file +4683 \ No newline at end of file