diff --git a/A320-main.xml b/A320-main.xml index 56eb36b9..2ac4ae74 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -10,7 +10,7 @@ - it0uchpods Design Group: Joshua Davidson (it0uchpods), Jonathan Redpath (legoboyvdlp), Thorsten Herrmann (TH-555), Charlie Schwehm (Wecsje) + it0uchpods Design Group: Joshua Davidson (it0uchpods), Jonathan Redpath (legoboyvdlp), Thorsten Herrmann (TH-555) Pre V1.0 diff --git a/AircraftConfig/about.xml b/AircraftConfig/about.xml index 0c9c45b1..6b8d249c 100644 --- a/AircraftConfig/about.xml +++ b/AircraftConfig/about.xml @@ -43,7 +43,7 @@ left - + diff --git a/Models/Lights/ALS/landinglightL.eff b/Models/Lights/ALS/landinglightL.eff index 09ad710b..619b6180 100644 --- a/Models/Lights/ALS/landinglightL.eff +++ b/Models/Lights/ALS/landinglightL.eff @@ -12,9 +12,9 @@ 0.46 0.46 0.63 - 0.98 - 0.98 - 0.98 + 1.00 + 0.93 + 0.87 controls/lighting/landing-lights[1] 1 0.0 diff --git a/Models/Lights/ALS/landinglightR.eff b/Models/Lights/ALS/landinglightR.eff index 72cce2c7..319f2522 100644 --- a/Models/Lights/ALS/landinglightR.eff +++ b/Models/Lights/ALS/landinglightR.eff @@ -12,9 +12,9 @@ 0.46 0.46 0.63 - 0.98 - 0.98 - 0.98 + 1.00 + 0.93 + 0.87 controls/lighting/landing-lights[2] 1 0.0 diff --git a/Models/Lights/ALS/left-strobe.eff b/Models/Lights/ALS/left-strobe.eff index 0d5d318a..0a9f0525 100644 --- a/Models/Lights/ALS/left-strobe.eff +++ b/Models/Lights/ALS/left-strobe.eff @@ -12,9 +12,9 @@ 0.46 0.46 0.63 - 0.98 - 0.98 - 0.98 + 1.00 + 0.93 + 0.87 sim/model/lights/strobe/state -1 0.70710678 diff --git a/Models/Lights/ALS/right-strobe.eff b/Models/Lights/ALS/right-strobe.eff index b01d02fa..57875ee9 100644 --- a/Models/Lights/ALS/right-strobe.eff +++ b/Models/Lights/ALS/right-strobe.eff @@ -12,9 +12,10 @@ 0.46 0.46 0.63 - 0.98 - 0.98 - 0.98 sim/model/lights/strobe/state + 1.00 + 0.93 + 0.87 + sim/model/lights/strobe/state -1 -0.70710678 0.0 diff --git a/Models/Lights/ALS/tail-strobe.eff b/Models/Lights/ALS/tail-strobe.eff index 210bd5b7..f8445961 100644 --- a/Models/Lights/ALS/tail-strobe.eff +++ b/Models/Lights/ALS/tail-strobe.eff @@ -12,9 +12,9 @@ 0.46 0.46 0.63 - 0.98 - 0.98 - 0.98 + 1.00 + 0.93 + 0.87 sim/model/lights/tailstrobe/state -1.0 0.0 diff --git a/Models/Lights/ALS/tailnav.eff b/Models/Lights/ALS/tailnav.eff index 390a241b..e02fdeb6 100644 --- a/Models/Lights/ALS/tailnav.eff +++ b/Models/Lights/ALS/tailnav.eff @@ -12,9 +12,9 @@ 0.85 0.85 0.99 - 0.98 - 0.98 - 0.98 + 1.00 + 0.93 + 0.87 /sim/model/lights/nav-lights -1.0 0 diff --git a/Models/Lights/ALS/taxilight.eff b/Models/Lights/ALS/taxilight.eff index 877ade9d..7acd1345 100644 --- a/Models/Lights/ALS/taxilight.eff +++ b/Models/Lights/ALS/taxilight.eff @@ -12,9 +12,9 @@ 0.46 0.46 0.63 - 0.98 - 0.98 - 0.98 + 1.00 + 0.93 + 0.87 /sim/model/lights/nose-lights 1 0.0 diff --git a/Models/Lights/ALS/turnoffL.eff b/Models/Lights/ALS/turnoffL.eff index 3dd60c23..ed32275d 100644 --- a/Models/Lights/ALS/turnoffL.eff +++ b/Models/Lights/ALS/turnoffL.eff @@ -12,9 +12,9 @@ 0.46 0.46 0.63 - 0.98 - 0.98 - 0.98 + 1.00 + 0.93 + 0.87 controls/lighting/leftturnoff 1.0 0.75 diff --git a/Models/Lights/ALS/turnoffR.eff b/Models/Lights/ALS/turnoffR.eff index 4ad21c54..1dffd31d 100644 --- a/Models/Lights/ALS/turnoffR.eff +++ b/Models/Lights/ALS/turnoffR.eff @@ -12,9 +12,9 @@ 0.46 0.46 0.63 - 0.98 - 0.98 - 0.98 + 1.00 + 0.93 + 0.87 controls/lighting/rightturnoff 1.0 -0.75 diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas index c0520f30..22e9c84d 100644 --- a/Nasal/FMGC-b.nas +++ b/Nasal/FMGC-b.nas @@ -26,6 +26,19 @@ setlistener("/sim/signals/fdm-initialized", func { var FPangle = 0; var gear1 = getprop("/gear/gear[1]/wow"); var gear2 = getprop("/gear/gear[2]/wow"); + var gnds_mps = 0; + var current_course = 0; + var wp_fly_to = 0; + var next_course = 0; + var max_bank_limit = 0; + var delta_angle = 0; + var max_bank = 0; + var radius = 0; + var time = 0; + var delta_angle_rad = 0; + var R = 0; + var dist_coeff = 0; + var turn_dist = 0; }); var APinit = func { @@ -525,6 +538,10 @@ var trkfpa_on = func { } } +setlistener("/autopilot/route-manager/current-wp", func { + setprop("/autopilot/internal/wp-change-time", getprop("/sim/time/elapsed-sec")); +}); + var ap_various = func { trueSpeedKts = getprop("/instrumentation/airspeed-indicator/true-speed-kt"); if (trueSpeedKts > 420) { @@ -536,7 +553,35 @@ var ap_various = func { } if (getprop("/autopilot/route-manager/route/num") > 0 and getprop("/autopilot/route-manager/active") == 1) { - if (getprop("/autopilot/route-manager/wp/dist") <= getprop("/it-autoflight/internal/lnav-advance-nm")) { + gnds_mps = getprop("/velocities/groundspeed-kt") * 0.5144444444444; + current_course = getprop("/instrumentation/gps/wp/leg-true-course-deg"); + wp_fly_to = getprop("/autopilot/route-manager/current-wp") + 1; + if (wp_fly_to < 0) { + wp_fly_to = 0; + } + next_course = getprop("/autopilot/route-manager/route/wp["~wp_fly_to~"]/leg-bearing-true-deg"); + max_bank_limit = getprop("/it-autoflight/internal/bank-limit"); + + delta_angle = math.abs(geo.normdeg180(current_course - next_course)); + max_bank = delta_angle * 1.5; + if (max_bank > max_bank_limit) { + max_bank = max_bank_limit; + } + radius = (gnds_mps * gnds_mps) / (9.81 * math.tan(max_bank/57.2957795131)); + time = 0.64 * gnds_mps * delta_angle * 0.7 / (360 * math.tan(max_bank/57.2957795131)); + delta_angle_rad = (180 - delta_angle) / 114.5915590262; + R = radius/math.sin(delta_angle_rad); + dist_coeff = delta_angle * -0.011111 + 2; + if (dist_coeff < 1) { + ist_coeff = 1; + } + turn_dist = math.cos(delta_angle_rad) * R * dist_coeff / 1852; + setprop("/it-autoflight/internal/lnav-advance-nm", turn_dist); + if (getprop("/sim/time/elapsed-sec")-getprop("/autopilot/internal/wp-change-time") > 60) { + setprop("/autopilot/internal/wp-change-check-period", time); + } + + if (getprop("/autopilot/route-manager/wp/dist") <= turn_dist) { if ((getprop("/autopilot/route-manager/current-wp") + 1) < getprop("/autopilot/route-manager/route/num")) { setprop("/autopilot/route-manager/current-wp", getprop("/autopilot/route-manager/current-wp") + 1); } diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index fd14cf35..40077eb1 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -13,6 +13,12 @@ var dc_amps_std = 150; var ac_hz_std = 400; var ac1_src = "XX"; var ac2_src = "XX"; +var power_consumption = nil; +var screen_power_consumption = nil; +var screens = nil; +var lpower_consumption = nil; +var light_power_consumption = nil; +var lights = nil; setlistener("/sim/signals/fdm-initialized", func { var galley_sw = getprop("/controls/electrical/switches/galley"); @@ -37,6 +43,7 @@ setlistener("/sim/signals/fdm-initialized", func { var ac1 = getprop("/systems/electrical/bus/ac1"); var ac2 = getprop("/systems/electrical/bus/ac2"); var ac_ess = getprop("/systems/electrical/bus/ac-ess"); + var ac_ess_shed = getprop("/systems/electrical/bus/ac-ess-shed"); var dc1 = getprop("/systems/electrical/bus/dc1"); var dc2 = getprop("/systems/electrical/bus/dc2"); var dcbat = getprop("/systems/electrical/bus/dcbat"); @@ -58,11 +65,77 @@ setlistener("/sim/signals/fdm-initialized", func { var bat1_volts = getprop("/systems/electrical/battery1-volts"); var bat2_volts = getprop("/systems/electrical/battery2-volts"); var replay = getprop("/sim/replay/replay-state"); + var wow = getprop("/gear/gear[1]/wow"); }); +# Power Consumption, cockpit screens +# According to pprune, each LCD uses 60W. Will assume that it reduces linearly to ~50 watts when dimmed, and to 0 watts when off + +var screen = { + name: "", + type: "", # LCD or CRT, will be used later when we have CRTs + max_watts: 0, + dim_watts: 0, + dim_prop: "", + elec_prop: "", + power_consumption: func() { + var dim_prop = me.dim_prop; + if (getprop(me.dim_prop) != 0) { + screen_power_consumption = (50 + (10 * getprop(dim_prop))); + } else { + screen_power_consumption = 0; + } + return screen_power_consumption; + }, + new: func(name,type,max_watts,dim_watts,dim_prop,elec_prop) { + var s = {parents:[screen]}; + + s.name = name; + s.type = type; + s.max_watts = max_watts; + s.dim_watts = dim_watts; + s.dim_prop = dim_prop; + s.elec_prop = elec_prop; + + return s; + } +}; + +# Power Consumption, lights +# from docs found on google + +var light = { + name: "", + max_watts: 0, + control_prop: "", + elec_prop: "", + power_consumption: func() { + + if (getprop(me.control_prop) != 0 and getprop(me.elec_prop) != 0) { + light_power_consumption = me.max_watts; + } else { + light_power_consumption = 0; + } + return light_power_consumption; + }, + new: func(name,max_watts,control_prop,elec_prop) { + var l = {parents:[light]}; + + l.name = name; + l.max_watts = max_watts; + l.control_prop = control_prop; + l.elec_prop = elec_prop; + + return l; + } +}; + +# Main Elec System + var ELEC = { init: func() { setprop("/controls/switches/annun-test", 0); + setprop("/systems/electrical/nav-lights-power", 0); setprop("/controls/electrical/switches/galley", 1); setprop("/controls/electrical/switches/idg1", 0); setprop("/controls/electrical/switches/idg2", 0); @@ -90,6 +163,7 @@ var ELEC = { setprop("/systems/electrical/bus/gen1-hz", 0); setprop("/systems/electrical/bus/gen2-hz", 0); setprop("/systems/electrical/bus/ac-ess", 0); + setprop("/systems/electrical/bus/ac-ess-shed", 0); setprop("/systems/electrical/extra/ext-volts", 0); setprop("/systems/electrical/extra/apu-volts", 0); setprop("/systems/electrical/extra/gen1-volts", 0); @@ -145,6 +219,33 @@ var ELEC = { setprop("/systems/electrical/outputs/taxi-lights", 0); setprop("/systems/electrical/outputs/transponder", 0); setprop("/systems/electrical/outputs/turn-coordinator", 0); + + screens = [screen.new(name: "DU1", type:"LCD", max_watts:60, dim_watts:50, dim_prop:"/controls/lighting/DU/du1", elec_prop:"/systems/electrical/bus/ac-ess"), + screen.new(name: "DU2", type:"LCD", max_watts:60, dim_watts:50, dim_prop:"/controls/lighting/DU/du2", elec_prop:"/systems/electrical/bus/ac-ess-shed"), + screen.new(name: "DU3", type:"LCD", max_watts:60, dim_watts:50, dim_prop:"/controls/lighting/DU/du3", elec_prop:"/systems/electrical/bus/ac-ess"), + screen.new(name: "DU4", type:"LCD", max_watts:60, dim_watts:50, dim_prop:"/controls/lighting/DU/du4", elec_prop:"/systems/electrical/bus/ac2"), + screen.new(name: "DU5", type:"LCD", max_watts:60, dim_watts:50, dim_prop:"/controls/lighting/DU/du5", elec_prop:"/systems/electrical/bus/ac2"), + screen.new(name: "DU6", type:"LCD", max_watts:60, dim_watts:50, dim_prop:"/controls/lighting/DU/du6", elec_prop:"/systems/electrical/bus/ac2")]; + + lights = [light.new(name: "logo-left", max_watts:31.5, control_prop:"/sim/model/lights/logo-lights", elec_prop:"/systems/electrical/bus/ac1"), + light.new(name: "logo-right", max_watts:31.5, control_prop:"/sim/model/lights/logo-lights", elec_prop:"/systems/electrical/bus/ac2"), + light.new(name: "upper-beacon", max_watts:40, control_prop:"/sim/model/lights/beacon/state", elec_prop:"/systems/electrical/bus/ac1"), + light.new(name: "lower-beacon", max_watts:40, control_prop:"/sim/model/lights/beacon/state", elec_prop:"/systems/electrical/bus/ac2"), + light.new(name: "strobe-left", max_watts:38, control_prop:"/sim/model/lights/strobe/state", elec_prop:"/systems/electrical/bus/ac2"), + light.new(name: "strobe-right", max_watts:38, control_prop:"/sim/model/lights/strobe/state", elec_prop:"/systems/electrical/bus/ac2"), + light.new(name: "tail-strobe", max_watts:12, control_prop:"/sim/model/lights/tailstrobe/state", elec_prop:"/systems/electrical/bus/ac2"), + light.new(name: "tail-strobe-ctl", max_watts:30, control_prop:"/sim/model/lights/tailstrobe/state", elec_prop:"/systems/electrical/bus/ac2"), + light.new(name: "tail-nav", max_watts:12, control_prop:"/sim/model/lights/nav-lights", elec_prop:"/systems/electrical/nav-lights-power"), + light.new(name: "left-nav", max_watts:12, control_prop:"/sim/model/lights/nav-lights", elec_prop:"/systems/electrical/nav-lights-power"), + light.new(name: "right-nav", max_watts:12, control_prop:"/sim/model/lights/nav-lights", elec_prop:"/systems/electrical/nav-lights-power"), + light.new(name: "left-land", max_watts:39, control_prop:"/controls/lighting/landing-lights[1]", elec_prop:"/systems/electrical/bus/ac1"), + light.new(name: "right-land", max_watts:39, control_prop:"/controls/lighting/landing-lights[2]", elec_prop:"/systems/electrical/bus/ac2"), + light.new(name: "left-taxi", max_watts:31, control_prop:"/sim/model/lights/nose-lights", elec_prop:"/systems/electrical/bus/ac1"), + light.new(name: "right-taxi", max_watts:31, control_prop:"/sim/model/lights/nose-lights", elec_prop:"/systems/electrical/bus/ac2"), + light.new(name: "left-turnoff", max_watts:21, control_prop:"/controls/lighting/leftturnoff", elec_prop:"/systems/electrical/bus/ac1"), + light.new(name: "right-turnoff", max_watts:21, control_prop:"/controls/lighting/rightturnoff", elec_prop:"/systems/electrical/bus/ac2"), + light.new(name: "left-wing", max_watts:24, control_prop:"/controls/lighting/wing-lights", elec_prop:"/systems/electrical/bus/ac1"), + light.new(name: "right-wing", max_watts:24, control_prop:"/controls/lighting/wing-lights", elec_prop:"/systems/electrical/bus/ac2")]; }, loop: func() { galley_sw = getprop("/controls/electrical/switches/galley"); @@ -167,6 +268,7 @@ var ELEC = { ac1 = getprop("/systems/electrical/bus/ac1"); ac2 = getprop("/systems/electrical/bus/ac2"); ac_ess = getprop("/systems/electrical/bus/ac-ess"); + ac_ess_shed = getprop("/systems/electrical/bus/ac-ess-shed"); dc1 = getprop("/systems/electrical/bus/dc1"); dc2 = getprop("/systems/electrical/bus/dc2"); dcbat = getprop("/systems/electrical/bus/dcbat"); @@ -186,6 +288,7 @@ var ELEC = { gen1_fail = getprop("/systems/failures/elec-gen1"); gen2_fail = getprop("/systems/failures/elec-gen2"); replay = getprop("/sim/replay/replay-state"); + wow = getprop("/gear/gear[1]/wow"); if (extpwr_on and gen_ext_sw) { setprop("/systems/electrical/gen-ext", 1); @@ -363,14 +466,20 @@ var ELEC = { ac1 = getprop("/systems/electrical/bus/ac1"); ac2 = getprop("/systems/electrical/bus/ac2"); - if (!ac_ess_fail and (ac1 >= 110 or ac2 >= 110)) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { + if ((ac_ess_fail or (ac1 <= 110 or ac2 <= 110)) or (ias > 50 and getprop("/controls/hydraulic/rat-deployed") == 1 and (ac1 == 0) and (ac2 == 0) and wow)) { setprop("/systems/electrical/bus/ac-ess", 0); + } else { + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); } ac_ess = getprop("/systems/electrical/bus/ac-ess"); + if (ac1 == 0 and ac2 == 0 and emergen == 0) { + setprop("/systems/electrical/bus/ac-ess-shed", 0); + } else { + setprop("/systems/electrical/bus/ac-ess-shed", ac_volt_std); + } + if (ac_ess >= 110 and !gallery_fail) { if (galley_sw == 1 and !galley_shed) { setprop("/systems/electrical/bus/galley", ac_volt_std); @@ -393,7 +502,7 @@ var ELEC = { setprop("/controls/electrical/switches/emer-gen", 1); } - if (ias < 100) { + if (ias < 100 or (ac1 == 1) or (ac2 == 1)) { setprop("/controls/electrical/switches/emer-gen", 0); } @@ -572,6 +681,24 @@ var ELEC = { } else { setprop("/systems/electrical/gen2-fault", 0); } + + foreach(var screena; screens) { + power_consumption = screena.power_consumption(); + if (getprop(screena.elec_prop) != 0) { + setprop("/systems/electrical/DU/" ~ screena.name ~ "/watts", power_consumption); + } else { + setprop("/systems/electrical/DU/" ~ screena.name ~ "/watts", 0); + } + } + + foreach(var lighta; lights) { + power_consumption = lighta.power_consumption(); + if (getprop(screena.elec_prop) != 0 and getprop(lighta.control_prop) != 0) { + setprop("/systems/electrical/light/" ~ lighta.name ~ "/watts", power_consumption); + } else { + setprop("/systems/electrical/light/" ~ lighta.name ~ "/watts", 0); + } + } }, }; diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index 9ad5354f..cc85d19c 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -34,11 +34,11 @@ 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.16, 1], "/controls/lighting/beacon"); +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); var strobe = aircraft.light.new("/sim/model/lights/strobe", [0.05, 0.06, 0.05, 1], "/controls/lighting/strobe"); var tail_strobe_switch = props.globals.getNode("/controls/switches/tailstrobe", 2); -var tail_strobe = aircraft.light.new("/sim/model/lights/tailstrobe", [0.11, 1], "/controls/lighting/strobe"); +var tail_strobe = aircraft.light.new("/sim/model/lights/tailstrobe", [0.1, 1], "/controls/lighting/strobe"); var logo_lights = getprop("/sim/model/lights/logo-lights"); var nav_lights = props.globals.getNode("/sim/model/lights/nav-lights"); var wow = getprop("/gear/gear[2]/wow"); @@ -365,9 +365,9 @@ var lightsLoop = maketimer(0.2, func { # nose lights - if (settingT == 0.5 and gear > 0.9) { + if (settingT == 0.5 and gear > 0.9 and (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0)) { setprop("/sim/model/lights/nose-lights", 0.85); - } else if (settingT == 1 and gear > 0.9) { + } else if (settingT == 1 and gear > 0.9 and (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0)) { setprop("/sim/model/lights/nose-lights", 1); } else { setprop("/sim/model/lights/nose-lights", 0); @@ -378,11 +378,15 @@ var lightsLoop = maketimer(0.2, func { left_turnoff_light = props.globals.getNode("/controls/lighting/leftturnoff"); right_turnoff_light = props.globals.getNode("/controls/lighting/rightturnoff"); - if (settingTurnoff == 1 and gear > 0.9) { + if (settingTurnoff == 1 and gear > 0.9 and getprop("/systems/electrical/bus/ac1") > 0) { left_turnoff_light.setBoolValue(1); - right_turnoff_light.setBoolValue(1); } else { left_turnoff_light.setBoolValue(0); + } + + if (settingTurnoff == 1 and gear > 0.9 and getprop("/systems/electrical/bus/ac2") > 0) { + right_turnoff_light.setBoolValue(1); + } else { right_turnoff_light.setBoolValue(0); } @@ -393,9 +397,15 @@ var lightsLoop = maketimer(0.2, func { wow = getprop("/gear/gear[2]/wow"); slats = getprop("/controls/flight/slats"); + if (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0) { + setprop("/systems/electrical/nav-lights-power", 1); + } else { + setprop("/systems/electrical/nav-lights-power", 0); + } + if (setting == 0 and logo_lights == 1) { logo_lights.setBoolValue(0); - } else if (setting == 1 or setting == 2) { + } else if (setting == 1 or setting == 2 and (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0)) { if ((wow) or (!wow and slats > 0)) { logo_lights.setBoolValue(1); } else { @@ -405,7 +415,7 @@ var lightsLoop = maketimer(0.2, func { logo_lights.setBoolValue(0); } - if (setting == 1 or setting == 2) { + if (setting == 1 or setting == 2 and (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0 or getprop("/systems/electrical/bus/dc1") > 0 or getprop("/systems/electrical/bus/dc2") > 0)) { nav_lights.setBoolValue(1); } else { nav_lights.setBoolValue(0); diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml index 1a45c258..c65b8ec9 100644 --- a/Systems/fmgc-drivers.xml +++ b/Systems/fmgc-drivers.xml @@ -438,36 +438,6 @@ /instrumentation/pfd/track-deg - - LNAV ADVANCE - gain - 1.0 - - - - - /velocities/groundspeed-kt - 1201.0 - 4001.2 -
- - - - /autopilot/route-manager/wp[1]/true-bearing-deg - /autopilot/route-manager/wp[0]/true-bearing-deg - - - 300.0 - 701.0 -
- - - - /it-autoflight/internal/lnav-advance-nm - 1.0 - 5.0 - - HEADING ERROR DEG false diff --git a/Systems/libraries.xml b/Systems/libraries.xml index 199a7977..1cbb5aed 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -11,7 +11,7 @@ Groundspeed Meters Per Second gain - 0.51444444444 + 0.5144444444444 /velocities/groundspeed-kt /velocities/groundspeed-mps 0 @@ -574,7 +574,7 @@ - velocities/uBody-fps + /velocities/uBody-fps 0.592484 @@ -589,11 +589,11 @@ 0.05 - fdm/jsbsim/inertia/weight-lbs + /fdm/jsbsim/inertia/weight-lbs 0.45359237 - fdm/jsbsim/inertia/weight-kg + /fdm/jsbsim/inertia/weight-kg diff --git a/revision.txt b/revision.txt index 0d694126..267a2730 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4067 \ No newline at end of file +4068 \ No newline at end of file