Merge branch 'master' of git://mapserver.flightgear.org/fgdata

Aircraft/c172p/Instruments/asi/asi.ac

@@ -52,7 +52,7 @@ refs 3
 kids 0
 OBJECT poly
 name "Face"
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/asi/asi.rgb"
+texture "asi.png"
 crease 45.000000
 numvert 4
 0 0.04 -0.04

Aircraft/c172p/Instruments/asi/asi.py

@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+
+from svginstr import *
+import sys
+
+__author__ = "Melchior FRANZ < mfranz # aon : at >"
+__url__ = "http://gitorious.org/svginstr/"
+__version__ = "0.2"
+__license__ = "GPL v2+"
+__doc__ = """
+"""
+
+
+try:
+	a = Instrument("asi.svg", 512, 512, "test face; " + __version__)
+	a.disc(98, color = 'black')
+	a.disc(1)
+
+	# define mapping function: map scale value 30 - 160 to angle 0-320 degree.
+	# However, the values from 100-160 are compressed slightly, so the lambda function is just 120 values
+	a.angle = lambda x: x * 300.0 / 115.0 - 145.0
+
+	# inside line
+	l = 50
+
+	# compression
+	compress = 0.8
+
+	a.arc(44, 100 + 27 * compress, l+3, width = 8, color = "green")
+	a.arc(100 + 27 * compress, 100 + 58 * compress, l+3, width = 8, color = "yellow")
+	a.arc(33, 85, l, width = 3, color = "white")
+
+	for i in range(35, 100, 5):
+		a.tick(i, l, 58, 2)
+
+	for i in range(100, 152, int(5 * compress + 0.5)):
+		a.tick(i, l, 58, 2)
+
+	for i in range(40, 100, 10):
+		a.tick(i, l, 65, 2)
+
+	for i in range(100, 155, int(10 * compress + 0.5)):
+		a.tick(i, l, 65, 2)
+
+	a.tick(100 + 58 * compress, l, 60, color="red")
+
+	# mph conversion
+	mph = 0.8689
+	k = 30
+	for i in range(40, 100, int(10 * mph)):
+		a.tick(i, k, k + 6, 1)
+	for i in range(40 + int(65 * mph), 150, int(10 * mph * compress)):
+		a.tick(i, k, k + 6, 1)
+
+
+
+	# fc-list tells you the names of available fonts on Linux  (fc ... font cache)
+
+	s = 13
+
+	a.at(0,-70).text("AIRSPEED", size = 10, font_family = "Lucida Sans", color = "white")
+	a.at(0,-55).text("KNOTS", size = 10, font_family = "Lucida Sans", color = "white")
+	a.at(60,-42).text(40, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(75,20).text(60, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(35,72).text(80, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(-40,72).text(100, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(-75,30).text(120, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(-75,-20).text(140, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(-45,-57).text(160, size = s, font_family = "Lucida Sans", color = "white")
+
+	# mph markings
+	s = 7
+	a.at(16,-18).text(40, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(22,2).text(60, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(16,20).text(80, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(0,27).text(100, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(-14,22).text(120, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(-19,13).text(140, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(-22,0).text(160, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(-17,-14).text(180, size = s, font_family = "Lucida Sans", color = "white")
+	a.at(0,-20).text("MPH", size = s, font_family = "Lucida Sans", color = "white")
+	#a.at(75,20).text(60, size = s, font_family = "Lucida Sans", color = "white")
+	#a.at(35,72).text(80, size = s, font_family = "Lucida Sans", color = "white")
+	#a.at(-40,72).text(100, size = s, font_family = "Lucida Sans", color = "white")
+	#a.at(-75,30).text(120, size = s, font_family = "Lucida Sans", color = "white")
+	#a.at(-75,-20).text(140, size = s, font_family = "Lucida Sans", color = "white")
+	#a.at(-45,-55).text(160, size = s, font_family = "Lucida Sans", color = "white")
+
+except Error as e:
+	print >>sys.stderr, "\033[31;1m%s\033[m\n" % e
+

Aircraft/c172p/Instruments/asi/asi.xml

@@ -22,15 +22,16 @@
   <object-name>Needle</object-name>
   <property>instrumentation/airspeed-indicator/indicated-speed-kt</property>
   <interpolation>
-   <entry><ind>  10</ind><dep>    3</dep></entry>
-   <entry><ind>  40</ind><dep>   38</dep></entry>
-   <entry><ind>  60</ind><dep>   85</dep></entry>
-   <entry><ind>  80</ind><dep>  146</dep></entry>
-   <entry><ind> 100</ind><dep>  198</dep></entry>
-   <entry><ind> 120</ind><dep>  236</dep></entry>
-   <entry><ind> 140</ind><dep>  274</dep></entry>
-   <entry><ind> 160</ind><dep>  313</dep></entry>
-   <entry><ind> 190</ind><dep>  353</dep></entry>
+   <entry><ind>   0</ind><dep>    0</dep></entry>
+   <entry><ind>  35</ind><dep>   36</dep></entry>
+   <entry><ind>  40</ind><dep>   50</dep></entry>
+   <entry><ind>  60</ind><dep>  100</dep></entry>
+   <entry><ind>  80</ind><dep>  152</dep></entry>
+   <entry><ind> 100</ind><dep>  206</dep></entry>
+   <entry><ind> 120</ind><dep>  249</dep></entry>
+   <entry><ind> 140</ind><dep>  291</dep></entry>
+   <entry><ind> 160</ind><dep>  333</dep></entry>
+   <entry><ind> 190</ind><dep>  340</dep></entry>
   </interpolation>
   <axis>
    <x>-1</x>

Aircraft/c172p/c172-help.xml

@@ -41,5 +41,5 @@
   <line>Va: 99kts</line>
   <line>Vne: 158kts</line>
   <line>Approach: 65kts</line>
-  <line>Best Glide: 70kts</line>
+  <line>Best Glide: 65kts</line>
 </PropertyList>

Environment/environment.xml

@@ -72,6 +72,14 @@
       <description>This is expert level. You will barely see the taxiway from the cockpit, even if you are
                    on ground. Fog and light drizzle, freezing level at 1000ft.</description>
     </scenario>
+
+    <scenario>
+      <name>Early morning fog</name>
+      <metar>XXXX 012345Z 00000KT 0800 FG NCD 08/08 A3030</metar>
+      <description>Fog developed this autumn's morning. Expect good visibility above the layer. 
+                   However - getting through it can be a challenge. Stay alive for a 500' climb
+                   and you'll see the sun!</description>
+    </scenario>
   </weather-scenarios>
   <weather-scenario>Fair weather</weather-scenario>
   <config>
@@ -206,7 +214,7 @@
 
   <realwx>
     <metar>/environment/metar</metar>
-    <!-- user NOAA for METAR (no aloft data) -->
+    <!-- use NOAA for METAR (no aloft data) -->
     <data-source>noaa</data-source>
 
     <!-- use http://www.navlost.eu/ for METAR and aloft data -->
@@ -214,6 +222,11 @@
     <enabled>true</enabled>
   </realwx>
 
+  <metar>
+   <!-- create a low-level cloud layer for fog/mist/haze from metar -->
+   <set-ground-cloud-layer type="bool">true</set-ground-cloud-layer>
+  </metar>
+
   <params>
    <metar-max-age-min type="long">240</metar-max-age-min>
    <metar-updates-environment type="bool">true</metar-updates-environment>

Input/Joysticks/CH/fighterstick-usb.xml

@@ -152,7 +152,7 @@
 
   <button n="4">
     <desc>Flaps Up</desc>
-    <repeatable>true</repeatable>
+    <repeatable>false</repeatable>
     <binding>
       <command>nasal</command>
       <script>controls.flapsDown(-1)</script>
@@ -167,7 +167,7 @@
 
   <button n="6">
     <desc>Flaps Down</desc>
-    <repeatable>true</repeatable>
+    <repeatable>false</repeatable>
     <binding>
       <command>nasal</command>
       <script>controls.flapsDown(1)</script>