diff -Nru fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/777-set-common.xml fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/777-set-common.xml --- fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/777-set-common.xml 2013-05-13 00:07:34.000000000 +0000 +++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/777-set-common.xml 2013-05-28 01:08:31.000000000 +0000 @@ -9,7 +9,7 @@ 4 4 - 20130512 + 20130527 yasim 0.1 diff -Nru fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Models/APpanel.xml fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Models/APpanel.xml --- fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Models/APpanel.xml 2013-04-28 16:12:39.000000000 +0000 +++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Models/APpanel.xml 2013-05-28 01:08:31.000000000 +0000 @@ -1331,6 +1331,27 @@ /systems/electrical/outputs/avionics + + instrumentation/afds/ap-modes/pitch-mode + VNAV ALT + + + instrumentation/afds/ap-modes/pitch-mode + VNAV SPD + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + instrumentation/afds/settings/manual-intervention + + instrumentation/afds/inputs/ias-mach-selected @@ -1346,6 +1367,27 @@ /systems/electrical/outputs/avionics + + instrumentation/afds/ap-modes/pitch-mode + VNAV ALT + + + instrumentation/afds/ap-modes/pitch-mode + VNAV SPD + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + instrumentation/afds/settings/manual-intervention + + instrumentation/afds/inputs/ias-mach-selected @@ -1375,6 +1417,27 @@ /systems/electrical/outputs/avionics + + instrumentation/afds/ap-modes/pitch-mode + VNAV ALT + + + instrumentation/afds/ap-modes/pitch-mode + VNAV SPD + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + instrumentation/afds/settings/manual-intervention + + instrumentation/afds/inputs/ias-mach-selected @@ -1390,6 +1453,27 @@ /systems/electrical/outputs/avionics + + instrumentation/afds/ap-modes/pitch-mode + VNAV ALT + + + instrumentation/afds/ap-modes/pitch-mode + VNAV SPD + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + instrumentation/afds/settings/manual-intervention + + instrumentation/afds/inputs/ias-mach-selected @@ -1445,6 +1529,27 @@ /systems/electrical/outputs/avionics + + instrumentation/afds/ap-modes/pitch-mode + VNAV ALT + + + instrumentation/afds/ap-modes/pitch-mode + VNAV SPD + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + instrumentation/afds/settings/manual-intervention + + instrumentation/afds/inputs/ias-mach-selected @@ -1460,6 +1565,27 @@ /systems/electrical/outputs/avionics + + instrumentation/afds/ap-modes/pitch-mode + VNAV ALT + + + instrumentation/afds/ap-modes/pitch-mode + VNAV SPD + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + instrumentation/afds/settings/manual-intervention + + instrumentation/afds/inputs/ias-mach-selected @@ -1490,6 +1616,27 @@ /systems/electrical/outputs/avionics + + instrumentation/afds/ap-modes/pitch-mode + VNAV ALT + + + instrumentation/afds/ap-modes/pitch-mode + VNAV SPD + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + instrumentation/afds/settings/manual-intervention + + instrumentation/afds/inputs/ias-mach-selected @@ -1505,6 +1652,27 @@ /systems/electrical/outputs/avionics + + instrumentation/afds/ap-modes/pitch-mode + VNAV ALT + + + instrumentation/afds/ap-modes/pitch-mode + VNAV SPD + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + + + instrumentation/afds/ap-modes/pitch-mode + VNAV PTH + + instrumentation/afds/settings/manual-intervention + + instrumentation/afds/inputs/ias-mach-selected diff -Nru fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Nasal/AFDS.nas fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Nasal/AFDS.nas --- fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Nasal/AFDS.nas 2013-05-13 00:07:34.000000000 +0000 +++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Nasal/AFDS.nas 2013-05-28 01:08:31.000000000 +0000 @@ -856,7 +856,7 @@ elsif(idx == 4) # LOC { if((me.rollout_armed.getValue()) - and (getprop("position/gear-agl-ft") < 5)) + and (getprop("position/gear-agl-ft") < 50)) { me.rollout_armed.setValue(0); idx = 5; # ROLLOUT @@ -876,6 +876,12 @@ } elsif(idx == 5) # ROLLOUT { + if(getprop("gear/gear[0]/wow") + and me.AP.getValue()) + { + setprop("/controls/gear/tiller-enabled", 1); + setprop("controls/flight/aileron", 0); # Aileron set neutral + } if(getprop("velocities/groundspeed-kt") < 50) { setprop("/controls/gear/tiller-enabled", me.tiller_status); diff -Nru fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Nasal/systems.nas fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Nasal/systems.nas --- fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Nasal/systems.nas 2013-04-28 16:12:45.000000000 +0000 +++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Nasal/systems.nas 2013-05-27 01:05:46.000000000 +0000 @@ -653,6 +653,7 @@ setprop("controls/flight/elevator-trim", 0); setprop("controls/flight/aileron-trim", 0); setprop("instrumentation/weu/state/takeoff-mode",0); + setprop("instrumentation/altimeter/setting-inhg", getprop("environment/metar/pressure-inhg")); } # start update_systems loop - but start it once only diff -Nru fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Systems/777-autopilot.xml fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-autopilot.xml --- fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Systems/777-autopilot.xml 2013-04-28 16:12:45.000000000 +0000 +++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-autopilot.xml 2013-05-28 01:08:31.000000000 +0000 @@ -197,7 +197,7 @@ - ROLLOUT + ROLLOUT-rudder-air false @@ -207,10 +207,39 @@ instrumentation/afds/ap-modes/roll-mode ROLLOUT - - velocities/groundspeed-kt - 5 - + gear/gear[0]/wow + + + + + /orientation/heading-deg + + + /instrumentation/nav/heading-deg + + + /controls/flight/rudder + + + 0.03 + 0.01 + -5.0 + 5.0 + + + + + ROLLOUT-rudder-gnd + false + + + + instrumentation/afds/inputs/AP + + instrumentation/afds/ap-modes/roll-mode + ROLLOUT + + gear/gear[0]/wow @@ -231,6 +260,41 @@ + + ROLLOUT-aileron + false + + + + instrumentation/afds/inputs/AP + + instrumentation/afds/ap-modes/roll-mode + ROLLOUT + + + + + + /orientation/roll-deg + + + /orientation/side-slip-deg + + + /autopilot/internal/target-roll-deg + + + 15.0 + 0.0 + + instrumentation/afds/settings/bank-min + + + instrumentation/afds/settings/bank-max + + + + Aileron Control false @@ -260,10 +324,10 @@ 5 0.0 - -0.5 + -1.0 - 0.5 + 1.0 @@ -327,6 +391,12 @@ instrumentation/afds/inputs/AP gear/gear[1]/wow + + + instrumentation/afds/ap-modes/roll-mode + ROLLOUT + + @@ -828,6 +898,27 @@ + + Current GSVspped local + false + gain + 1.0 + + + + position/gear-agl-ft + 150.0 + + + + + /instrumentation/nav[0]/gs-rate-of-climb + + + /autopilot/internal/current-gs-rate-of-climb + + + Glideslop Hold false @@ -839,7 +930,7 @@ /velocities/vertical-speed-fps - /instrumentation/nav[0]/gs-rate-of-climb + /autopilot/internal/current-gs-rate-of-climb /autopilot/internal/target-pitch-deg diff -Nru fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Systems/777-autothrottle.xml fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-autothrottle.xml --- fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Systems/777-autothrottle.xml 2013-04-28 16:12:45.000000000 +0000 +++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-autothrottle.xml 2013-05-27 01:05:46.000000000 +0000 @@ -332,7 +332,7 @@ 0.08 0.16 - 0.0001 + 0.00001 diff -Nru fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Systems/777-spoiler-fcs.xml fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-spoiler-fcs.xml --- fgfs-base-2.11.0+201305241600~gitd0d9a5f/Aircraft/777/Systems/777-spoiler-fcs.xml 2013-04-28 13:27:59.000000000 +0000 +++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-spoiler-fcs.xml 2013-05-28 01:08:31.000000000 +0000 @@ -38,8 +38,10 @@ 1 autopilot/autobrake/throttles-at-idle - gear/gear[1]/wow - gear/gear[2]/wow + + gear/gear[1]/wow + gear/gear[2]/wow + velocities/groundspeed-kt 60 diff -Nru fgfs-base-2.11.0+201305241600~gitd0d9a5f/debian/changelog fgfs-base-2.11.0+201305272000~git6fd80e3/debian/changelog --- fgfs-base-2.11.0+201305241600~gitd0d9a5f/debian/changelog 2013-05-24 21:05:09.000000000 +0000 +++ fgfs-base-2.11.0+201305272000~git6fd80e3/debian/changelog 2013-05-28 01:08:41.000000000 +0000 @@ -1,3 +1,39 @@ +fgfs-base (2.11.0+201305272000~git6fd80e3-0ubuntu0ppa1) raring; urgency=low + + [ Hyde Yamakawa ] + * 777:In air rollout improvement. + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Mon, 27 May 2013 20:08:41 -0500 + +fgfs-base (2.11.0+201305271600~git4f6b194-0ubuntu0ppa1) raring; urgency=low + + [ BARANGER Emmanuel ] + * Hughes H4 Hercules : Glasses dishes on instruments and compatibility Rembrandt + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Mon, 27 May 2013 16:07:10 -0500 + +fgfs-base (2.11.0+201305271200~git280b965-0ubuntu0ppa1) raring; urgency=low + + [ Curtis L. Olson ] + * Updates from original aircraft author: + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Mon, 27 May 2013 12:06:00 -0500 + +fgfs-base (2.11.0+201305262000~git4223b40-0ubuntu0ppa1) raring; urgency=low + + [ Hyde Yamakawa ] + * 777:Implement in air rollout function. + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Sun, 26 May 2013 20:05:54 -0500 + fgfs-base (2.11.0+201305241600~gitd0d9a5f-0ubuntuppa1) raring; urgency=low [ Vivian Meazza ] diff -Nru fgfs-base-2.11.0+201305241600~gitd0d9a5f/debian/control fgfs-base-2.11.0+201305272000~git6fd80e3/debian/control --- fgfs-base-2.11.0+201305241600~gitd0d9a5f/debian/control 2013-05-08 20:08:07.000000000 +0000 +++ fgfs-base-2.11.0+201305272000~git6fd80e3/debian/control 2013-05-26 19:11:56.000000000 +0000 @@ -58,7 +58,7 @@ Package: fgfs-aircraft-a10 Architecture: all Recommends: fgfs-base -Description: Flight Gear Flight Simulator -- Airbus A380 +Description: Flight Gear Flight Simulator -- Airbus A-10 Flight Gear is a free and highly sophisticated flight simulator. . This package contains the Fairchild Republic A-10 Thunderbolt