diff --git a/Aircraft/c172-610x-set.xml b/Aircraft/c172-610x-set.xml
index e254ec496..0e78ab537 100644
--- a/Aircraft/c172-610x-set.xml
+++ b/Aircraft/c172-610x-set.xml
@@ -1,16 +1,13 @@
<?xml version="1.0"?>
<!--
************************************************************************
-Cessna 172 simulation config. This files ties together all the components
-used by FGFS to represent the C172. Components include the flight data
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+FDM-independent Cessna 172 with full-screen, high-res panel.
-October 23 2001 John Check, fgpanels@rockfish.net
+Started October 23 2001 by John Check, fgpanels@rockfish.net
************************************************************************
-->
-<PropertyList>
+<PropertyList include="c172-base.xml">
<sim>
@@ -20,17 +17,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
<!-- <flight-model archive="y">jsb</flight-model> -->
<!-- <aero archive="y">c172</aero> -->
- <systems>
- <electrical>
- <path>Aircraft/c172/c172-electrical.xml</path>
- </electrical>
- </systems>
-
- <sound>
- <audible archive="y">true</audible>
- <path archive="y">Aircraft/c172/c172-sound.xml</path>
- </sound>
-
<panel>
<path>Aircraft/c172/Panels/c172-610x-panel.xml</path>
<visibility archive="y">true</visibility>
@@ -43,39 +29,4 @@ October 23 2001 John Check, fgpanels@rockfish.net
</sim>
- <autopilot>
- <config>
- <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
- <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
- <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
- <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
- <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
- <integral-contribution type="float">0.01</integral-contribution>
- <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
- <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
- </config>
- </autopilot>
-
- <consumables>
- <fuel>
- <tank n="0">
- <level-gal_us>20</level-gal_us>
- </tank>
- <tank n="1">
- <level-gal_us>20</level-gal_us>
- </tank>
- </fuel>
- </consumables>
-
- <controls>
- <aileron-trim>0.0</aileron-trim>
- <magnetos>3</magnetos>
- </controls>
-
- <engines>
- <engine>
- <rpm type="double">700</rpm>
- </engine>
- </engines>
-
</PropertyList>
diff --git a/Aircraft/c172-base.xml b/Aircraft/c172-base.xml
new file mode 100644
index 000000000..b5254d50d
--- /dev/null
+++ b/Aircraft/c172-base.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Common configuration for all C172 aircraft.
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+ <systems>
+ <electrical>
+ <path>Aircraft/c172/c172-electrical.xml</path>
+ </electrical>
+ </systems>
+
+ <sound>
+ <audible archive="y">true</audible>
+ <path archive="y">Aircraft/c172/c172-sound.xml</path>
+ </sound>
+
+ </sim>
+
+ <engines>
+ <engine>
+ <rpm type="double">700</rpm>
+ </engine>
+ </engines>
+
+</PropertyList>
diff --git a/Aircraft/c172-larcsim-set.xml b/Aircraft/c172-larcsim-set.xml
index 9564b84a2..3d3c47a1a 100644
--- a/Aircraft/c172-larcsim-set.xml
+++ b/Aircraft/c172-larcsim-set.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
************************************************************************
-Cessna 172 simulation config. This files ties together all the components
+LaRCsim Cessna 172 with 2D panel.
used by FGFS to represent the C172. Components include the flight data
model, instrument panel, and external 3D model.
3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
@@ -10,20 +10,15 @@ October 23 2001 John Check, fgpanels@rockfish.net
************************************************************************
-->
-<PropertyList>
+<PropertyList include="c172p-base.xml">
<sim>
- <description>Cessna 172 (LaRCsim)</description>
+ <description>Cessna 172 (LaRCsim, 2D panel).</description>
<flight-model>larcsim</flight-model>
<aero>c172</aero>
- <sound>
- <audible>true</audible>
- <path>Aircraft/c172/c172-sound.xml</path>
- </sound>
-
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
@@ -32,42 +27,8 @@ October 23 2001 John Check, fgpanels@rockfish.net
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
-<!--
- <model>
- <path>Aircraft/c172/Models/N757/n757.ac</path>
- </model>
--->
-
- <model>
- <path>Aircraft/c172/Models/c172-dpm.xml</path>
- </model>
-
</sim>
- <consumables>
- <fuel>
- <tank n="0">
- <level-gal_us>20</level-gal_us>
- </tank>
- <tank n="1">
- <level-gal_us>20</level-gal_us>
- </tank>
- </fuel>
- </consumables>
-
- <autopilot>
- <config>
- <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
- <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
- <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
- <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
- <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
- <integral-contribution type="float">0.01</integral-contribution>
- <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
- <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
- </config>
- </autopilot>
-
</PropertyList>
diff --git a/Aircraft/c172p-3d-jsbsim-set.xml b/Aircraft/c172p-3d-jsbsim-set.xml
index 73e55e594..283a888c7 100644
--- a/Aircraft/c172p-3d-jsbsim-set.xml
+++ b/Aircraft/c172p-3d-jsbsim-set.xml
@@ -1,60 +1,33 @@
<?xml version="1.0"?>
<!--
************************************************************************
-Cessna 172 simulation config. This files ties together all the components
-used by FGFS to represent the C172. Components include the flight data
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+JSBSim Cessna 172P with 3D cockpit.
-October 23 2001 John Check, fgpanels@rockfish.net
+Started October 23 2001 by John Check, fgpanels@rockfish.net
************************************************************************
-->
-<PropertyList>
+<PropertyList include="c172p-jsbsim-base.xml">
<sim>
- <description>Cessna 172P</description>
+ <description>Cessna 172P (JSBSim, 3D cockpit)</description>
+
+ <!-- hide the 2D panel -->
- <flight-model archive="y">jsb</flight-model>
- <aero archive="y">c172p</aero>
-
- <systems>
- <electrical>
- <path>Aircraft/c172/c172-electrical.xml</path>
- </electrical>
- </systems>
-
- <sound>
- <audible archive="y">true</audible>
- <path archive="y">Aircraft/c172/c172-sound.xml</path>
- </sound>
-
<panel>
<visibility archive="y">false</visibility>
</panel>
- <model>
- <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
- </model>
-
+ <!-- position the pilot viewpoint and angle -->
+
<view>
<internal archive="y">true</internal>
<config>
- <goal-heading-deg>0.0</goal-heading-deg>
<x-offset-m archive="y">-0.18</x-offset-m>
<y-offset-m archive="y">0.30</y-offset-m>
<z-offset-m archive="y">0.4</z-offset-m>
- <default-field-of-view-deg>55.0</default-field-of-view-deg>
<default-pitch-deg>-12</default-pitch-deg>
- <front-direction-deg>0.0</front-direction-deg>
- <front-left-direction-deg>45</front-left-direction-deg>
- <left-direction-deg>90</left-direction-deg>
- <back-left-direction-deg>135</back-left-direction-deg>
- <back-direction-deg>180</back-direction-deg>
- <back-right-direction-deg>225</back-right-direction-deg>
- <right-direction-deg>270</right-direction-deg>
- <front-right-direction-deg>315</front-right-direction-deg>
</config>
</view>
@@ -64,40 +37,4 @@ October 23 2001 John Check, fgpanels@rockfish.net
</sim>
- <autopilot>
- <config>
- <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
- <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
- <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
- <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
- <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
- <integral-contribution type="float">0.01</integral-contribution>
- <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
- <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
- </config>
- </autopilot>
-
- <consumables>
- <fuel>
- <tank n="0">
- <level-gal_us>20</level-gal_us>
- </tank>
- <tank n="1">
- <level-gal_us>20</level-gal_us>
- </tank>
- </fuel>
- </consumables>
-
- <controls>
- <aileron-trim>-0.125</aileron-trim>
- <rudder-trim>0.0</rudder-trim>
- <magnetos>3</magnetos>
- </controls>
-
- <engines>
- <engine>
- <rpm type="double">700</rpm>
- </engine>
- </engines>
-
</PropertyList>
diff --git a/Aircraft/c172p-base.xml b/Aircraft/c172p-base.xml
new file mode 100644
index 000000000..81f4d3e7b
--- /dev/null
+++ b/Aircraft/c172p-base.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Common configuration for all C172P aircraft.
+************************************************************************
+-->
+
+<PropertyList include="c172-base.xml">
+
+ <sim>
+
+ <model>
+ <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
+ </model>
+
+ </sim>
+
+ <autopilot>
+ <config>
+ <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
+ <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
+ <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
+ <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+ <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
+ <integral-contribution type="float">0.01</integral-contribution>
+ <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+ <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
+ </config>
+ </autopilot>
+
+ <consumables>
+ <fuel>
+ <tank n="0">
+ <level-gal_us>20</level-gal_us>
+ </tank>
+ <tank n="1">
+ <level-gal_us>20</level-gal_us>
+ </tank>
+ </fuel>
+ </consumables>
+
+</PropertyList>
diff --git a/Aircraft/c172p-jsbsim-base.xml b/Aircraft/c172p-jsbsim-base.xml
new file mode 100644
index 000000000..5d1961a40
--- /dev/null
+++ b/Aircraft/c172p-jsbsim-base.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+Common configuration for JSBSim C172P aircraft.
+************************************************************************
+-->
+
+<PropertyList include="c172p-base.xml">
+
+ <sim>
+ <flight-model archive="y">jsb</flight-model>
+ <aero archive="y">c172p</aero>
+ </sim>
+
+ <!-- trim for level cruise -->
+
+ <controls>
+ <aileron-trim>-0.005</aileron-trim>
+ <rudder-trim>-0.025</rudder-trim>
+ <magnetos>3</magnetos>
+ </controls>
+
+</PropertyList>
diff --git a/Aircraft/c172p-jsbsim-set.xml b/Aircraft/c172p-jsbsim-set.xml
index e4d797ee3..c4343f30c 100644
--- a/Aircraft/c172p-jsbsim-set.xml
+++ b/Aircraft/c172p-jsbsim-set.xml
@@ -1,35 +1,20 @@
<?xml version="1.0"?>
<!--
************************************************************************
-Cessna 172 simulation config. This files ties together all the components
-used by FGFS to represent the C172. Components include the flight data
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+JSBSim Cessna 172P with 2D panel.
-October 23 2001 John Check, fgpanels@rockfish.net
+Started October 23 2001 by John Check, fgpanels@rockfish.net
************************************************************************
-->
-<PropertyList>
+<PropertyList include="c172p-jsbsim-base.xml">
<sim>
- <description>Cessna 172P</description>
+ <description>Cessna 172P (JSBSim, 2D panel).</description>
+
+ <!-- Use a 2D instrument panel -->
- <flight-model archive="y">jsb</flight-model>
- <aero archive="y">c172p</aero>
-
- <systems>
- <electrical>
- <path>Aircraft/c172/c172-electrical.xml</path>
- </electrical>
- </systems>
-
- <sound>
- <audible archive="y">true</audible>
- <path archive="y">Aircraft/c172/c172-sound.xml</path>
- </sound>
-
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility archive="y">true</visibility>
@@ -38,12 +23,12 @@ October 23 2001 John Check, fgpanels@rockfish.net
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
- <model>
- <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
- </model>
+ <!-- Look down a bit over the top of the panel -->
<view>
- <internal archive="y">false</internal>
+ <config>
+ <default-pitch-deg>-8</default-pitch-deg>
+ </config>
</view>
<current-view>
@@ -52,40 +37,4 @@ October 23 2001 John Check, fgpanels@rockfish.net
</sim>
- <autopilot>
- <config>
- <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
- <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
- <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
- <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
- <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
- <integral-contribution type="float">0.01</integral-contribution>
- <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
- <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
- </config>
- </autopilot>
-
- <consumables>
- <fuel>
- <tank n="0">
- <level-gal_us>20</level-gal_us>
- </tank>
- <tank n="1">
- <level-gal_us>20</level-gal_us>
- </tank>
- </fuel>
- </consumables>
-
- <controls>
- <aileron-trim>-0.125</aileron-trim>
- <rudder-trim>0.0</rudder-trim>
- <magnetos>3</magnetos>
- </controls>
-
- <engines>
- <engine>
- <rpm type="double">700</rpm>
- </engine>
- </engines>
-
</PropertyList>
diff --git a/Aircraft/c172r-base.xml b/Aircraft/c172r-base.xml
index 6f19c8bc1..711179020 100644
--- a/Aircraft/c172r-base.xml
+++ b/Aircraft/c172r-base.xml
@@ -5,25 +5,14 @@ Common configuration for all C172R aircraft.
************************************************************************
-->
-<PropertyList>
+<PropertyList include="c172-base.xml">
<sim>
- <systems>
- <electrical>
- <path>Aircraft/c172/c172-electrical.xml</path>
- </electrical>
- </systems>
-
<model>
<path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
</model>
- <sound>
- <audible archive="y">true</audible>
- <path archive="y">Aircraft/c172/c172-sound.xml</path>
- </sound>
-
</sim>
<autopilot>
diff --git a/Aircraft/c172r-jsbsim-base.xml b/Aircraft/c172r-jsbsim-base.xml
index 22d748b88..e49d6f566 100644
--- a/Aircraft/c172r-jsbsim-base.xml
+++ b/Aircraft/c172r-jsbsim-base.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
************************************************************************
-Common configuration for JSBSim C172r aircraft.
+Common configuration for JSBSim C172R aircraft.
************************************************************************
-->
diff --git a/Aircraft/c172r-jsbsim-set.xml b/Aircraft/c172r-jsbsim-set.xml
index e7c3b0a11..4a8e229a6 100644
--- a/Aircraft/c172r-jsbsim-set.xml
+++ b/Aircraft/c172r-jsbsim-set.xml
@@ -11,7 +11,7 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<sim>
- <description>Cessna 172R (JSBSim, 2D VFR panel).</description>
+ <description>Cessna 172R (JSBSim, 2D panel).</description>
<!-- Use a 2D instrument panel -->
diff --git a/Aircraft/c172x-set.xml b/Aircraft/c172x-set.xml
index 356130b57..30bfa508f 100644
--- a/Aircraft/c172x-set.xml
+++ b/Aircraft/c172x-set.xml
@@ -1,16 +1,13 @@
<?xml version="1.0"?>
<!--
************************************************************************
-Cessna 172 simulation config. This files ties together all the components
-used by FGFS to represent the C172. Components include the flight data
-model, instrument panel, and external 3D model.
-3D models can be downloaded from http://home.t-online.de/home/Wolfram.Kuss/
+JSBSim textbed Cessna 172 with 2D panel.
-October 23 2001 John Check, fgpanels@rockfish.net
+Started October 23 2001 by John Check, fgpanels@rockfish.net
************************************************************************
-->
-<PropertyList>
+<PropertyList include="c172r-base.xml">
<sim>
@@ -19,17 +16,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
<flight-model archive="y">jsb</flight-model>
<aero archive="y">c172x</aero>
- <systems>
- <electrical>
- <path>Aircraft/c172/c172-electrical.xml</path>
- </electrical>
- </systems>
-
- <sound>
- <audible archive="y">true</audible>
- <path archive="y">Aircraft/c172/c172-sound.xml</path>
- </sound>
-
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility archive="y">true</visibility>
@@ -38,46 +24,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
-
- <model>
- <path archive="y">Aircraft/c172/Models/c172-dpm.xml</path>
- </model>
-
</sim>
- <autopilot>
- <config>
- <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
- <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
- <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
- <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
- <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
- <integral-contribution type="float">0.01</integral-contribution>
- <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
- <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
- </config>
- </autopilot>
-
- <consumables>
- <fuel>
- <tank n="0">
- <level-gal_us>20</level-gal_us>
- </tank>
- <tank n="1">
- <level-gal_us>20</level-gal_us>
- </tank>
- </fuel>
- </consumables>
-
- <controls>
- <aileron-trim>-0.055</aileron-trim>
- <magnetos>3</magnetos>
- </controls>
-
- <engines>
- <engine>
- <rpm type="double">700</rpm>
- </engine>
- </engines>
-
</PropertyList>