diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml
index 5192862e..93741f3e 100644
--- a/A320-100-CFM-set.xml
+++ b/A320-100-CFM-set.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList include="A320-main.xml">
diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index e68416c8..95105672 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -1,11 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<fdm_config name="IDG-A32X" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml
index 337a22ca..f89704e6 100644
--- a/A320-200-CFM-set.xml
+++ b/A320-200-CFM-set.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList include="A320-main.xml">
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index cc5c783c..00d18cce 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -1,11 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<fdm_config name="IDG-A32X" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index de621040..6919b15b 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList include="A320-main.xml">
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index ddbdc62d..f429c1b1 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -1,11 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<fdm_config name="IDG-A32X" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/A320-main.xml b/A320-main.xml
index 20ba3a6d..a56d66f3 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
@@ -408,7 +404,7 @@
<flight-recorder include="Systems/flight-recorder.xml"/>
- <gui n="0" include="Systems/it-gui.xml"/>
+ <gui n="0" include="gui/it-gui.xml"/>
<current-view>
<z-offset-default type="float">80.0</z-offset-default>
diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml
index 836faecb..84436151 100644
--- a/A320neo-CFM-set.xml
+++ b/A320neo-CFM-set.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList include="A320-main.xml">
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index 828ec642..ddaa9a44 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -1,11 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<fdm_config name="IDG-A32X" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/A320neo-PW-set.xml b/A320neo-PW-set.xml
index a5bcb9a3..dba86793 100644
--- a/A320neo-PW-set.xml
+++ b/A320neo-PW-set.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList include="A320-main.xml">
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index 0f7cdc24..a72cfc40 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -1,11 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<fdm_config name="IDG-A32X" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/A32X-Checklists.xml b/A32X-Checklists.xml
index 4522949d..c84eba4e 100644
--- a/A32X-Checklists.xml
+++ b/A32X-Checklists.xml
@@ -1,495 +1,208 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- Sven Seipp, Oct 2017 -->
-<!--
-TODO: add conditions for not yet implemented stuff:
-* TCAS
-* RADAR
-* Predictive windshear system
-* DH/MDA
--->
-
<PropertyList>
<checklist>
<title>BEFORE START</title>
- <page>
- <item>
- <name>COCKPIT PREP</name>
- <value>COMPLETED(BOTH)</value>
- </item>
- <item>
- <name>PINS AND COVERS</name>
- <value>REMOVED</value>
- </item>
- <item>
- <name>SIGNS</name>
- <value>ON/AUTO</value>
- <condition>
- <and>
- <equals>
- <property>controls/switches/seatbelt-sign</property>
- <value>true</value>
- </equals>
- <equals>
- <property>controls/switches/no-smoking-sign</property>
- <value>true</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/switches/seatbelt-sign</property>
- <value>true</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/switches/no-smoking-sign</property>
- <value>true</value>
- </binding>
- <marker>
- <x-m>4.6733</x-m>
- <y-m>0.0300</y-m>
- <z-m>0.8825</z-m>
- <scale>2.5500</scale>
- </marker>
- </item>
- <item>
- <name>ADIRS</name>
- <value>NAV</value>
- <condition>
- <and>
- <equals>
- <property>controls/adirs/ir/knob</property>
- <value>1</value>
- </equals>
- <equals>
- <property>controls/adirs/ir[1]/knob</property>
- <value>1</value>
- </equals>
- <equals>
- <property>controls/adirs/ir[2]/knob</property>
- <value>1</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/adirs/ir/knob</property>
- <value>1</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/adirs/ir[1]/knob</property>
- <value>1</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/adirs/ir[2]/knob</property>
- <value>1</value>
- </binding>
- <marker>
- <x-m>5.1067</x-m>
- <y-m>-0.2625</y-m>
- <z-m>1.0325</z-m>
- <scale>4.5500</scale>
- </marker>
- </item>
- <item>
- <name>FUEL QUANTITY</name>
- <value>____KG/LB</value>
- <marker>
- <x-m>4.5067</x-m>
- <y-m>-0.1458</y-m>
- <z-m>0.3317</z-m>
- <scale>1.4333</scale>
- </marker>
- </item>
- <item>
- <name>TO DATA</name>
- <value>____SET(BOTH)</value>
- <condition>
- <and>
- <equals>
- <property>/FMGC/internal/cost-index-set</property>
- <value>1</value>
- </equals>
- <equals>
- <property>/FMGC/internal/cruise-lvl-set</property>
- <value>1</value>
- </equals>
- <equals>
- <property>/FMGC/internal/v1-set</property>
- <value>1</value>
- </equals>
- <equals>
- <property>/FMGC/internal/vr-set</property>
- <value>1</value>
- </equals>
- <equals>
- <property>/FMGC/internal/v2-set</property>
- <value>1</value>
- </equals>
- </and>
- </condition>
- <marker>
- <x-m>4.4683</x-m>
- <y-m>-0.1975</y-m>
- <z-m>-0.0592</z-m>
- <scale>1.0000</scale>
- </marker>
- </item>
- <item>
- <name>BARO REF</name>
- <value>____SET(BOTH)</value>
- <marker>
- <x-m>4.5000</x-m>
- <y-m>-0.2592</y-m>
- <z-m>0.4783</z-m>
- <scale>1.5333</scale>
- </marker>
- </item>
- <item>
- <name>WINDOWS and DOORS</name>
- <value>CLOSED(BOTH)</value>
- <condition>
- <and>
- <equals>
- <property>/sim/model/door-positions/doorl1/position-norm</property>
- <value>0</value>
- </equals>
- <equals>
- <property>/sim/model/door-positions/doorl4/position-norm</property>
- <value>0</value>
- </equals>
- <equals>
- <property>/sim/model/door-positions/doorr1/position-norm</property>
- <value>0</value>
- </equals>
- <equals>
- <property>/sim/model/door-positions/doorr4/position-norm</property>
- <value>0</value>
- </equals>
- <equals>
- <property>/sim/model/door-positions/cargoaft/position-norm</property>
- <value>0</value>
- </equals>
- <equals>
- <property>/sim/model/door-positions/cargobulk/position-norm</property>
- <value>0</value>
- </equals>
- <equals>
- <property>/sim/model/door-positions/cargofwd/position-norm</property>
- <value>0</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>/sim/model/door-positions/doorl1/position-norm</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>/sim/model/door-positions/doorl4/position-norm</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>/sim/model/door-positions/doorr1/position-norm</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>/sim/model/door-positions/doorr4/position-norm</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>/sim/model/door-positions/cargoaft/position-norm</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>/sim/model/door-positions/cargofwd/position-norm</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>/sim/model/door-positions/cargobulk/position-norm</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.4658</x-m>
- <y-m>-0.0100</y-m>
- <z-m>-0.0583</z-m>
- <scale>0.9667</scale>
- </marker>
- </item>
- <item>
- <name>BEACON</name>
- <value>ON</value>
- <condition>
- <equals>
- <property>controls/lighting/beacon</property>
- <value>true</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/lighting/beacon</property>
- <value>true</value>
- </binding>
- <marker>
- <x-m>4.7067</x-m>
- <y-m>-0.1225</y-m>
- <z-m>0.8958</z-m>
- <scale>1.9333</scale>
- </marker>
- </item>
- <item>
- <name>THR LEVERS</name>
- <value>IDLE</value>
- <condition>
- <and>
- <equals>
- <property>systems/thrust/state1</property>
- <value>IDLE</value>
- </equals>
- <equals>
- <property>systems/thrust/state2</property>
- <value>IDLE</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/engines/engine/throttle</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/engines/engine[1]/throttle</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.7200</x-m>
- <y-m>-0.0533</y-m>
- <z-m>-0.0292</z-m>
- <scale>1.3667</scale>
- </marker>
- </item>
- <item>
- <name>PARKING BRAKE</name>
- <value>AS RQRD</value>
- <marker>
- <x-m>5.0500</x-m>
- <y-m>-0.0325</y-m>
- <z-m>-0.0567</z-m>
- <scale>3.3667</scale>
- </marker>
- </item>
- </page>
+ <item>
+ <name>COCKPIT PREP</name>
+ <value>COMPLETED(BOTH)</value>
+ </item>
+ <item>
+ <name>PINS AND COVERS</name>
+ <value>REMOVED</value>
+ </item>
+ <item>
+ <name>SIGNS</name>
+ <value>ON/AUTO</value>
+ <marker>
+ <x-m>4.6733</x-m>
+ <y-m>0.0300</y-m>
+ <z-m>0.8825</z-m>
+ <scale>2.5500</scale>
+ </marker>
+ </item>
+ <item>
+ <name>ADIRS</name>
+ <value>NAV</value>
+ <marker>
+ <x-m>5.1067</x-m>
+ <y-m>-0.2625</y-m>
+ <z-m>1.0325</z-m>
+ <scale>4.5500</scale>
+ </marker>
+ </item>
+ <item>
+ <name>FUEL QUANTITY</name>
+ <value>____KG/LB</value>
+ <marker>
+ <x-m>4.5067</x-m>
+ <y-m>-0.1458</y-m>
+ <z-m>0.3317</z-m>
+ <scale>1.4333</scale>
+ </marker>
+ </item>
+ <item>
+ <name>TO DATA</name>
+ <value>____SET(BOTH)</value>
+ <marker>
+ <x-m>4.4683</x-m>
+ <y-m>-0.1975</y-m>
+ <z-m>-0.0592</z-m>
+ <scale>1.0000</scale>
+ </marker>
+ </item>
+ <item>
+ <name>BARO REF</name>
+ <value>____SET(BOTH)</value>
+ <marker>
+ <x-m>4.5000</x-m>
+ <y-m>-0.2592</y-m>
+ <z-m>0.4783</z-m>
+ <scale>1.5333</scale>
+ </marker>
+ </item>
+ <item>
+ <name>WINDOWS and DOORS</name>
+ <value>CLOSED(BOTH)</value>
+ <marker>
+ <x-m>4.4658</x-m>
+ <y-m>-0.0100</y-m>
+ <z-m>-0.0583</z-m>
+ <scale>0.9667</scale>
+ </marker>
+ </item>
+ <item>
+ <name>BEACON</name>
+ <value>ON</value>
+ <marker>
+ <x-m>4.7067</x-m>
+ <y-m>-0.1225</y-m>
+ <z-m>0.8958</z-m>
+ <scale>1.9333</scale>
+ </marker>
+ </item>
+ <item>
+ <name>THR LEVERS</name>
+ <value>IDLE</value>
+ <marker>
+ <x-m>4.7200</x-m>
+ <y-m>-0.0533</y-m>
+ <z-m>-0.0292</z-m>
+ <scale>1.3667</scale>
+ </marker>
+ </item>
+ <item>
+ <name>PARKING BRAKE</name>
+ <value>AS RQRD</value>
+ <marker>
+ <x-m>5.0500</x-m>
+ <y-m>-0.0325</y-m>
+ <z-m>-0.0567</z-m>
+ <scale>3.3667</scale>
+ </marker>
+ </item>
</checklist>
<checklist>
<title>AFTER START</title>
<item>
<name>ANTI-ICE</name>
<value>AS RQRD</value>
- <marker>
- <x-m>4.7650</x-m>
- <y-m>-0.1208</y-m>
- <z-m>0.9042</z-m>
- <scale>4.4500</scale>
- </marker>
+ <marker>
+ <x-m>4.7650</x-m>
+ <y-m>-0.1208</y-m>
+ <z-m>0.9042</z-m>
+ <scale>4.4500</scale>
+ </marker>
</item>
<item>
<name>ECAM STATUS</name>
<value>CHECKED</value>
- <marker>
- <x-m>4.6650</x-m>
- <y-m>-0.2308</y-m>
- <z-m>0.3975</z-m>
- <scale>1.7500</scale>
- </marker>
+ <marker>
+ <x-m>4.6650</x-m>
+ <y-m>-0.2308</y-m>
+ <z-m>0.3975</z-m>
+ <scale>1.7500</scale>
+ </marker>
</item>
<item>
<name>PITCH TRIM</name>
<value>____SET</value>
- <marker>
- <x-m>4.6850</x-m>
- <y-m>-0.1075</y-m>
- <z-m>-0.0142</z-m>
- <scale>3.0333</scale>
- </marker>
+ <marker>
+ <x-m>4.6850</x-m>
+ <y-m>-0.1075</y-m>
+ <z-m>-0.0142</z-m>
+ <scale>3.0333</scale>
+ </marker>
</item>
<item>
<name>RUDDER TRIM</name>
<value>ZERO</value>
- <condition>
- <equals>
- <property>controls/flight/rudder-trim</property>
- <value>0</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/rudder-trim</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.9583</x-m>
- <y-m>-0.0142</y-m>
- <z-m>-0.1042</z-m>
- <scale>3.0333</scale>
- </marker>
+ <marker>
+ <x-m>4.9583</x-m>
+ <y-m>-0.0142</y-m>
+ <z-m>-0.1042</z-m>
+ <scale>3.0333</scale>
+ </marker>
</item>
</checklist>
<checklist>
- <title>TAXI/BEFORE TAKEOFF</title>
+ <title>TAXI/BEFORE TAKEOFF</title>
<item>
<name>FLIGHT CONTROLS</name>
<value>CHECKED(BOTH)</value>
- <marker>
- <x-m>4.4625</x-m>
- <y-m>0.0342</y-m>
- <z-m>-0.0617</z-m>
- <scale>1.0000</scale>
- </marker>
- </item>
- <item>
- <name>FLT INST</name>
- <value>CHECKED(BOTH)</value>
- </item>
- <item>
- <name>BRIEFING</name>
- <value>CONFIRMED</value>
- </item>
- <item>
- <name>FLAPS SETTING</name>
- <value>CONF__(BOTH)</value>
- <condition>
- <greater-than>
- <property>controls/flight/flap-lever</property>
- <value>0</value>
- </greater-than>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flap-lever</property>
- <value>1</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flap-pos</property>
- <value>2</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flap-txt</property>
- <value>1+F</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flaps</property>
- <value>0.29</value>
- </binding>
- <marker>
- <x-m>4.8950</x-m>
- <y-m>0.0683</y-m>
- <z-m>-0.0892</z-m>
- <scale>2.5500</scale>
- </marker>
- </item>
- <item>
- <name>V1. VR. V2/FLX TEMP</name>
- <value>CONF__(BOTH)</value>
- <condition>
- <and>
- <greater-than>
- <property>/FMGC/internal/v1</property>
- <value>100</value>
- </greater-than>
- <greater-than>
- <property>/FMGC/internal/vr</property>
- <value>100</value>
- </greater-than>
- <greater-than>
- <property>/FMGC/internal/v2</property>
- <value>100</value>
- </greater-than>
- </and>
- </condition>
- <marker>
- <x-m>4.4683</x-m>
- <y-m>-0.1975</y-m>
- <z-m>-0.0592</z-m>
- <scale>1.0000</scale>
- </marker>
- </item>
- <item>
- <name>ATC</name>
- <value>SET</value>
- <condition>
- <equals>
- <property>/instrumentation/transponder/inputs/knob-mode</property>
- <value>4</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>/instrumentation/transponder/inputs/knob-mode</property>
- <value>4</value>
- </binding>
- </item>
- <item>
- <name>ECAM MEMO</name>
- <value>TO NO BLUE</value>
- <condition>
- <and>
- <equals>
- <property>controls/autobrake/mode</property>
- <value>3</value>
- </equals>
- <equals>
- <property>controls/switches/seatbelt-sign</property>
- <value>true</value>
- </equals>
- <equals>
- <property>controls/switches/no-smoking-sign</property>
- <value>true</value>
- </equals>
- <equals>
- <property>controls/flight/speedbrake-arm</property>
- <value>1</value>
- </equals>
- <greater-than>
- <property>controls/flight/flap-lever</property>
- <value>0</value>
- </greater-than>
- <less-than>
- <property>controls/flight/flap-lever</property>
- <value>3</value>
- </less-than>
- <equals>
- <property>ECAM/to-config</property>
- <value>1</value>
- </equals>
- </and>
- </condition>
- <marker>
- <x-m>4.6650</x-m>
- <y-m>-0.2308</y-m>
- <z-m>0.3975</z-m>
- <scale>1.7500</scale>
- </marker>
- </item>
+ <marker>
+ <x-m>4.4625</x-m>
+ <y-m>0.0342</y-m>
+ <z-m>-0.0617</z-m>
+ <scale>1.0000</scale>
+ </marker>
+ </item>
+ <item>
+ <name>FLT INST</name>
+ <value>CHECKED(BOTH)</value>
+ </item>
+ <item>
+ <name>BRIEFING</name>
+ <value>CONFIRMED</value>
+ </item>
+ <item>
+ <name>FLAPS SETTING</name>
+ <value>CONF__(BOTH)</value>
+ <marker>
+ <x-m>4.8950</x-m>
+ <y-m>0.0683</y-m>
+ <z-m>-0.0892</z-m>
+ <scale>2.5500</scale>
+ </marker>
+ </item>
+ <item>
+ <name>V1. VR. V2/FLX TEMP</name>
+ <value>CONF__(BOTH)</value>
+ <marker>
+ <x-m>4.4683</x-m>
+ <y-m>-0.1975</y-m>
+ <z-m>-0.0592</z-m>
+ <scale>1.0000</scale>
+ </marker>
+ </item>
+ <item>
+ <name>ATC</name>
+ <value>SET</value>
+ </item>
+ <item>
+ <name>ECAM MEMO</name>
+ <value>TO NO BLUE</value>
+ <marker>
+ <x-m>4.6650</x-m>
+ <y-m>-0.2308</y-m>
+ <z-m>0.3975</z-m>
+ <scale>1.7500</scale>
+ </marker>
+ </item>
<item>
<name>CABIN CREW</name>
<value>ADVISED</value>
@@ -497,22 +210,22 @@ TODO: add conditions for not yet implemented stuff:
<item>
<name>ENG MODE SEL</name>
<value>AS RQRD</value>
- <marker>
- <x-m>4.8617</x-m>
- <y-m>-0.0333</y-m>
- <z-m>-0.0708</z-m>
- <scale>2.0000</scale>
- </marker>
+ <marker>
+ <x-m>4.8617</x-m>
+ <y-m>-0.0333</y-m>
+ <z-m>-0.0708</z-m>
+ <scale>2.0000</scale>
+ </marker>
</item>
<item>
<name>PACKS</name>
<value>AS RQRD</value>
- <marker>
- <x-m>4.8175</x-m>
- <y-m>-0.1317</y-m>
- <z-m>0.9492</z-m>
- <scale>1.6667</scale>
- </marker>
+ <marker>
+ <x-m>4.8175</x-m>
+ <y-m>-0.1317</y-m>
+ <z-m>0.9492</z-m>
+ <scale>1.6667</scale>
+ </marker>
</item>
</checklist>
<checklist>
@@ -520,122 +233,42 @@ TODO: add conditions for not yet implemented stuff:
<item>
<name>LDG GEAR</name>
<value>UP</value>
- <condition>
- <and>
- <equals>
- <property>gear/gear/position-norm</property>
- <value>0</value>
- </equals>
- <equals>
- <property>gear/gear[1]/position-norm</property>
- <value>0</value>
- </equals>
- <equals>
- <property>gear/gear[2]/position-norm</property>
- <value>0</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/gear/gear-down</property>
- <value>false</value>
- </binding>
- <marker>
- <x-m>4.3483</x-m>
- <y-m>0.1142</y-m>
- <z-m>0.1300</z-m>
- <scale>3.4833</scale>
- </marker>
+ <marker>
+ <x-m>4.3483</x-m>
+ <y-m>0.1142</y-m>
+ <z-m>0.1300</z-m>
+ <scale>3.4833</scale>
+ </marker>
</item>
<item>
<name>FLAPS</name>
<value>RETRACTED</value>
- <condition>
- <equals>
- <property>controls/flight/flap-pos</property>
- <value>0</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flap-lever</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flap-pos</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flap-txt</property>
- <value></value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flaps</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.8950</x-m>
- <y-m>0.0683</y-m>
- <z-m>-0.0892</z-m>
- <scale>2.5500</scale>
- </marker>
+ <marker>
+ <x-m>4.8950</x-m>
+ <y-m>0.0683</y-m>
+ <z-m>-0.0892</z-m>
+ <scale>2.5500</scale>
+ </marker>
</item>
<item>
<name>PACKS</name>
<value>ON</value>
- <condition>
- <and>
- <equals>
- <property>controls/pneumatic/switches/pack1</property>
- <value>1</value>
- </equals>
- <equals>
- <property>controls/pneumatic/switches/pack2</property>
- <value>1</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/pneumatic/switches/pack1</property>
- <value>1</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/pneumatic/switches/pack2</property>
- <value>1</value>
- </binding>
- <marker>
- <x-m>4.8175</x-m>
- <y-m>-0.1317</y-m>
- <z-m>0.9492</z-m>
- <scale>1.6667</scale>
- </marker>
+ <marker>
+ <x-m>4.8175</x-m>
+ <y-m>-0.1317</y-m>
+ <z-m>0.9492</z-m>
+ <scale>1.6667</scale>
+ </marker>
</item>
<item>
<name>BARO REF</name>
<value>SET(BOTH)</value>
- <condition>
- <equals>
- <property>modes/altimeter/std</property>
- <value>1</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>modes/altimeter/std</property>
- <value>1</value>
- </binding>
- <marker>
- <x-m>4.5000</x-m>
- <y-m>-0.2592</y-m>
- <z-m>0.4783</z-m>
- <scale>1.5333</scale>
- </marker>
+ <marker>
+ <x-m>4.5000</x-m>
+ <y-m>-0.2592</y-m>
+ <z-m>0.4783</z-m>
+ <scale>1.5333</scale>
+ </marker>
</item>
</checklist>
<checklist>
@@ -647,85 +280,52 @@ TODO: add conditions for not yet implemented stuff:
<item>
<name>ECAM STATUS</name>
<value>CHECKED</value>
- <marker>
- <x-m>4.6650</x-m>
- <y-m>-0.2308</y-m>
- <z-m>0.3975</z-m>
- <scale>1.7500</scale>
- </marker>
+ <marker>
+ <x-m>4.6650</x-m>
+ <y-m>-0.2308</y-m>
+ <z-m>0.3975</z-m>
+ <scale>1.7500</scale>
+ </marker>
</item>
<item>
<name>SEAT BELTS</name>
<value>ON</value>
- <condition>
- <equals>
- <property>controls/switches/seatbelt-sign</property>
- <value>true</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/switches/seatbelt-sign</property>
- <value>true</value>
- </binding>
- <marker>
- <x-m>4.6733</x-m>
- <y-m>0.0300</y-m>
- <z-m>0.8825</z-m>
- <scale>2.5500</scale>
- </marker>
+ <marker>
+ <x-m>4.6733</x-m>
+ <y-m>0.0300</y-m>
+ <z-m>0.8825</z-m>
+ <scale>2.5500</scale>
+ </marker>
</item>
<item>
<name>BARO REF</name>
<value>____SET(BOTH)</value>
- <condition>
- <equals>
- <property>modes/altimeter/std</property>
- <value>0</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>modes/altimeter/std</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.5000</x-m>
- <y-m>-0.2592</y-m>
- <z-m>0.4783</z-m>
- <scale>1.5333</scale>
- </marker>
+ <marker>
+ <x-m>4.5000</x-m>
+ <y-m>-0.2592</y-m>
+ <z-m>0.4783</z-m>
+ <scale>1.5333</scale>
+ </marker>
</item>
<item>
<name>MDA/DH</name>
<value>____SET(BOTH)</value>
- <marker>
- <x-m>4.5000</x-m>
- <y-m>-0.2592</y-m>
- <z-m>0.4783</z-m>
- <scale>1.5333</scale>
- </marker>
+ <marker>
+ <x-m>4.5000</x-m>
+ <y-m>-0.2592</y-m>
+ <z-m>0.4783</z-m>
+ <scale>1.5333</scale>
+ </marker>
</item>
<item>
<name>ENG MODE SEL</name>
<value>AS RQRD</value>
- <condition>
- <equals>
- <property>controls/engines/engine-start-switch</property>
- <value>1</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/engines/engine-start-switch</property>
- <value>1</value>
- </binding>
- <marker>
- <x-m>4.8617</x-m>
- <y-m>-0.0333</y-m>
- <z-m>-0.0708</z-m>
- <scale>2.0000</scale>
- </marker>
+ <marker>
+ <x-m>4.8617</x-m>
+ <y-m>-0.0333</y-m>
+ <z-m>-0.0708</z-m>
+ <scale>2.0000</scale>
+ </marker>
</item>
</checklist>
<checklist>
@@ -737,84 +337,22 @@ TODO: add conditions for not yet implemented stuff:
<item>
<name>A/THR</name>
<value>SPEED/OFF</value>
- <condition>
- <or>
- <equals>
- <property>modes/pfd/fma/throttle-mode</property>
- <value>SPEED</value>
- </equals>
- <equals>
- <property>modes/pfd/fma/throttle-mode</property>
- <value>SPEED</value>
- </equals>
- </or>
- </condition>
- <marker>
- <x-m>4.2525</x-m>
- <y-m>-0.6108</y-m>
- <z-m>0.2933</z-m>
- <scale>2.1167</scale>
- </marker>
+ <marker>
+ <x-m>4.2525</x-m>
+ <y-m>-0.6108</y-m>
+ <z-m>0.2933</z-m>
+ <scale>2.1167</scale>
+ </marker>
</item>
<item>
<name>ECAM MEMO</name>
<value>LDG NO BLUE</value>
- <condition>
- <and>
- <equals>
- <property>gear/gear/position-norm</property>
- <value>1</value>
- </equals>
- <equals>
- <property>gear/gear[1]/position-norm</property>
- <value>1</value>
- </equals>
- <equals>
- <property>gear/gear[2]/position-norm</property>
- <value>1</value>
- </equals>
- <equals>
- <property>controls/switches/seatbelt-sign</property>
- <value>true</value>
- </equals>
- <equals>
- <property>controls/switches/no-smoking-sign</property>
- <value>true</value>
- </equals>
- <equals>
- <property>controls/flight/speedbrake-arm</property>
- <value>1</value>
- </equals>
- <or>
- <and>
- <equals>
- <property>controls/flight/flap-lever</property>
- <value>4</value>
- </equals>
- <equals>
- <property>instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override</property>
- <value>0</value>
- </equals>
- </and>
- <and>
- <equals>
- <property>controls/flight/flap-lever</property>
- <value>3</value>
- </equals>
- <equals>
- <property>instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override</property>
- <value>1</value>
- </equals>
- </and>
- </or>
- </and>
- </condition>
- <marker>
- <x-m>4.6650</x-m>
- <y-m>-0.2308</y-m>
- <z-m>0.3975</z-m>
- <scale>1.7500</scale>
- </marker>
+ <marker>
+ <x-m>4.6650</x-m>
+ <y-m>-0.2308</y-m>
+ <z-m>0.3975</z-m>
+ <scale>1.7500</scale>
+ </marker>
</item>
</checklist>
<checklist>
@@ -822,80 +360,32 @@ TODO: add conditions for not yet implemented stuff:
<item>
<name>FLAPS</name>
<value>RETRACTED</value>
- <condition>
- <equals>
- <property>controls/flight/flap-pos</property>
- <value>0</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flap-lever</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flap-pos</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flap-txt</property>
- <value></value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/flaps</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.8950</x-m>
- <y-m>0.0683</y-m>
- <z-m>-0.0892</z-m>
- <scale>2.5500</scale>
- </marker>
+ <marker>
+ <x-m>4.8950</x-m>
+ <y-m>0.0683</y-m>
+ <z-m>-0.0892</z-m>
+ <scale>2.5500</scale>
+ </marker>
</item>
<item>
<name>SPOILERS</name>
<value>DISARMED</value>
- <condition>
- <and>
- <equals>
- <property>controls/flight/speedbrake</property>
- <value>0</value>
- </equals>
- <equals>
- <property>controls/flight/speedbrake-arm</property>
- <value>0</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/speedbrake</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/flight/speedbrake-arm</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.9083</x-m>
- <y-m>-0.0967</y-m>
- <z-m>-0.0833</z-m>
- <scale>2.3000</scale>
- </marker>
+ <marker>
+ <x-m>4.9083</x-m>
+ <y-m>-0.0967</y-m>
+ <z-m>-0.0833</z-m>
+ <scale>2.3000</scale>
+ </marker>
</item>
<item>
<name>APU</name>
<value>AS RQRD</value>
- <marker>
- <x-m>4.6817</x-m>
- <y-m>0.0000</y-m>
- <z-m>0.9017</z-m>
- <scale>2.6167</scale>
- </marker>
+ <marker>
+ <x-m>4.6817</x-m>
+ <y-m>0.0000</y-m>
+ <z-m>0.9017</z-m>
+ <scale>2.6167</scale>
+ </marker>
</item>
<item>
<name>TCAS</name>
@@ -915,65 +405,32 @@ TODO: add conditions for not yet implemented stuff:
<item>
<name>APU BLEED</name>
<value>ON</value>
- <marker>
- <x-m>4.7958</x-m>
- <y-m>-0.0091</y-m>
- <z-m>0.9375</z-m>
- <scale>1.6333</scale>
- </marker>
+ <marker>
+ <x-m>4.7958</x-m>
+ <y-m>-0.0091</y-m>
+ <z-m>0.9375</z-m>
+ <scale>1.6333</scale>
+ </marker>
</item>
<item>
<name>ENGINES</name>
<value>OFF</value>
- <condition>
- <and>
- <equals>
- <property>controls/engines/engine/cutoff-switch</property>
- <value>true</value>
- </equals>
- <equals>
- <property>controls/engines/engine[1]/cutoff-switch</property>
- <value>true</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/engines/engine/cutoff-switch</property>
- <value>true</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/engines/engine[1]/cutoff-switch</property>
- <value>true</value>
- </binding>
- <marker>
- <x-m>4.8592</x-m>
- <y-m>-0.0633</y-m>
- <z-m>0.0000</z-m>
- <scale>3.0000</scale>
- </marker>
+ <marker>
+ <x-m>4.8592</x-m>
+ <y-m>-0.0633</y-m>
+ <z-m>0.0000</z-m>
+ <scale>3.0000</scale>
+ </marker>
</item>
<item>
<name>SEAT BELTS</name>
<value>OFF</value>
- <condition>
- <equals>
- <property>controls/switches/seatbelt-sign</property>
- <value>false</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/switches/seatbelt-sign</property>
- <value>false</value>
- </binding>
- <marker>
- <x-m>4.6692</x-m>
- <y-m>0.0275</y-m>
- <z-m>0.8917</z-m>
- <scale>1.5500</scale>
- </marker>
+ <marker>
+ <x-m>4.6692</x-m>
+ <y-m>0.0275</y-m>
+ <z-m>0.8917</z-m>
+ <scale>1.5500</scale>
+ </marker>
</item>
<item>
<name>EXT LT</name>
@@ -982,91 +439,22 @@ TODO: add conditions for not yet implemented stuff:
<item>
<name>FUEL PUMPS</name>
<value>OFF</value>
- <condition>
- <and>
- <equals>
- <property>controls/fuel/tank0pump1</property>
- <value>0</value>
- </equals>
- <equals>
- <property>controls/fuel/tank0pump2</property>
- <value>0</value>
- </equals>
- <equals>
- <property>controls/fuel/tank1pump1</property>
- <value>0</value>
- </equals>
- <equals>
- <property>controls/fuel/tank1pump2</property>
- <value>0</value>
- </equals>
- <equals>
- <property>controls/fuel/tank2pump1</property>
- <value>0</value>
- </equals>
- <equals>
- <property>controls/fuel/tank2pump2</property>
- <value>0</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/fuel/tank0pump1</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/fuel/tank0pump2</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/fuel/tank1pump1</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/fuel/tank1pump2</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/fuel/tank2pump1</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/fuel/tank2pump2</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>5.0000</x-m>
- <y-m>-0.0300</y-m>
- <z-m>1.0017</z-m>
- <scale>2.6833</scale>
- </marker>
+ <marker>
+ <x-m>5.0000</x-m>
+ <y-m>-0.0300</y-m>
+ <z-m>1.0017</z-m>
+ <scale>2.6833</scale>
+ </marker>
</item>
<item>
<name>PARK BRK AND CHOCKS</name>
<value>AS RQRD</value>
- <condition>
- <equals>
- <property>controls/gear/brake-parking</property>
- <value>1</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/gear/brake-parking</property>
- <value>1</value>
- </binding>
- <marker>
- <x-m>5.0500</x-m>
- <y-m>-0.0325</y-m>
- <z-m>-0.0567</z-m>
- <scale>3.3667</scale>
- </marker>
+ <marker>
+ <x-m>5.0500</x-m>
+ <y-m>-0.0325</y-m>
+ <z-m>-0.0567</z-m>
+ <scale>3.3667</scale>
+ </marker>
</item>
</checklist>
<checklist>
@@ -1074,189 +462,56 @@ TODO: add conditions for not yet implemented stuff:
<item>
<name>ADIRS</name>
<value>OFF</value>
- <condition>
- <and>
- <equals>
- <property>controls/adirs/ir/knob</property>
- <value>0</value>
- </equals>
- <equals>
- <property>controls/adirs/ir[1]/knob</property>
- <value>0</value>
- </equals>
- <equals>
- <property>controls/adirs/ir[2]/knob</property>
- <value>0</value>
- </equals>
- <equals>
- <property>controls/adirs/adr/off</property>
- <value>true</value>
- </equals>
- <equals>
- <property>controls/adirs/adr[1]/off</property>
- <value>true</value>
- </equals>
- <equals>
- <property>controls/adirs/adr[2]/off</property>
- <value>true</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/adirs/ir/knob</property>
- <value>1</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/adirs/ir[1]/knob</property>
- <value>1</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/adirs/ir[2]/knob</property>
- <value>1</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/adirs/adr/off</property>
- <value>true</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/adirs/adr[1]/off</property>
- <value>true</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/adirs/adr[2]/off</property>
- <value>true</value>
- </binding>
- <marker>
- <x-m>5.1067</x-m>
- <y-m>-0.2625</y-m>
- <z-m>1.0325</z-m>
- <scale>4.5500</scale>
- </marker>
+ <marker>
+ <x-m>5.1067</x-m>
+ <y-m>-0.2625</y-m>
+ <z-m>1.0325</z-m>
+ <scale>4.5500</scale>
+ </marker>
</item>
<item>
<name>OXYGEN</name>
<value>OFF</value>
- <condition>
- <equals>
- <property>controls/oxygen/crewOxyPB</property>
- <value>0</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/oxygen/crewOxyPB</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.7958</x-m>
- <y-m>-0.2041</y-m>
- <z-m>0.9242</z-m>
- <scale>1.6333</scale>
- </marker>
+ <marker>
+ <x-m>4.7958</x-m>
+ <y-m>-0.2041</y-m>
+ <z-m>0.9242</z-m>
+ <scale>1.6333</scale>
+ </marker>
</item>
<item>
<name>APU BLEED</name>
<value>OFF</value>
- <condition>
- <equals>
- <property>systems/pneumatic/bleedapu</property>
- <value>0</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/pneumatic/switches/bleedapu</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.7958</x-m>
- <y-m>-0.0091</y-m>
- <z-m>0.9375</z-m>
- <scale>1.6333</scale>
- </marker>
+ <marker>
+ <x-m>4.7958</x-m>
+ <y-m>-0.0091</y-m>
+ <z-m>0.9375</z-m>
+ <scale>1.6333</scale>
+ </marker>
</item>
<item>
<name>EMER EXIT LT</name>
<value>OFF</value>
- <condition>
- <equals>
- <property>controls/switches/emer-lights</property>
- <value>0</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/switches/emer-lights</property>
- <value>0</value>
- </binding>
</item>
<item>
<name>SIGNS</name>
<value>OFF</value>
- <condition>
- <equals>
- <property>controls/switches/no-smoking-sign</property>
- <value>false</value>
- </equals>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/switches/no-smoking-sign</property>
- <value>false</value>
- </binding>
- <marker>
- <x-m>4.6958</x-m>
- <y-m>0.0275</y-m>
- <z-m>0.8775</z-m>
- <scale>1.4000</scale>
- </marker>
+ <marker>
+ <x-m>4.6958</x-m>
+ <y-m>0.0275</y-m>
+ <z-m>0.8775</z-m>
+ <scale>1.4000</scale>
+ </marker>
</item>
<item>
<name>APU AND BAT</name>
<value>OFF</value>
- <condition>
- <and>
- <equals>
- <property>controls/APU/master</property>
- <value>false</value>
- </equals>
- <equals>
- <property>systems/electrical/battery1-amps</property>
- <value>0</value>
- </equals>
- <equals>
- <property>systems/electrical/battery2-amps</property>
- <value>0</value>
- </equals>
- </and>
- </condition>
- <binding>
- <command>property-assign</command>
- <property>controls/APU/master</property>
- <value>false</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/electrical/switches/battery1</property>
- <value>0</value>
- </binding>
- <binding>
- <command>property-assign</command>
- <property>controls/electrical/switches/battery2</property>
- <value>0</value>
- </binding>
- <marker>
- <x-m>4.7175</x-m>
- <y-m>-0.0225</y-m>
- <z-m>0.8958</z-m>
- <scale>1.4000</scale>
- </marker>
+ <marker>
+ <x-m>4.7175</x-m>
+ <y-m>-0.0225</y-m>
+ <z-m>0.8958</z-m>
+ <scale>1.4000</scale>
+ </marker>
</item>
</checklist>
</PropertyList>
diff --git a/AircraftConfig/about.xml b/AircraftConfig/about.xml
index 434ff3c9..ed5952b0 100644
--- a/AircraftConfig/about.xml
+++ b/AircraftConfig/about.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/ac_init.xml b/AircraftConfig/ac_init.xml
index 1815978a..8578b9ed 100644
--- a/AircraftConfig/ac_init.xml
+++ b/AircraftConfig/ac_init.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 1d75e514..a8ca0464 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -1,9 +1,7 @@
# Aircraft Config Center
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var spinning = maketimer(0.05, func {
var spinning = getprop("/systems/acconfig/spinning");
diff --git a/AircraftConfig/announce.xml b/AircraftConfig/announce.xml
index fc77f4cd..d05d0713 100644
--- a/AircraftConfig/announce.xml
+++ b/AircraftConfig/announce.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/du-quality.xml b/AircraftConfig/du-quality.xml
index 8b60725d..c795498e 100644
--- a/AircraftConfig/du-quality.xml
+++ b/AircraftConfig/du-quality.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/error-mismatch.xml b/AircraftConfig/error-mismatch.xml
index 3807b0b3..a1607bde 100644
--- a/AircraftConfig/error-mismatch.xml
+++ b/AircraftConfig/error-mismatch.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
@@ -16,7 +12,7 @@
<red>0.5</red>
<green>0</green>
<blue>0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
<group>
@@ -32,7 +28,7 @@
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
</hrule>
@@ -53,7 +49,7 @@
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
</hrule>
@@ -95,7 +91,7 @@
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
</hrule>
@@ -106,7 +102,7 @@
<red>0.6</red>
<green>0</green>
<blue>0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
<halign>center</halign>
<legend>FlightGear Forums</legend>
diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml
index 6fddc370..c85b3bca 100644
--- a/AircraftConfig/fail.xml
+++ b/AircraftConfig/fail.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/fbw.xml b/AircraftConfig/fbw.xml
index 167de43e..02fcce72 100644
--- a/AircraftConfig/fbw.xml
+++ b/AircraftConfig/fbw.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml
index b9ed9875..aa068c77 100644
--- a/AircraftConfig/groundservices.xml
+++ b/AircraftConfig/groundservices.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/help.xml b/AircraftConfig/help.xml
index d06618dc..46e4595f 100644
--- a/AircraftConfig/help.xml
+++ b/AircraftConfig/help.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml
index 09746ced..75079a04 100644
--- a/AircraftConfig/main.xml
+++ b/AircraftConfig/main.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/psload.xml b/AircraftConfig/psload.xml
index 629fce40..67339ca0 100644
--- a/AircraftConfig/psload.xml
+++ b/AircraftConfig/psload.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/psloaded.xml b/AircraftConfig/psloaded.xml
index 34fe6432..5210f551 100644
--- a/AircraftConfig/psloaded.xml
+++ b/AircraftConfig/psloaded.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/AircraftConfig/update.xml b/AircraftConfig/update.xml
index 6f5dfef3..a8f0841b 100644
--- a/AircraftConfig/update.xml
+++ b/AircraftConfig/update.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
@@ -16,7 +12,7 @@
<red>0.5</red>
<green>0</green>
<blue>0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
<group>
@@ -32,7 +28,7 @@
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
</hrule>
@@ -40,19 +36,60 @@
<layout>vbox</layout>
<text>
- <halign>center</halign>
+ <halign>left</halign>
<label>Attention: Your IDG-A32X is out of date! This means you are missing out on bugfixes, and new features!</label>
</text>
+
+ <group>
+ <layout>table</layout>
+ <halign>left</halign>
+
+ <text>
+ <row>0</row>
+ <col>0</col>
+ <halign>left</halign>
+ <label>Latest available revision:</label>
+ </text>
+
+ <text>
+ <row>0</row>
+ <col>1</col>
+ <halign>left</halign>
+ <border>1</border>
+ <label>99999</label>
+ <property>/systems/acconfig/new-revision</property>
+ <live>1</live>
+ </text>
+
+ <text>
+ <row>1</row>
+ <col>0</col>
+ <halign>left</halign>
+ <label>Current installed revision:</label>
+ </text>
+
+ <text>
+ <row>1</row>
+ <col>1</col>
+ <halign>left</halign>
+ <border>1</border>
+ <label>99999</label>
+ <property>/systems/acconfig/revision</property>
+ <live>1</live>
+ </text>
+
+ </group>
+
<text>
- <halign>center</halign>
+ <halign>left</halign>
<label>You can continue for now, but it is highly recommended to download the latest version by the button below.</label>
</text>
<text>
- <halign>center</halign>
+ <halign>left</halign>
<label>You will need to restart FlightGear, and install the latest .zip file.</label>
</text>
<text>
- <halign>center</halign>
+ <halign>left</halign>
<label>GIT users: Please press Remind Me Later, and run a "git pull" command. (or pull using GIT GUI)</label>
</text>
</group>
@@ -62,7 +99,7 @@
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
</hrule>
@@ -74,7 +111,7 @@
<red>0</red>
<green>0.5</green>
<blue>0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
<halign>center</halign>
<legend>Download Update</legend>
@@ -95,7 +132,7 @@
<red>0.6</red>
<green>0</green>
<blue>0</blue>
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
</color>
<halign>center</halign>
<legend>Remind Me Later</legend>
diff --git a/AircraftConfig/updated.xml b/AircraftConfig/updated.xml
index e218cdf9..9ae8a8b8 100644
--- a/AircraftConfig/updated.xml
+++ b/AircraftConfig/updated.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
@@ -47,14 +43,14 @@
<text>
<halign>left</halign>
- <label>You are now running Revision: </label>
+ <label>You have been upgraded to revision:</label>
</text>
<text>
<halign>left</halign>
<border>1</border>
<label>99999</label>
- <property>/systems/acconfig/options/revision</property>
+ <property>/systems/acconfig/revision</property>
<live>1</live>
</text>
diff --git a/AircraftConfig/welcome.xml b/AircraftConfig/welcome.xml
index 7b303da6..c7b9887b 100644
--- a/AircraftConfig/welcome.xml
+++ b/AircraftConfig/welcome.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Aircraft Config Dialog -->
diff --git a/Engines/cfm56_5a1_1.xml b/Engines/cfm56_5a1_1.xml
index 3e6d1eb7..c570469b 100644
--- a/Engines/cfm56_5a1_1.xml
+++ b/Engines/cfm56_5a1_1.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="CFM56_5A1">
diff --git a/Engines/cfm56_5a1_2.xml b/Engines/cfm56_5a1_2.xml
index acfa8b71..1ef4c840 100644
--- a/Engines/cfm56_5a1_2.xml
+++ b/Engines/cfm56_5a1_2.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="CFM56_5A1">
diff --git a/Engines/cfm56_5b4_1.xml b/Engines/cfm56_5b4_1.xml
index 48139e8a..f2fb4e08 100644
--- a/Engines/cfm56_5b4_1.xml
+++ b/Engines/cfm56_5b4_1.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="CFM56_5B4">
diff --git a/Engines/cfm56_5b4_2.xml b/Engines/cfm56_5b4_2.xml
index 9ff26da9..13b0a478 100644
--- a/Engines/cfm56_5b4_2.xml
+++ b/Engines/cfm56_5b4_2.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="CFM56_5B4">
diff --git a/Engines/direct.xml b/Engines/direct.xml
index 05119361..17a74b41 100644
--- a/Engines/direct.xml
+++ b/Engines/direct.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<direct name="Direct">
</direct>
diff --git a/Engines/leap1a26_1.xml b/Engines/leap1a26_1.xml
index 05477ba7..78d27989 100644
--- a/Engines/leap1a26_1.xml
+++ b/Engines/leap1a26_1.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="LEAP1A26">
diff --git a/Engines/leap1a26_2.xml b/Engines/leap1a26_2.xml
index 2ab51019..86719783 100644
--- a/Engines/leap1a26_2.xml
+++ b/Engines/leap1a26_2.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="LEAP1A26">
diff --git a/Engines/pw1127g_1.xml b/Engines/pw1127g_1.xml
index 8d13b325..3a3d5702 100644
--- a/Engines/pw1127g_1.xml
+++ b/Engines/pw1127g_1.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="PW1127G">
diff --git a/Engines/pw1127g_2.xml b/Engines/pw1127g_2.xml
index 6dfae068..5527372c 100644
--- a/Engines/pw1127g_2.xml
+++ b/Engines/pw1127g_2.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="PW1127G">
diff --git a/Engines/v2527_a5_1.xml b/Engines/v2527_a5_1.xml
index 074cecc2..9123d87b 100644
--- a/Engines/v2527_a5_1.xml
+++ b/Engines/v2527_a5_1.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="V2527_A5">
diff --git a/Engines/v2527_a5_2.xml b/Engines/v2527_a5_2.xml
index 2810b1bd..89f3d0bb 100644
--- a/Engines/v2527_a5_2.xml
+++ b/Engines/v2527_a5_2.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<turbine_engine name="V2527_A5">
diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml
index 8b4889bd..8b9ac4c6 100644
--- a/Models/A320-100-CFM.xml
+++ b/Models/A320-100-CFM.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<name>A320-100</name>
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index e98b8c21..39d625e0 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<name>A320-200</name>
diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml
index 017b751d..6d717738 100644
--- a/Models/A320-200-IAE.xml
+++ b/Models/A320-200-IAE.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<name>A320-200</name>
diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml
index 2197419a..e292ee52 100644
--- a/Models/A320neo-CFM.xml
+++ b/Models/A320neo-CFM.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<name>A320-200</name>
diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml
index 964be1eb..c28bed59 100644
--- a/Models/A320neo-PW.xml
+++ b/Models/A320neo-PW.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<name>A320-200</name>
diff --git a/Models/Effects/contrail-eng1.xml b/Models/Effects/contrail-eng1.xml
index 42937853..6e9dec53 100644
--- a/Models/Effects/contrail-eng1.xml
+++ b/Models/Effects/contrail-eng1.xml
@@ -1,161 +1,157 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
- <particlesystem>
- <name>smoke</name>
- <texture>res/smoke.png</texture>
- <offsets>
- <x-m>30</x-m>
- <y-m>0.00</y-m>
- <z-m>2</z-m>
- <pitch-deg>90</pitch-deg>
- </offsets>
+
+ <particlesystem>
+ <name>contrail-eng1</name>
+ <texture>res/smoke.png</texture>
+ <offsets>
+ <x-m>30</x-m>
+ <y-m>0.00</y-m>
+ <z-m>2</z-m>
+ <pitch-deg>90</pitch-deg>
+ </offsets>
+ <emissive type="bool">false</emissive>
+ <lighting type="bool">false</lighting>
+ <condition>
+ <and>
+ <greater-than>
+ <property>engines/engine[0]/n2-actual</property>
+ <value>50</value>
+ </greater-than>
+ <greater-than>
+ <property>/position/altitude-ft</property>
+ <value>19000</value>
+ </greater-than>
+ <less-than>
+ <property>environment/temperature-degc</property>
+ <value>-30</value>
+ </less-than>
+ <equals>
+ <property>engines/engine[0]/state</property>
+ <value>3</value>
+ </equals>
+ </and>
+ </condition>
+
+ <attach>world</attach>
+
+ <placer>
+ <type>point</type>
+ </placer>
+
+ <shooter>
+ <theta-min-deg>-1.5</theta-min-deg>
+ <theta-max-deg>1.5</theta-max-deg>
+ <phi-min-deg>-1.5</phi-min-deg>
+ <phi-max-deg>1.5</phi-max-deg>
+ <speed-mps>
+ <value>0</value>
+ <spread>0</spread>
+ </speed-mps>
+ <rotation-speed>
+ <x-min-deg-sec>0</x-min-deg-sec>
+ <y-min-deg-sec>0</y-min-deg-sec>
+ <z-min-deg-sec>0</z-min-deg-sec>
+ <x-max-deg-sec>0</x-max-deg-sec>
+ <y-max-deg-sec>0</y-max-deg-sec>
+ <z-max-deg-sec>0</z-max-deg-sec>
+ </rotation-speed>
+ </shooter>
+
+ <counter>
+ <particles-per-sec>
+ <value>50</value>
+ <spread>0</spread>
+ </particles-per-sec>
+ </counter>
+
+ <align>billboard</align>
+
+ <particle>
+ <start>
+ <color>
+ <red>
+ <expression>
+ <product>
+ <value>0.7</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </red>
+ <green>
+ <expression>
+ <product>
+ <value>0.7</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </green>
+ <blue>
+ <expression>
+ <product>
+ <value>0.7</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </blue>
+ <alpha>
+ <value>0.3</value>
+ </alpha>
+ </color>
+ <size>
+ <value>2</value>
+ </size>
+ </start>
- <emissive type="bool">false</emissive>
- <lighting type="bool">false</lighting>
+ <end>
+ <color>
+ <red>
+ <expression>
+ <product>
+ <value>1.0</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </red>
+ <green>
+ <expression>
+ <product>
+ <value>1.0</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </green>
+ <blue>
+ <expression>
+ <product>
+ <value>1.0</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </blue>
+ <alpha>
+ <value>0.00000001</value>
+ </alpha>
+ </color>
+ <size>
+ <value>6</value>
+ </size>
+ </end>
- <condition>
- <and>
- <greater-than>
- <property>engines/engine[0]/n2</property>
- <value>50</value>
- </greater-than>
- <greater-than>
- <property>position/altitude-ft</property>
- <value>19000</value>
- </greater-than>
- <less-than>
- <property>environment/temperature-degc</property>
- <value>-40</value>
- </less-than>
- </and>
- </condition>
+ <life-sec>
+ <value>10</value>
+ </life-sec>
- <attach>world</attach>
+ <mass-kg>0.5</mass-kg>
+ <radius-m>0.5</radius-m>
+ </particle>
- <placer>
- <type>point</type>
- </placer>
-
- <shooter>
- <theta-min-deg>-1.5</theta-min-deg>
- <theta-max-deg>1.5</theta-max-deg>
- <phi-min-deg>-1.5</phi-min-deg>
- <phi-max-deg>1.5</phi-max-deg>
- <speed-mps>
- <value>0</value>
- <spread>0</spread>
- </speed-mps>
- <rotation-speed>
- <x-min-deg-sec>0</x-min-deg-sec>
- <y-min-deg-sec>0</y-min-deg-sec>
- <z-min-deg-sec>0</z-min-deg-sec>
- <x-max-deg-sec>0</x-max-deg-sec>
- <y-max-deg-sec>0</y-max-deg-sec>
- <z-max-deg-sec>0</z-max-deg-sec>
- </rotation-speed>
- </shooter>
-
- <counter>
- <particles-per-sec>
- <value>35</value>
- <spread>0</spread>
- </particles-per-sec>
- </counter>
-
- <align>billboard</align>
-
- <particle>
- <start>
- <color>
- <red>
- <expression>
- <product>
- <value>0.7</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </red>
- <green>
- <expression>
- <product>
- <value>0.7</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </green>
- <blue>
- <expression>
- <product>
- <value>0.7</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </blue>
- <alpha>
- <value>0.3</value>
- </alpha>
- </color>
- <size>
- <value>2</value>
- </size>
- </start>
-
- <end>
- <color>
- <red>
- <expression>
- <product>
- <value>1.0</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </red>
- <green>
- <expression>
- <product>
- <value>1.0</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </green>
- <blue>
- <expression>
- <product>
- <value>1.0</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </blue>
- <alpha>
- <value>0.00000001</value>
- </alpha>
- </color>
- <size>
- <value>6</value>
- </size>
- </end>
-
- <life-sec>
- <value>10</value>
- </life-sec>
-
- <mass-kg> 0.5 </mass-kg>
- <radius-m> 0.5 </radius-m>
- </particle>
-
- <program>
- <fluid> air </fluid>
- <gravity type="bool"> true </gravity>
- <wind typ="bool"> true </wind>
- </program>
-
- </particlesystem>
+ <program>
+ <fluid>air</fluid>
+ <gravity type="bool">true</gravity>
+ <wind typ="bool">true</wind>
+ </program>
+ </particlesystem>
</PropertyList>
diff --git a/Models/Effects/contrail-eng2.xml b/Models/Effects/contrail-eng2.xml
index b032572a..f08d60a0 100644
--- a/Models/Effects/contrail-eng2.xml
+++ b/Models/Effects/contrail-eng2.xml
@@ -1,161 +1,157 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
- <particlesystem>
- <name>smoke</name>
- <texture>res/smoke.png</texture>
- <offsets>
- <x-m>30</x-m>
- <y-m>0.00</y-m>
- <z-m>2</z-m>
- <pitch-deg>90</pitch-deg>
- </offsets>
+
+ <particlesystem>
+ <name>contrail-eng2</name>
+ <texture>res/smoke.png</texture>
+ <offsets>
+ <x-m>30</x-m>
+ <y-m>0.00</y-m>
+ <z-m>2</z-m>
+ <pitch-deg>90</pitch-deg>
+ </offsets>
+ <emissive type="bool">false</emissive>
+ <lighting type="bool">false</lighting>
+ <condition>
+ <and>
+ <greater-than>
+ <property>engines/engine[1]/n2-actual</property>
+ <value>50</value>
+ </greater-than>
+ <greater-than>
+ <property>/position/altitude-ft</property>
+ <value>19000</value>
+ </greater-than>
+ <less-than>
+ <property>environment/temperature-degc</property>
+ <value>-30</value>
+ </less-than>
+ <equals>
+ <property>engines/engine[1]/state</property>
+ <value>3</value>
+ </equals>
+ </and>
+ </condition>
+
+ <attach>world</attach>
+
+ <placer>
+ <type>point</type>
+ </placer>
+
+ <shooter>
+ <theta-min-deg>-1.5</theta-min-deg>
+ <theta-max-deg>1.5</theta-max-deg>
+ <phi-min-deg>-1.5</phi-min-deg>
+ <phi-max-deg>1.5</phi-max-deg>
+ <speed-mps>
+ <value>0</value>
+ <spread>0</spread>
+ </speed-mps>
+ <rotation-speed>
+ <x-min-deg-sec>0</x-min-deg-sec>
+ <y-min-deg-sec>0</y-min-deg-sec>
+ <z-min-deg-sec>0</z-min-deg-sec>
+ <x-max-deg-sec>0</x-max-deg-sec>
+ <y-max-deg-sec>0</y-max-deg-sec>
+ <z-max-deg-sec>0</z-max-deg-sec>
+ </rotation-speed>
+ </shooter>
+
+ <counter>
+ <particles-per-sec>
+ <value>50</value>
+ <spread>0</spread>
+ </particles-per-sec>
+ </counter>
+
+ <align>billboard</align>
+
+ <particle>
+ <start>
+ <color>
+ <red>
+ <expression>
+ <product>
+ <value>0.7</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </red>
+ <green>
+ <expression>
+ <product>
+ <value>0.7</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </green>
+ <blue>
+ <expression>
+ <product>
+ <value>0.7</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </blue>
+ <alpha>
+ <value>0.3</value>
+ </alpha>
+ </color>
+ <size>
+ <value>2</value>
+ </size>
+ </start>
- <emissive type="bool">false</emissive>
- <lighting type="bool">false</lighting>
+ <end>
+ <color>
+ <red>
+ <expression>
+ <product>
+ <value>1.0</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </red>
+ <green>
+ <expression>
+ <product>
+ <value>1.0</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </green>
+ <blue>
+ <expression>
+ <product>
+ <value>1.0</value>
+ <property>rendering/scene/diffuse/red</property>
+ </product>
+ </expression>
+ </blue>
+ <alpha>
+ <value>0.00000001</value>
+ </alpha>
+ </color>
+ <size>
+ <value>6</value>
+ </size>
+ </end>
- <condition>
- <and>
- <greater-than>
- <property>engines/engine[1]/n2</property>
- <value>50</value>
- </greater-than>
- <greater-than>
- <property>position/altitude-ft</property>
- <value>19000</value>
- </greater-than>
- <less-than>
- <property>environment/temperature-degc</property>
- <value>-40</value>
- </less-than>
- </and>
- </condition>
+ <life-sec>
+ <value>10</value>
+ </life-sec>
- <attach>world</attach>
+ <mass-kg>0.5</mass-kg>
+ <radius-m>0.5</radius-m>
+ </particle>
- <placer>
- <type>point</type>
- </placer>
-
- <shooter>
- <theta-min-deg>-1.5</theta-min-deg>
- <theta-max-deg>1.5</theta-max-deg>
- <phi-min-deg>-1.5</phi-min-deg>
- <phi-max-deg>1.5</phi-max-deg>
- <speed-mps>
- <value>0</value>
- <spread>0</spread>
- </speed-mps>
- <rotation-speed>
- <x-min-deg-sec>0</x-min-deg-sec>
- <y-min-deg-sec>0</y-min-deg-sec>
- <z-min-deg-sec>0</z-min-deg-sec>
- <x-max-deg-sec>0</x-max-deg-sec>
- <y-max-deg-sec>0</y-max-deg-sec>
- <z-max-deg-sec>0</z-max-deg-sec>
- </rotation-speed>
- </shooter>
-
- <counter>
- <particles-per-sec>
- <value>35</value>
- <spread>0</spread>
- </particles-per-sec>
- </counter>
-
- <align>billboard</align>
-
- <particle>
- <start>
- <color>
- <red>
- <expression>
- <product>
- <value>0.7</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </red>
- <green>
- <expression>
- <product>
- <value>0.7</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </green>
- <blue>
- <expression>
- <product>
- <value>0.7</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </blue>
- <alpha>
- <value>0.3</value>
- </alpha>
- </color>
- <size>
- <value>2</value>
- </size>
- </start>
-
- <end>
- <color>
- <red>
- <expression>
- <product>
- <value>1.0</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </red>
- <green>
- <expression>
- <product>
- <value>1.0</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </green>
- <blue>
- <expression>
- <product>
- <value>1.0</value>
- <property>rendering/scene/diffuse/red</property>
- </product>
- </expression>
- </blue>
- <alpha>
- <value>0.00000001</value>
- </alpha>
- </color>
- <size>
- <value>6</value>
- </size>
- </end>
-
- <life-sec>
- <value>10</value>
- </life-sec>
-
- <mass-kg> 0.5 </mass-kg>
- <radius-m> 0.5 </radius-m>
- </particle>
-
- <program>
- <fluid> air </fluid>
- <gravity type="bool"> true </gravity>
- <wind typ="bool"> true </wind>
- </program>
-
- </particlesystem>
+ <program>
+ <fluid>air</fluid>
+ <gravity type="bool">true</gravity>
+ <wind typ="bool">true</wind>
+ </program>
+ </particlesystem>
</PropertyList>
diff --git a/Models/Effects/enginefire.xml b/Models/Effects/enginefire.xml
index ed169eeb..a41450cf 100644
--- a/Models/Effects/enginefire.xml
+++ b/Models/Effects/enginefire.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Effects/sparks.xml b/Models/Effects/sparks.xml
index dea6f1c5..89d4a819 100644
--- a/Models/Effects/sparks.xml
+++ b/Models/Effects/sparks.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Effects/tire-smoke-left.xml b/Models/Effects/tire-smoke-left.xml
index 5566c972..8b402092 100644
--- a/Models/Effects/tire-smoke-left.xml
+++ b/Models/Effects/tire-smoke-left.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Effects/tire-smoke-nose.xml b/Models/Effects/tire-smoke-nose.xml
index ee65b0ea..f281083a 100644
--- a/Models/Effects/tire-smoke-nose.xml
+++ b/Models/Effects/tire-smoke-nose.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Effects/tire-smoke-right.xml b/Models/Effects/tire-smoke-right.xml
index eafb8892..b21e0eea 100644
--- a/Models/Effects/tire-smoke-right.xml
+++ b/Models/Effects/tire-smoke-right.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Effects/wet-runway-nose.xml b/Models/Effects/wet-runway-nose.xml
index 43899b14..11f7eacd 100644
--- a/Models/Effects/wet-runway-nose.xml
+++ b/Models/Effects/wet-runway-nose.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Effects/wet-runway.xml b/Models/Effects/wet-runway.xml
index 340d646e..996d2ec0 100644
--- a/Models/Effects/wet-runway.xml
+++ b/Models/Effects/wet-runway.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/NEO/LeapXLeft.xml b/Models/Engines/NEO/LeapXLeft.xml
index 1aa8d509..52da1ec5 100644
--- a/Models/Engines/NEO/LeapXLeft.xml
+++ b/Models/Engines/NEO/LeapXLeft.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/NEO/LeapXRight.xml b/Models/Engines/NEO/LeapXRight.xml
index 9b674bb3..cee10f22 100644
--- a/Models/Engines/NEO/LeapXRight.xml
+++ b/Models/Engines/NEO/LeapXRight.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/NEO/PW1100GLeft.xml b/Models/Engines/NEO/PW1100GLeft.xml
index f8085641..67d59996 100644
--- a/Models/Engines/NEO/PW1100GLeft.xml
+++ b/Models/Engines/NEO/PW1100GLeft.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/NEO/PW1100GRight.xml b/Models/Engines/NEO/PW1100GRight.xml
index 4d3efb88..fc879f87 100644
--- a/Models/Engines/NEO/PW1100GRight.xml
+++ b/Models/Engines/NEO/PW1100GRight.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.cfm.xml b/Models/Engines/XMLs/a320.cfm.xml
index 84c25660..98c1956e 100644
--- a/Models/Engines/XMLs/a320.cfm.xml
+++ b/Models/Engines/XMLs/a320.cfm.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<path>../Models/cfm56.ac</path>
diff --git a/Models/Engines/XMLs/a320.engine.cfm.left.xml b/Models/Engines/XMLs/a320.engine.cfm.left.xml
index 58bed448..14dad651 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.left.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.left.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.engine.cfm.right.xml b/Models/Engines/XMLs/a320.engine.cfm.right.xml
index ee5ef2d6..aa35c0bb 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.right.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.right.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml
index 9d875cc9..97461a8e 100644
--- a/Models/Engines/XMLs/a320.engine.iae.left.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.left.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml
index 6ade4773..93ade12a 100644
--- a/Models/Engines/XMLs/a320.engine.iae.right.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.right.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.nacelle.cfm.xml b/Models/Engines/XMLs/a320.nacelle.cfm.xml
index 9c81b944..4c408bdb 100644
--- a/Models/Engines/XMLs/a320.nacelle.cfm.xml
+++ b/Models/Engines/XMLs/a320.nacelle.cfm.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.nacelle.iae.left.xml b/Models/Engines/XMLs/a320.nacelle.iae.left.xml
index 54351f29..a7de8abe 100644
--- a/Models/Engines/XMLs/a320.nacelle.iae.left.xml
+++ b/Models/Engines/XMLs/a320.nacelle.iae.left.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.nacelle.iae.right.xml b/Models/Engines/XMLs/a320.nacelle.iae.right.xml
index 2a3462d5..aea36b99 100644
--- a/Models/Engines/XMLs/a320.nacelle.iae.right.xml
+++ b/Models/Engines/XMLs/a320.nacelle.iae.right.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.pylon.cfm.left.xml b/Models/Engines/XMLs/a320.pylon.cfm.left.xml
index 37022d32..358c8e8b 100644
--- a/Models/Engines/XMLs/a320.pylon.cfm.left.xml
+++ b/Models/Engines/XMLs/a320.pylon.cfm.left.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.pylon.cfm.right.xml b/Models/Engines/XMLs/a320.pylon.cfm.right.xml
index 8bfdb030..b785a782 100644
--- a/Models/Engines/XMLs/a320.pylon.cfm.right.xml
+++ b/Models/Engines/XMLs/a320.pylon.cfm.right.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.pylon.iae.left.xml b/Models/Engines/XMLs/a320.pylon.iae.left.xml
index 00a398b5..c6952d97 100644
--- a/Models/Engines/XMLs/a320.pylon.iae.left.xml
+++ b/Models/Engines/XMLs/a320.pylon.iae.left.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.pylon.iae.right.xml b/Models/Engines/XMLs/a320.pylon.iae.right.xml
index cf75be40..1348bb05 100644
--- a/Models/Engines/XMLs/a320.pylon.iae.right.xml
+++ b/Models/Engines/XMLs/a320.pylon.iae.right.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Engines/XMLs/a320.v2500.xml b/Models/Engines/XMLs/a320.v2500.xml
index cf907faf..333ec9eb 100644
--- a/Models/Engines/XMLs/a320.v2500.xml
+++ b/Models/Engines/XMLs/a320.v2500.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<path>../Models/v2500.ac</path>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index a9ac60b1..4f7dd0dc 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Fuselages/A320-100/fuselage.xml b/Models/Fuselages/A320-100/fuselage.xml
index 67ca7d64..a836e2d3 100644
--- a/Models/Fuselages/A320-100/fuselage.xml
+++ b/Models/Fuselages/A320-100/fuselage.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<name>Fuselage</name>
diff --git a/Models/Fuselages/A320-100/hstab.xml b/Models/Fuselages/A320-100/hstab.xml
index 6f5e48ff..354443d2 100644
--- a/Models/Fuselages/A320-100/hstab.xml
+++ b/Models/Fuselages/A320-100/hstab.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Fuselages/A320-100/vstab.xml b/Models/Fuselages/A320-100/vstab.xml
index 90cc9ff6..e38df962 100644
--- a/Models/Fuselages/A320-100/vstab.xml
+++ b/Models/Fuselages/A320-100/vstab.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Fuselages/A320/fuselage.xml b/Models/Fuselages/A320/fuselage.xml
index 67ca7d64..a836e2d3 100644
--- a/Models/Fuselages/A320/fuselage.xml
+++ b/Models/Fuselages/A320/fuselage.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<name>Fuselage</name>
diff --git a/Models/Fuselages/A320/hstab.xml b/Models/Fuselages/A320/hstab.xml
index 6f5e48ff..354443d2 100644
--- a/Models/Fuselages/A320/hstab.xml
+++ b/Models/Fuselages/A320/hstab.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Fuselages/A320/vstab.xml b/Models/Fuselages/A320/vstab.xml
index 90cc9ff6..e38df962 100644
--- a/Models/Fuselages/A320/vstab.xml
+++ b/Models/Fuselages/A320/vstab.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Fuselages/A320neo/fuselage.xml b/Models/Fuselages/A320neo/fuselage.xml
index 67ca7d64..a836e2d3 100644
--- a/Models/Fuselages/A320neo/fuselage.xml
+++ b/Models/Fuselages/A320neo/fuselage.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<name>Fuselage</name>
diff --git a/Models/Fuselages/A320neo/hstab.xml b/Models/Fuselages/A320neo/hstab.xml
index 6f5e48ff..354443d2 100644
--- a/Models/Fuselages/A320neo/hstab.xml
+++ b/Models/Fuselages/A320neo/hstab.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Fuselages/A320neo/vstab.xml b/Models/Fuselages/A320neo/vstab.xml
index 90cc9ff6..e38df962 100644
--- a/Models/Fuselages/A320neo/vstab.xml
+++ b/Models/Fuselages/A320neo/vstab.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/ATC/ATC.xml b/Models/Instruments/ATC/ATC.xml
index f445b402..4ed7fafc 100644
--- a/Models/Instruments/ATC/ATC.xml
+++ b/Models/Instruments/ATC/ATC.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/Brakes/Brakes.xml b/Models/Instruments/Brakes/Brakes.xml
index 1f3a2a38..2c557f57 100644
--- a/Models/Instruments/Brakes/Brakes.xml
+++ b/Models/Instruments/Brakes/Brakes.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- Brakes Pressure Indicator -->
diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas
index bf58e721..a1706c93 100644
--- a/Models/Instruments/IESI/IESI.nas
+++ b/Models/Instruments/IESI/IESI.nas
@@ -1,9 +1,6 @@
# A3XX IESI
-# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var IESI = nil;
var IESI_display = nil;
@@ -233,5 +230,5 @@ var roundabout = func(x) {
var roundaboutAlt = func(x) {
var y = x * 0.2 - int(x * 0.2);
- return y < 0.5 ? 5 * int(x*0.2) : 5 + 5 * int(x*0.2);
+ return y < 0.5 ? 5 * int(x * 0.2) : 5 + 5 * int(x * 0.2);
};
diff --git a/Models/Instruments/IESI/IESI.xml b/Models/Instruments/IESI/IESI.xml
index b5cf5238..a4f531d6 100644
--- a/Models/Instruments/IESI/IESI.xml
+++ b/Models/Instruments/IESI/IESI.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
index 776ab9db..af9c8165 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
@@ -1,9 +1,6 @@
# A3XX Lower ECAM Canvas
-# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var lowerECAM_apu = nil;
var lowerECAM_bleed = nil;
diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.xml b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml
index b0839b6d..e09a90a4 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM.xml
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas
index 6a55b92f..5f9c6667 100644
--- a/Models/Instruments/MCDU/MCDU.nas
+++ b/Models/Instruments/MCDU/MCDU.nas
@@ -1,9 +1,6 @@
# A3XX MCDU
-# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var MCDU_1 = nil;
var MCDU_2 = nil;
@@ -1741,13 +1738,11 @@ var MCDU_update_fast = maketimer(0.125, func {
});
var showMCDU1 = func {
- var mcdu1_dlg = gui.Dialog.new("sim/gui/dialogs/mcdu1/dialog", "Aircraft/IDG-A32X/Systems/mcdu1-dlg.xml");
- mcdu1_dlg.open();
+ gui.showDialog("mcdu1");
}
var showMCDU2 = func {
- var mcdu2_dlg = gui.Dialog.new("sim/gui/dialogs/mcdu2/dialog", "Aircraft/IDG-A32X/Systems/mcdu2-dlg.xml");
- mcdu2_dlg.open();
+ gui.showDialog("mcdu2");
}
setlistener("/MCDU[0]/page", func {
diff --git a/Models/Instruments/MCDU/MCDU1.xml b/Models/Instruments/MCDU/MCDU1.xml
index f6e7077f..14929fa1 100644
--- a/Models/Instruments/MCDU/MCDU1.xml
+++ b/Models/Instruments/MCDU/MCDU1.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/MCDU/MCDU2.xml b/Models/Instruments/MCDU/MCDU2.xml
index 9d90aa52..0c215245 100644
--- a/Models/Instruments/MCDU/MCDU2.xml
+++ b/Models/Instruments/MCDU/MCDU2.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/ND/ND_L.xml b/Models/Instruments/ND/ND_L.xml
index 9bfa5b42..6f1ab168 100644
--- a/Models/Instruments/ND/ND_L.xml
+++ b/Models/Instruments/ND/ND_L.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/ND/ND_R.xml b/Models/Instruments/ND/ND_R.xml
index 871703fd..7048b420 100644
--- a/Models/Instruments/ND/ND_R.xml
+++ b/Models/Instruments/ND/ND_R.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/ND/canvas/A3XX_ND.nas b/Models/Instruments/ND/canvas/A3XX_ND.nas
index 52d1107f..345207d5 100644
--- a/Models/Instruments/ND/canvas/A3XX_ND.nas
+++ b/Models/Instruments/ND/canvas/A3XX_ND.nas
@@ -2,9 +2,7 @@
# Joshua Davidson (it0uchpods)
# Based on work by artix
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var get_local_path = func(file){
var aircraft_dir = split("/", getprop("/sim/aircraft-dir"))[-1];
diff --git a/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas b/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas
index 4c26c30f..3dbe4f56 100644
--- a/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas
+++ b/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas
@@ -2,9 +2,7 @@
# Joshua Davidson (it0uchpods)
# Based on work by artix
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var A3XXRouteDriver = {
new: func(){
diff --git a/Models/Instruments/ND/canvas/ND.nas b/Models/Instruments/ND/canvas/ND.nas
index 5311ee7b..64611b48 100644
--- a/Models/Instruments/ND/canvas/ND.nas
+++ b/Models/Instruments/ND/canvas/ND.nas
@@ -1,9 +1,6 @@
# A3XX ND Canvas
-# Joshua Davidson (it0uchpods) and Nikolai V. Chr.
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
io.include("A3XX_ND.nas");
diff --git a/Models/Instruments/ND/canvas/ND_config.nas b/Models/Instruments/ND/canvas/ND_config.nas
index ce9bca65..5056656e 100644
--- a/Models/Instruments/ND/canvas/ND_config.nas
+++ b/Models/Instruments/ND/canvas/ND_config.nas
@@ -2,9 +2,7 @@
# Joshua Davidson (it0uchpods)
# Based on work by artix
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
canvas.NDConfig = {
properties: {
diff --git a/Models/Instruments/ND/canvas/framework/MapDrivers.nas b/Models/Instruments/ND/canvas/framework/MapDrivers.nas
index 417ed044..ac67dbce 100644
--- a/Models/Instruments/ND/canvas/framework/MapDrivers.nas
+++ b/Models/Instruments/ND/canvas/framework/MapDrivers.nas
@@ -2,9 +2,7 @@
# Joshua Davidson (it0uchpods)
# Based on work by artix
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
canvas.RouteDriver = {
new: func(){
diff --git a/Models/Instruments/ND/canvas/framework/canvas.nas b/Models/Instruments/ND/canvas/framework/canvas.nas
index 121c4e3c..d585e26a 100644
--- a/Models/Instruments/ND/canvas/framework/canvas.nas
+++ b/Models/Instruments/ND/canvas/framework/canvas.nas
@@ -2,9 +2,7 @@
# Joshua Davidson (it0uchpods)
# Based on work by artix
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var assert_m = canvas.assert_m;
diff --git a/Models/Instruments/ND/canvas/framework/navdisplay.nas b/Models/Instruments/ND/canvas/framework/navdisplay.nas
index 374085b2..b1436055 100644
--- a/Models/Instruments/ND/canvas/framework/navdisplay.nas
+++ b/Models/Instruments/ND/canvas/framework/navdisplay.nas
@@ -2,9 +2,7 @@
# Joshua Davidson (it0uchpods)
# Based on work by artix
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
# Override FGDATA/Nasal/canvas/map/navdisplay.mfd
diff --git a/Models/Instruments/ND/canvas/helpers.nas b/Models/Instruments/ND/canvas/helpers.nas
index cd326179..a322a888 100644
--- a/Models/Instruments/ND/canvas/helpers.nas
+++ b/Models/Instruments/ND/canvas/helpers.nas
@@ -2,9 +2,7 @@
# Joshua Davidson (it0uchpods)
# Based on work by artix
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var SymbolPainter = {
aircraft_dir: nil,
diff --git a/Models/Instruments/ND/canvas/loaders.nas b/Models/Instruments/ND/canvas/loaders.nas
index 4c6298a0..9fe90f67 100644
--- a/Models/Instruments/ND/canvas/loaders.nas
+++ b/Models/Instruments/ND/canvas/loaders.nas
@@ -2,9 +2,7 @@
# Joshua Davidson (it0uchpods)
# Based on work by artix
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var version = getprop("sim/version/flightgear");
var v = split(".", version);
diff --git a/Models/Instruments/ND/canvas/style.nas b/Models/Instruments/ND/canvas/style.nas
index b9ab5d92..6699fef5 100644
--- a/Models/Instruments/ND/canvas/style.nas
+++ b/Models/Instruments/ND/canvas/style.nas
@@ -2,9 +2,7 @@
# Joshua Davidson (it0uchpods)
# Based on work by artix
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var ALWAYS = func 1;
var NOTHING = func nil;
diff --git a/Models/Instruments/ND/canvas/wxr_api.xml b/Models/Instruments/ND/canvas/wxr_api.xml
index cedfed8f..ce13628e 100644
--- a/Models/Instruments/ND/canvas/wxr_api.xml
+++ b/Models/Instruments/ND/canvas/wxr_api.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<api-key type="string"></api-key>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 2403517f..441e6baa 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
@@ -5608,9 +5604,9 @@
<object-name>AnnunciatorLtSwtch</object-name>
<property>controls/switches/annun-test</property>
<interpolation>
- <entry><ind>-1</ind><dep>35</dep></entry>
- <entry><ind>0</ind><dep>0</dep></entry>
- <entry><ind>1</ind><dep>-35</dep></entry>
+ <entry><ind>-1</ind><dep> 35</dep></entry>
+ <entry><ind> 0</ind><dep> 0</dep></entry>
+ <entry><ind> 1</ind><dep>-35</dep></entry>
</interpolation>
<axis>
<x>0</x>
@@ -5634,11 +5630,11 @@
<button>3</button>
<repeatable>false</repeatable>
<binding>
- <command>property-adjust</command>
+ <command>property-cycle</command>
<property>controls/switches/seatbelt-sign</property>
- <step>1</step>
- <min>0</min>
- <max>1</max>
+ <value>0.0</value>
+ <!--value>0.5</value-->
+ <value>1.0</value>
</binding>
<binding>
<command>nasal</command>
@@ -5650,11 +5646,11 @@
<button>4</button>
<repeatable>false</repeatable>
<binding>
- <command>property-adjust</command>
+ <command>property-cycle</command>
<property>controls/switches/seatbelt-sign</property>
- <step>-1</step>
- <min>0</min>
- <max>1</max>
+ <value>1.0</value>
+ <!--value>0.5</value-->
+ <value>0.0</value>
</binding>
<binding>
<command>nasal</command>
@@ -5669,9 +5665,9 @@
<object-name>SeatBeltSwtch</object-name>
<property>controls/switches/seatbelt-sign</property>
<interpolation>
- <entry><ind>0</ind><dep>35</dep></entry>
- <entry><ind>0.5</ind><dep>0</dep></entry>
- <entry><ind>1</ind><dep>-35</dep></entry>
+ <entry><ind>0.0</ind><dep> 35</dep></entry>
+ <entry><ind>0.5</ind><dep> 0</dep></entry>
+ <entry><ind>1.0</ind><dep>-35</dep></entry>
</interpolation>
<axis>
<x>0</x>
@@ -5728,9 +5724,9 @@
<object-name>NoSmokingSwtch</object-name>
<property>controls/switches/no-smoking-sign</property>
<interpolation>
- <entry><ind>0</ind><dep>35</dep></entry>
- <entry><ind>0.5</ind><dep>0</dep></entry>
- <entry><ind>1</ind><dep>-35</dep></entry>
+ <entry><ind>0.0</ind><dep> 35</dep></entry>
+ <entry><ind>0.5</ind><dep> 0</dep></entry>
+ <entry><ind>1.0</ind><dep>-35</dep></entry>
</interpolation>
<axis>
<x>0</x>
diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml
index c827fdcf..1bf11a98 100644
--- a/Models/Instruments/OHpanel/OHpanelEPR.xml
+++ b/Models/Instruments/OHpanel/OHpanelEPR.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/OHpanel/SteepAppr.xml b/Models/Instruments/OHpanel/SteepAppr.xml
index 2b31b92f..073e0235 100644
--- a/Models/Instruments/OHpanel/SteepAppr.xml
+++ b/Models/Instruments/OHpanel/SteepAppr.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas
index b61ada7f..e582a64d 100644
--- a/Models/Instruments/PFD/PFD.nas
+++ b/Models/Instruments/PFD/PFD.nas
@@ -1,9 +1,6 @@
# A3XX PFD
-# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var PFD_1 = nil;
var PFD_2 = nil;
diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index dcfd7752..177c314f 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 023a760c..6dc88298 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/Pedestal_up/Pedestal_up.xml b/Models/Instruments/Pedestal_up/Pedestal_up.xml
index c6615aa6..b0ec1213 100644
--- a/Models/Instruments/Pedestal_up/Pedestal_up.xml
+++ b/Models/Instruments/Pedestal_up/Pedestal_up.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index 6c087812..dae786c1 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -1,9 +1,6 @@
# A3XX Upper ECAM Canvas
-# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var upperECAM_cfm_eis2 = nil;
var upperECAM_iae_eis2 = nil;
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM.xml
index cb234032..393b8d07 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.xml
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Interior/a320.interior.xml b/Models/Interior/a320.interior.xml
index b56bf2eb..35e71a95 100644
--- a/Models/Interior/a320.interior.xml
+++ b/Models/Interior/a320.interior.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/LandingGears/a320.mlg.left.xml b/Models/LandingGears/a320.mlg.left.xml
index 0d0959c5..082191a4 100644
--- a/Models/LandingGears/a320.mlg.left.xml
+++ b/Models/LandingGears/a320.mlg.left.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/LandingGears/a320.mlg.right.xml b/Models/LandingGears/a320.mlg.right.xml
index 8c792fb5..e45db6ab 100644
--- a/Models/LandingGears/a320.mlg.right.xml
+++ b/Models/LandingGears/a320.mlg.right.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/LandingGears/a320.mlg.tires.xml b/Models/LandingGears/a320.mlg.tires.xml
index 36aadced..3a8a27b0 100644
--- a/Models/LandingGears/a320.mlg.tires.xml
+++ b/Models/LandingGears/a320.mlg.tires.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/LandingGears/a320.nlg.tires.xml b/Models/LandingGears/a320.nlg.tires.xml
index c8affec0..59a5d831 100644
--- a/Models/LandingGears/a320.nlg.tires.xml
+++ b/Models/LandingGears/a320.nlg.tires.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/LandingGears/a320.nlg.xml b/Models/LandingGears/a320.nlg.xml
index 9179affb..d02e2681 100644
--- a/Models/LandingGears/a320.nlg.xml
+++ b/Models/LandingGears/a320.nlg.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/beacon.xml b/Models/Lights/ALS/beacon.xml
index f210de85..d1904170 100644
--- a/Models/Lights/ALS/beacon.xml
+++ b/Models/Lights/ALS/beacon.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/greennav.xml b/Models/Lights/ALS/greennav.xml
index 719c17d4..61078fc1 100644
--- a/Models/Lights/ALS/greennav.xml
+++ b/Models/Lights/ALS/greennav.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/landinglightL.xml b/Models/Lights/ALS/landinglightL.xml
index 53db373b..709a7fa9 100644
--- a/Models/Lights/ALS/landinglightL.xml
+++ b/Models/Lights/ALS/landinglightL.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/landinglightR.xml b/Models/Lights/ALS/landinglightR.xml
index c6a8aa1e..4bea35be 100644
--- a/Models/Lights/ALS/landinglightR.xml
+++ b/Models/Lights/ALS/landinglightR.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/left-strobe.xml b/Models/Lights/ALS/left-strobe.xml
index 6c52beaa..6d4ea4f1 100644
--- a/Models/Lights/ALS/left-strobe.xml
+++ b/Models/Lights/ALS/left-strobe.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/rednav.xml b/Models/Lights/ALS/rednav.xml
index 9d6ea0ca..37b9edc8 100644
--- a/Models/Lights/ALS/rednav.xml
+++ b/Models/Lights/ALS/rednav.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/right-strobe.xml b/Models/Lights/ALS/right-strobe.xml
index 00621ac6..a52083d8 100644
--- a/Models/Lights/ALS/right-strobe.xml
+++ b/Models/Lights/ALS/right-strobe.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/tail-strobe.xml b/Models/Lights/ALS/tail-strobe.xml
index 7f0d9932..ea386bce 100644
--- a/Models/Lights/ALS/tail-strobe.xml
+++ b/Models/Lights/ALS/tail-strobe.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/tailnav.xml b/Models/Lights/ALS/tailnav.xml
index bcc679fd..0db1f5d2 100644
--- a/Models/Lights/ALS/tailnav.xml
+++ b/Models/Lights/ALS/tailnav.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/taxilight.xml b/Models/Lights/ALS/taxilight.xml
index 20d7ac1b..33e3fe87 100644
--- a/Models/Lights/ALS/taxilight.xml
+++ b/Models/Lights/ALS/taxilight.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/turnoffL.xml b/Models/Lights/ALS/turnoffL.xml
index e8123b8f..2de101a2 100644
--- a/Models/Lights/ALS/turnoffL.xml
+++ b/Models/Lights/ALS/turnoffL.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/ALS/turnoffR.xml b/Models/Lights/ALS/turnoffR.xml
index b94209ca..60fd17a2 100644
--- a/Models/Lights/ALS/turnoffR.xml
+++ b/Models/Lights/ALS/turnoffR.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/beacon.xml b/Models/Lights/beacon.xml
index fab1ffd5..92c314fc 100644
--- a/Models/Lights/beacon.xml
+++ b/Models/Lights/beacon.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/greennav.xml b/Models/Lights/greennav.xml
index 985ae025..da2fab01 100644
--- a/Models/Lights/greennav.xml
+++ b/Models/Lights/greennav.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/landing-nose.xml b/Models/Lights/landing-nose.xml
index 96e76846..cc0815bf 100644
--- a/Models/Lights/landing-nose.xml
+++ b/Models/Lights/landing-nose.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/landing-port.xml b/Models/Lights/landing-port.xml
index e1179dd9..283e4ad3 100644
--- a/Models/Lights/landing-port.xml
+++ b/Models/Lights/landing-port.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/landing-stbd.xml b/Models/Lights/landing-stbd.xml
index 8037c897..66691f86 100644
--- a/Models/Lights/landing-stbd.xml
+++ b/Models/Lights/landing-stbd.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/light-cone.xml b/Models/Lights/light-cone.xml
index 62c3dc93..f501555d 100644
--- a/Models/Lights/light-cone.xml
+++ b/Models/Lights/light-cone.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/rednav.xml b/Models/Lights/rednav.xml
index 7dea2db5..3c247e05 100644
--- a/Models/Lights/rednav.xml
+++ b/Models/Lights/rednav.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/strobe.xml b/Models/Lights/strobe.xml
index 85dc4c45..78dd7e5e 100644
--- a/Models/Lights/strobe.xml
+++ b/Models/Lights/strobe.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/tailnav.xml b/Models/Lights/tailnav.xml
index f46363ab..7199d477 100644
--- a/Models/Lights/tailnav.xml
+++ b/Models/Lights/tailnav.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Lights/tailstrobe.xml b/Models/Lights/tailstrobe.xml
index 7f701e10..575b3e4a 100644
--- a/Models/Lights/tailstrobe.xml
+++ b/Models/Lights/tailstrobe.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/RAT/RAT.xml b/Models/RAT/RAT.xml
index 8ded6be9..a62dba4c 100644
--- a/Models/RAT/RAT.xml
+++ b/Models/RAT/RAT.xml
@@ -1,10 +1,6 @@
<?xml version = '1.0' encoding = 'UTF-8' ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml b/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml
index e0d8bdef..f3ebe7ef 100644
--- a/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml
+++ b/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml b/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml
index 8e98dee2..964c4b75 100644
--- a/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml
+++ b/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Services/Catering/warning-light.xml b/Models/Services/Catering/warning-light.xml
index 4d9c6044..397b7d04 100644
--- a/Models/Services/Catering/warning-light.xml
+++ b/Models/Services/Catering/warning-light.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Services/De-Icing/volvo_deicing_truck.xml b/Models/Services/De-Icing/volvo_deicing_truck.xml
index a772e080..ea1b4b9b 100644
--- a/Models/Services/De-Icing/volvo_deicing_truck.xml
+++ b/Models/Services/De-Icing/volvo_deicing_truck.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Services/Stairs/stairs.xml b/Models/Services/Stairs/stairs.xml
index 63f74091..835bffb7 100644
--- a/Models/Services/Stairs/stairs.xml
+++ b/Models/Services/Stairs/stairs.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Tablet/Tablet.nas b/Models/Tablet/Tablet.nas
index 579ac500..d0bbba04 100644
--- a/Models/Tablet/Tablet.nas
+++ b/Models/Tablet/Tablet.nas
@@ -1,9 +1,7 @@
# IDG Tablet
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var Tablet1 = nil;
var Tablet_1 = nil;
diff --git a/Models/Tablet/Tablet.xml b/Models/Tablet/Tablet.xml
index 23a48290..12ebabc6 100644
--- a/Models/Tablet/Tablet.xml
+++ b/Models/Tablet/Tablet.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- 3D by Justin Nicholson (pinto) -->
diff --git a/Models/Wings/a320.sharklets.xml b/Models/Wings/a320.sharklets.xml
index 695733c7..8cc763f1 100644
--- a/Models/Wings/a320.sharklets.xml
+++ b/Models/Wings/a320.sharklets.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Wings/a320.winglets.xml b/Models/Wings/a320.winglets.xml
index 060911e6..1f0dc453 100644
--- a/Models/Wings/a320.winglets.xml
+++ b/Models/Wings/a320.winglets.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Models/Wings/a320.wings.cfm.xml b/Models/Wings/a320.wings.cfm.xml
index 1af82cd5..9f48ecd3 100644
--- a/Models/Wings/a320.wings.cfm.xml
+++ b/Models/Wings/a320.wings.cfm.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<path>res/a320.wings.ac</path>
diff --git a/Models/Wings/a320.wings.iae.xml b/Models/Wings/a320.wings.iae.xml
index 9fd1fa5f..79e2d0a7 100644
--- a/Models/Wings/a320.wings.iae.xml
+++ b/Models/Wings/a320.wings.iae.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<path>res/a320.wings.ac</path>
diff --git a/Models/Wings/a320.wings.neocfm.xml b/Models/Wings/a320.wings.neocfm.xml
index 8206e680..b5963121 100644
--- a/Models/Wings/a320.wings.neocfm.xml
+++ b/Models/Wings/a320.wings.neocfm.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<path>res/a320.wings.ac</path>
diff --git a/Models/Wings/a320.wings.neopw.xml b/Models/Wings/a320.wings.neopw.xml
index 0b774fc3..f4a6b8a7 100644
--- a/Models/Wings/a320.wings.neopw.xml
+++ b/Models/Wings/a320.wings.neopw.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<path>res/a320.wings.ac</path>
diff --git a/Models/Wings/a320neo.sharklets.xml b/Models/Wings/a320neo.sharklets.xml
index 07ba19b0..0e6e7156 100644
--- a/Models/Wings/a320neo.sharklets.xml
+++ b/Models/Wings/a320neo.sharklets.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Nasal/ADIRS.nas b/Nasal/ADIRS.nas
index 3f709f1f..02f4ea80 100644
--- a/Nasal/ADIRS.nas
+++ b/Nasal/ADIRS.nas
@@ -1,9 +1,7 @@
# A3XX ADIRS System
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var knob = 0;
var roll = 0;
diff --git a/Nasal/ECAM.nas b/Nasal/ECAM.nas
index 94ac0083..0b0d5138 100644
--- a/Nasal/ECAM.nas
+++ b/Nasal/ECAM.nas
@@ -1,9 +1,7 @@
# A3XX ECAM
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var stateL = 0;
var stateR = 0;
diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas
index 0d62ff0e..71a9639d 100644
--- a/Nasal/FMGC-b.nas
+++ b/Nasal/FMGC-b.nas
@@ -1,9 +1,7 @@
# A3XX FMGC/Autoflight
# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
#################################
# IT-AUTOFLIGHT Based Autopilot #
@@ -95,6 +93,14 @@ var APinit = func {
# AP 1 Master System
setlistener("/it-autoflight/input/ap1", func {
+ var apmas = getprop("/it-autoflight/input/ap1");
+ var apout = getprop("/it-autoflight/output/ap1");
+ if (apmas != apout) {
+ AP1Master();
+ }
+});
+
+var AP1Master = func {
var apmas = getprop("/it-autoflight/input/ap1");
var ac_ess = getprop("/systems/electrical/bus/ac-ess");
var law = getprop("/it-fbw/law");
@@ -127,10 +133,24 @@ setlistener("/it-autoflight/input/ap1", func {
fmabox();
}
}
-});
+
+ var apout = getprop("/it-autoflight/output/ap1");
+ if (apmas != apout) {
+ setprop("/it-autoflight/input/ap1", apout);
+ }
+}
# AP 2 Master System
setlistener("/it-autoflight/input/ap2", func {
+ var apmas = getprop("/it-autoflight/input/ap2");
+ var apout = getprop("/it-autoflight/output/ap2");
+
+ if (apmas != apout) {
+ AP2Master();
+ }
+});
+
+var AP2Master = func {
var apmas = getprop("/it-autoflight/input/ap2");
var ac_ess = getprop("/systems/electrical/bus/ac-ess");
var law = getprop("/it-fbw/law");
@@ -163,50 +183,101 @@ setlistener("/it-autoflight/input/ap2", func {
fmabox();
}
}
+
+ var apout = getprop("/it-autoflight/output/ap2");
+ if (apmas != apout) {
+ setprop("/it-autoflight/input/ap2", apout);
+ }
+}
+
+# ATHR Master System
+setlistener("/it-autoflight/input/athr", func {
+ var athrmas = getprop("/it-autoflight/input/athr");
+ var athrout = getprop("/it-autoflight/output/athr");
+
+ if (athrmas != athrout) {
+ ATHRMaster();
+ }
});
-# AT Master System
-setlistener("/it-autoflight/input/athr", func {
- var atmas = getprop("/it-autoflight/input/athr");
- if (atmas == 0) {
+var ATHRMaster = func {
+ var athrmas = getprop("/it-autoflight/input/athr");
+ if (athrmas == 0) {
setprop("/it-autoflight/output/athr", 0);
if (getprop("/it-autoflight/sound/enableathrsound") == 1 and getprop("/it-autoflight/output/athr") == 0 and getprop("/position/gear-agl-ft") > 50) {
setprop("/it-autoflight/sound/athrsound", 1);
setprop("/it-autoflight/sound/enableathrsound", 0);
}
- } else if (atmas == 1) {
+ } else if (athrmas == 1) {
thrustmode();
setprop("/it-autoflight/output/athr", 1);
setprop("/it-autoflight/sound/athrsound", 0);
setprop("/it-autoflight/sound/enableathrsound", 1);
}
-});
+
+ var athrout = getprop("/it-autoflight/output/athr");
+ if (athrmas != athrout) {
+ setprop("/it-autoflight/input/athr", athrout);
+ }
+}
# Flight Director 1 Master System
setlistener("/it-autoflight/input/fd1", func {
+ var fdmas = getprop("/it-autoflight/input/fd1");
+ var fdout = getprop("/it-autoflight/output/fd1");
+
+ if (fdmas != fdout) {
+ FD1Master();
+ }
+});
+
+var FD1Master = func {
var fdmas = getprop("/it-autoflight/input/fd1");
if (fdmas == 0) {
setprop("/it-autoflight/output/fd1", 0);
- fmabox();
+ if (getprop("/it-autoflight/output/fd1") == 0 and getprop("/it-autoflight/output/fd2") == 0) {
+ fmabox();
+ }
updateTimers();
} else if (fdmas == 1) {
setprop("/it-autoflight/output/fd1", 1);
fmabox();
}
-});
+
+ var fdout = getprop("/it-autoflight/output/fd1");
+ if (fdmas != fdout) {
+ setprop("/it-autoflight/input/fd1", fdout);
+ }
+}
# Flight Director 2 Master System
setlistener("/it-autoflight/input/fd2", func {
+ var fdmas = getprop("/it-autoflight/input/fd2");
+ var fdout = getprop("/it-autoflight/output/fd2");
+
+ if (fdmas != fdout) {
+ FD2Master();
+ }
+});
+
+var FD2Master = func {
var fdmas = getprop("/it-autoflight/input/fd2");
if (fdmas == 0) {
setprop("/it-autoflight/output/fd2", 0);
- fmabox();
+ if (getprop("/it-autoflight/output/fd1") == 0 and getprop("/it-autoflight/output/fd2") == 0) {
+ fmabox();
+ }
updateTimers();
} else if (fdmas == 1) {
setprop("/it-autoflight/output/fd2", 1);
fmabox();
}
-});
+
+ var fdout = getprop("/it-autoflight/output/fd2");
+ if (fdmas != fdout) {
+ setprop("/it-autoflight/input/fd2", fdout);
+ }
+}
# FMA Boxes and Mode
var fmabox = func {
diff --git a/Nasal/FMGC-c.nas b/Nasal/FMGC-c.nas
index ba2214e4..49bacfdd 100644
--- a/Nasal/FMGC-c.nas
+++ b/Nasal/FMGC-c.nas
@@ -1,9 +1,7 @@
# A3XX FMGC/Autoflight
# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
setprop("/FMGC/internal/cruise-ft", 10000);
setprop("/it-autoflight/internal/alt", 10000);
diff --git a/Nasal/FMGC.nas b/Nasal/FMGC.nas
index c39e3ab8..b0bdcf51 100644
--- a/Nasal/FMGC.nas
+++ b/Nasal/FMGC.nas
@@ -1,9 +1,7 @@
# A3XX FMGC/Autoflight
# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
##################
# Init Functions #
diff --git a/Nasal/MCDU/DATA.nas b/Nasal/MCDU/DATA.nas
index dd12a561..474902c9 100644
--- a/Nasal/MCDU/DATA.nas
+++ b/Nasal/MCDU/DATA.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var dataInput = func(key, i) {
if (key == "L1") {
diff --git a/Nasal/MCDU/F-PLNA.nas b/Nasal/MCDU/F-PLNA.nas
index 977e56b7..9cf4cabf 100644
--- a/Nasal/MCDU/F-PLNA.nas
+++ b/Nasal/MCDU/F-PLNA.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
setprop("/MCDUC/F-PLNA/left-1", "F-PLN PAGE IS NOT ENABLED");
setprop("/MCDUC/F-PLNA/left-2", "BECAUSE IT IS NOT READY");
diff --git a/Nasal/MCDU/INITA.nas b/Nasal/MCDU/INITA.nas
index 2f30085d..23128434 100644
--- a/Nasal/MCDU/INITA.nas
+++ b/Nasal/MCDU/INITA.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var initInputA = func(key, i) {
var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad");
diff --git a/Nasal/MCDU/INITB.nas b/Nasal/MCDU/INITB.nas
index 88120016..24bc01a5 100644
--- a/Nasal/MCDU/INITB.nas
+++ b/Nasal/MCDU/INITB.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var initInputB = func(key, i) {
var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad");
diff --git a/Nasal/MCDU/MCDU.nas b/Nasal/MCDU/MCDU.nas
index 3b73107d..cfe13c96 100644
--- a/Nasal/MCDU/MCDU.nas
+++ b/Nasal/MCDU/MCDU.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var MCDU_init = func(i) {
MCDU_reset(i); # Reset MCDU, clears data
diff --git a/Nasal/MCDU/PERFCLB.nas b/Nasal/MCDU/PERFCLB.nas
index 2fa7c58b..44b05f0c 100644
--- a/Nasal/MCDU/PERFCLB.nas
+++ b/Nasal/MCDU/PERFCLB.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var perfCLBInput = func(key, i) {
var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad");
diff --git a/Nasal/MCDU/PERFCRZ.nas b/Nasal/MCDU/PERFCRZ.nas
index fc304c5f..9942740a 100644
--- a/Nasal/MCDU/PERFCRZ.nas
+++ b/Nasal/MCDU/PERFCRZ.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var perfCRZInput = func(key, i) {
if (key == "L6") {
diff --git a/Nasal/MCDU/PERFDES.nas b/Nasal/MCDU/PERFDES.nas
index 9f00771b..ad573849 100644
--- a/Nasal/MCDU/PERFDES.nas
+++ b/Nasal/MCDU/PERFDES.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var perfDESInput = func(key, i) {
if (key == "L6") {
diff --git a/Nasal/MCDU/PERFTO.nas b/Nasal/MCDU/PERFTO.nas
index ab3c4c86..c98cbaf6 100644
--- a/Nasal/MCDU/PERFTO.nas
+++ b/Nasal/MCDU/PERFTO.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var perfTOInput = func(key, i) {
var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad");
diff --git a/Nasal/MCDU/RADNAV.nas b/Nasal/MCDU/RADNAV.nas
index d3aabb66..ebfdefc1 100644
--- a/Nasal/MCDU/RADNAV.nas
+++ b/Nasal/MCDU/RADNAV.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var radnavInput = func(key, i) {
var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad");
diff --git a/Nasal/MCDU/STATUS.nas b/Nasal/MCDU/STATUS.nas
index 585549a6..a6a722e3 100644
--- a/Nasal/MCDU/STATUS.nas
+++ b/Nasal/MCDU/STATUS.nas
@@ -1,8 +1,6 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var statusInput = func(key, i) {
if (key == "L3") {
diff --git a/Nasal/brakes.nas b/Nasal/brakes.nas
index 68560980..d4c5b4fb 100644
--- a/Nasal/brakes.nas
+++ b/Nasal/brakes.nas
@@ -1,9 +1,7 @@
# A3XX Autobrake
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var thr1 = 0;
var thr2 = 0;
diff --git a/Nasal/buttons.nas b/Nasal/buttons.nas
index 04e91c49..123ba2d4 100644
--- a/Nasal/buttons.nas
+++ b/Nasal/buttons.nas
@@ -1,9 +1,7 @@
# A3XX Buttons
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
# Resets buttons to the default values
var variousReset = func {
diff --git a/Nasal/efis.nas b/Nasal/efis.nas
index d31174aa..745c888a 100644
--- a/Nasal/efis.nas
+++ b/Nasal/efis.nas
@@ -1,8 +1,6 @@
# A3XX EFIS controller by Joshua Davidson (it0uchpods).
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
setlistener("sim/signals/fdm-initialized", func {
setprop("/instrumentation/efis[0]/nd/display-mode", "NAV");
diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index bc6ce323..7a3d6182 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -1,9 +1,7 @@
# A3XX Electrical System
# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var ac_volt_std = 115;
var ac_volt_min = 110;
diff --git a/Nasal/engines-cfm.nas b/Nasal/engines-cfm.nas
index a7082f0a..07755dd2 100644
--- a/Nasal/engines-cfm.nas
+++ b/Nasal/engines-cfm.nas
@@ -1,9 +1,7 @@
# A3XX IAE V2500 Engine
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
#####################
# Initializing Vars #
diff --git a/Nasal/engines-common.nas b/Nasal/engines-common.nas
index b238dda1..2353ebaa 100644
--- a/Nasal/engines-common.nas
+++ b/Nasal/engines-common.nas
@@ -1,9 +1,7 @@
# A3XX Engine Control
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
if (getprop("/options/eng") == "IAE") {
io.include("engines-iae.nas");
diff --git a/Nasal/engines-iae.nas b/Nasal/engines-iae.nas
index ec26ddb7..f4a28438 100644
--- a/Nasal/engines-iae.nas
+++ b/Nasal/engines-iae.nas
@@ -1,9 +1,7 @@
# A3XX IAE V2500 Engine
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
#####################
# Initializing Vars #
diff --git a/Nasal/fadec-cfm.nas b/Nasal/fadec-cfm.nas
index 45262272..b0b449cc 100644
--- a/Nasal/fadec-cfm.nas
+++ b/Nasal/fadec-cfm.nas
@@ -1,8 +1,6 @@
# A3XX CFM FADEC by Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
setprop("/systems/fadec/n1mode1", 0); # Doesn't do anything, just here for other logic #
setprop("/systems/fadec/n1mode2", 0); # Doesn't do anything, just here for other logic #
diff --git a/Nasal/fadec-common.nas b/Nasal/fadec-common.nas
index c78dbc7f..5babe983 100644
--- a/Nasal/fadec-common.nas
+++ b/Nasal/fadec-common.nas
@@ -1,9 +1,7 @@
# A3XX FADEC/Throttle Control System
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
if (getprop("/options/eng") == "IAE") {
io.include("fadec-iae.nas");
diff --git a/Nasal/fadec-iae.nas b/Nasal/fadec-iae.nas
index 27464783..4008c8d8 100644
--- a/Nasal/fadec-iae.nas
+++ b/Nasal/fadec-iae.nas
@@ -1,8 +1,6 @@
# A3XX IAE FADEC by Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
setprop("/controls/fadec/n1mode1", 0);
setprop("/controls/fadec/n1mode2", 0);
diff --git a/Nasal/fire.nas b/Nasal/fire.nas
index 0a2427d1..626e6ed9 100644
--- a/Nasal/fire.nas
+++ b/Nasal/fire.nas
@@ -1,9 +1,7 @@
# A3XX Fire System
# Jonathan Redpath
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
#############
# Init Vars #
diff --git a/Nasal/fuel.nas b/Nasal/fuel.nas
index e477ada5..3d0312dc 100644
--- a/Nasal/fuel.nas
+++ b/Nasal/fuel.nas
@@ -1,9 +1,7 @@
# A3XX Fuel System
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var xfeed_sw = getprop("/controls/fuel/x-feed");
var tank0pump1_sw = 0;
diff --git a/Nasal/hydraulics.nas b/Nasal/hydraulics.nas
index 01e5bcb4..e122416a 100644
--- a/Nasal/hydraulics.nas
+++ b/Nasal/hydraulics.nas
@@ -1,9 +1,7 @@
# A3XX Hydraulic System
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var eng1_pump_sw = 0;
var eng2_pump_sw = 0;
diff --git a/Nasal/icing.nas b/Nasal/icing.nas
index 63859fd0..ab8c2ecc 100644
--- a/Nasal/icing.nas
+++ b/Nasal/icing.nas
@@ -1,9 +1,7 @@
# A3XX Icing System
# Jonathan Redpath (legoboyvdlp)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var dewpoint = 0;
var temperature = 0;
diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas
index 14562b76..d964fbf5 100644
--- a/Nasal/it-fbw.nas
+++ b/Nasal/it-fbw.nas
@@ -1,9 +1,7 @@
# Airbus A3XX FBW/Flight Control Computer System
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
# If All ELACs Fail, Alternate Law
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index b5d08970..0ac16465 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -1,9 +1,7 @@
# A320 Main Libraries
# Joshua Davidson (it0uchpods)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
print("-----------------------------------------------------------------------------");
print("Copyright (c) 2017-2018 Joshua Davidson (it0uchpods)");
@@ -186,7 +184,6 @@ var systemsInit = func {
systemsLoop.start();
icing.icingInit();
lightsLoop.start();
- var autopilot = gui.Dialog.new("sim/gui/dialogs/autopilot/dialog", "Aircraft/IDG-A32X/Systems/autopilot-dlg.xml");
setprop("/it-autoflight/input/fd1", 1);
setprop("/it-autoflight/input/fd2", 1);
libraries.ECAM.init();
diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas
index 99d3724d..f7285ed2 100644
--- a/Nasal/pneumatics.nas
+++ b/Nasal/pneumatics.nas
@@ -1,9 +1,7 @@
# A3XX Pneumatic System
# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var altitude = 0;
var bleed1_sw = 0;
diff --git a/Nasal/shake.nas b/Nasal/shake.nas
index 9094e6cf..2fcf17b1 100644
--- a/Nasal/shake.nas
+++ b/Nasal/shake.nas
@@ -1,8 +1,6 @@
# A3XX Shaking
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
var shakeEffectA3XX = props.globals.initNode("/systems/shake/effect", 0, "BOOL");
var shakeA3XX = props.globals.initNode("/systems/shake/shaking", 0, "DOUBLE");
diff --git a/Nasal/walk.nas b/Nasal/walk.nas
index 9a5e5517..1e66f74d 100644
--- a/Nasal/walk.nas
+++ b/Nasal/walk.nas
@@ -1,6 +1,4 @@
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
+# Copyright (c) 2018 Joshua Davidson (it0uchpods)
# view nodes and offsets --------------------------------------------
var zNoseNode = props.globals.getNode("sim/view/config/y-offset-m", 1);
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index a79b51fb..28287231 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -1,8 +1,4 @@
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<fx>
diff --git a/Sounds/cfm56-sound.xml b/Sounds/cfm56-sound.xml
index c62f4df9..40e5db86 100644
--- a/Sounds/cfm56-sound.xml
+++ b/Sounds/cfm56-sound.xml
@@ -1,8 +1,4 @@
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList include="A320-common-sound.xml">
<fx>
diff --git a/Sounds/leapx-sound.xml b/Sounds/leapx-sound.xml
index 89350912..7e845f2d 100644
--- a/Sounds/leapx-sound.xml
+++ b/Sounds/leapx-sound.xml
@@ -1,8 +1,4 @@
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList include="A320-common-sound.xml">
<fx>
diff --git a/Sounds/v2500-sound.xml b/Sounds/v2500-sound.xml
index 4423d8a2..41d60606 100644
--- a/Sounds/v2500-sound.xml
+++ b/Sounds/v2500-sound.xml
@@ -1,8 +1,4 @@
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList include="A320-common-sound.xml">
<fx>
diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml
index e5bec7ba..9cb2815c 100644
--- a/Systems/a320-aerodynamics.xml
+++ b/Systems/a320-aerodynamics.xml
@@ -1,11 +1,7 @@
<!-- Airbus A320 Aerodynamics -->
<!-- Joshua Davidson (it0uchpods) -->
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<aerodynamics>
diff --git a/Systems/a320-external-reactions.xml b/Systems/a320-external-reactions.xml
index b9607ee2..7d84b950 100644
--- a/Systems/a320-external-reactions.xml
+++ b/Systems/a320-external-reactions.xml
@@ -1,11 +1,7 @@
<!-- Airbus A320 JSBsim -->
<!-- Joshua Davidson (it0uchpods) -->
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<external_reactions>
<force name="tractor" frame="BODY">
diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index 4430d122..a0f8bcf9 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -1,18 +1,14 @@
<!-- Airbus A320 FCS/FBW -->
<!-- Joshua Davidson (it0uchpods) -->
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<system name="A320: FCS">
<property value="0">fbw/roll/pid</property>
<property value="0">fbw/pitch/g-pi</property>
<property value="0">fbw/pitch/pid</property>
- <property value="0">fbw/yaw/tc-pid</property>
+ <property value="0">fbw/yaw/tc-pd</property>
<property value="0">fbw/spoiler-output</property>
<!-- Default gains for tuning -->
@@ -1113,7 +1109,7 @@
</test>
</switch>
- <pid name="fbw/yaw/tc-pid-v">
+ <pid name="fbw/yaw/tc-pd-v">
<input>fbw/yaw/slip-skid</input>
<kp>fbw/yaw/tc-p-gain</kp>
<ki>0.0</ki>
@@ -1122,11 +1118,11 @@
<min>-0.4</min>
<max>0.4</max>
</clipto>
- <output>fbw/yaw/tc-pid</output>
+ <output>fbw/yaw/tc-pd</output>
</pid>
- <switch name="fbw/yaw/tc-pid-s">
- <default value="fbw/yaw/tc-pid"/>
+ <switch name="fbw/yaw/tc-pd-s">
+ <default value="fbw/yaw/tc-pd"/>
<test logic="OR" value="0">
position/wow eq 1
fbw/yaw/rudder-nul gt 0
@@ -1143,7 +1139,7 @@
<summer name="fbw/yaw/output-sum">
<input>fbw/yaw/yd-f</input>
- <input>fbw/yaw/tc-pid-s</input>
+ <input>fbw/yaw/tc-pd-s</input>
<input>fbw/yaw/fmgc-cmd</input>
</summer>
diff --git a/Systems/a320-ground-reactions.xml b/Systems/a320-ground-reactions.xml
index 65aeae80..9d68a637 100644
--- a/Systems/a320-ground-reactions.xml
+++ b/Systems/a320-ground-reactions.xml
@@ -1,11 +1,7 @@
<!-- Airbus A320 JSBsim -->
<!-- Joshua Davidson (it0uchpods) -->
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<ground_reactions>
<contact type="BOGEY" name="NOSE_LG">
@@ -20,8 +16,8 @@
<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
<max_steer unit="DEG"> 70 </max_steer>
- <brake_group> NOSE </brake_group>
- <retractable>1</retractable>
+ <brake_group> NONE </brake_group>
+ <retractable> 1 </retractable>
</contact>
<contact type="BOGEY" name="LEFT_MLG">
<location unit="M">
@@ -36,7 +32,7 @@
<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> LEFT </brake_group>
- <retractable>1</retractable>
+ <retractable> 1 </retractable>
</contact>
<contact type="BOGEY" name="RIGHT_MLG">
<location unit="M">
@@ -51,7 +47,7 @@
<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> RIGHT </brake_group>
- <retractable>1</retractable>
+ <retractable> 1 </retractable>
</contact>
<contact type="STRUCTURE" name="NOSE_1">
@@ -67,7 +63,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="NOSE_2">
<location unit="M">
@@ -82,7 +78,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="BOTTOM_1">
@@ -98,7 +94,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="BOTTOM_2">
<location unit="M">
@@ -113,7 +109,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="TOP_1">
@@ -129,7 +125,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="TOP_2">
<location unit="M">
@@ -144,7 +140,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="ENG_1">
@@ -160,7 +156,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="ENG_2">
<location unit="M">
@@ -175,7 +171,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="TAIL_1">
@@ -191,7 +187,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="TAIL_2">
<location unit="M">
@@ -206,7 +202,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="WING_TIP_1">
@@ -222,7 +218,7 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
<contact type="STRUCTURE" name="WING_TIP_2">
<location unit="M">
@@ -237,6 +233,6 @@
<damping_coeff unit="LBS/FT/SEC"> 50000 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer>
<brake_group> NONE </brake_group>
- <retractable>0</retractable>
+ <retractable> 0 </retractable>
</contact>
</ground_reactions>
diff --git a/Systems/a320-mass-balance.xml b/Systems/a320-mass-balance.xml
index 338c357d..789aea70 100644
--- a/Systems/a320-mass-balance.xml
+++ b/Systems/a320-mass-balance.xml
@@ -1,11 +1,7 @@
<!-- Airbus A320 JSBsim -->
<!-- Joshua Davidson (it0uchpods) -->
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<mass_balance>
<ixx unit="SLUG*FT2"> 611903 </ixx>
diff --git a/Systems/a320-metrics.xml b/Systems/a320-metrics.xml
index ea0d13cd..aacc4bf5 100644
--- a/Systems/a320-metrics.xml
+++ b/Systems/a320-metrics.xml
@@ -1,11 +1,7 @@
<!-- Airbus A320 JSBsim -->
<!-- Joshua Davidson (it0uchpods) -->
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<metrics>
<wingarea unit="FT2"> 1319.79 </wingarea>
diff --git a/Systems/a320-spoiler.xml b/Systems/a320-spoiler.xml
index 390f1961..3a5b1a3c 100644
--- a/Systems/a320-spoiler.xml
+++ b/Systems/a320-spoiler.xml
@@ -1,11 +1,7 @@
<!-- Airbus A320 FCS -->
<!-- Joshua Davidson (it0uchpods) -->
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<system name="A320: Spoilers">
diff --git a/Systems/cfm56-sound.xml b/Systems/cfm56-sound.xml
index 84717d21..989c7e18 100644
--- a/Systems/cfm56-sound.xml
+++ b/Systems/cfm56-sound.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml
index e15a7a17..178f40c5 100644
--- a/Systems/fadec-cfm.xml
+++ b/Systems/fadec-cfm.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX CFM56/CFM Leap/PW PurePower FADEC -->
<!-- Joshua Davidson (it0uchpods) -->
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index 55c30662..ef83867a 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX IAE V2500 FADEC -->
<!-- Joshua Davidson (it0uchpods) -->
diff --git a/Systems/fbw-pitch.xml b/Systems/fbw-pitch.xml
index c17033c7..c421ee58 100644
--- a/Systems/fbw-pitch.xml
+++ b/Systems/fbw-pitch.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- Airbus A3XX FBW System -->
<!-- Joshua Davidson (it0uchpods) -->
diff --git a/Systems/flight-recorder.xml b/Systems/flight-recorder.xml
index 10f4e180..81b2fe9b 100644
--- a/Systems/flight-recorder.xml
+++ b/Systems/flight-recorder.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- A3XX Flight Recorder -->
diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml
index d90ebe56..15659433 100644
--- a/Systems/fmgc-drivers.xml
+++ b/Systems/fmgc-drivers.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- IT-AUTOFLIGHT -->
diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml
index e743020d..5b4e50c3 100644
--- a/Systems/fmgc-pitch.xml
+++ b/Systems/fmgc-pitch.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- IT-AUTOFLIGHT -->
diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml
index 3bb81d99..e9b2d488 100644
--- a/Systems/fmgc-roll-yaw.xml
+++ b/Systems/fmgc-roll-yaw.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- IT-AUTOFLIGHT -->
diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml
index 1b861561..6dcf401c 100644
--- a/Systems/fmgc-thrust.xml
+++ b/Systems/fmgc-thrust.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/fuel.xml b/Systems/fuel.xml
index 2fb37635..c683e741 100644
--- a/Systems/fuel.xml
+++ b/Systems/fuel.xml
@@ -3,11 +3,7 @@
<!-- A3XX Fuel System -->
<!-- Joshua Davidson (it0uchpods) -->
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<system name="fuel">
diff --git a/Systems/glass-effect1.xml b/Systems/glass-effect1.xml
index 94ff3bf2..daaf9fff 100644
--- a/Systems/glass-effect1.xml
+++ b/Systems/glass-effect1.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<system name="glass-effect1">
diff --git a/Systems/glass-effect2.xml b/Systems/glass-effect2.xml
index a9954db8..00dfe35e 100644
--- a/Systems/glass-effect2.xml
+++ b/Systems/glass-effect2.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/instrumentation.xml b/Systems/instrumentation.xml
index 1c9651d8..754cd537 100644
--- a/Systems/instrumentation.xml
+++ b/Systems/instrumentation.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- IDG Custom Instrumentation -->
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index 1da822c6..451c58fa 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/lower-ecam.xml b/Systems/lower-ecam.xml
index 2f6f4b45..3d757a9e 100644
--- a/Systems/lower-ecam.xml
+++ b/Systems/lower-ecam.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/pfd.xml b/Systems/pfd.xml
index 4ed83578..dbaa2707 100644
--- a/Systems/pfd.xml
+++ b/Systems/pfd.xml
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml
index ae258734..c883d595 100644
--- a/Systems/upper-ecam.xml
+++ b/Systems/upper-ecam.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/v2500-sound.xml b/Systems/v2500-sound.xml
index c1cd7f46..995cda84 100644
--- a/Systems/v2500-sound.xml
+++ b/Systems/v2500-sound.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/autopilot-dlg.xml b/gui/dialogs/a3xx-autoflight-dlg.xml
similarity index 99%
rename from Systems/autopilot-dlg.xml
rename to gui/dialogs/a3xx-autoflight-dlg.xml
index 52d927f9..6b9780a3 100644
--- a/Systems/autopilot-dlg.xml
+++ b/gui/dialogs/a3xx-autoflight-dlg.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<!-- IT-AUTOFLIGHT Autopilot Control Dialog -->
diff --git a/Systems/mcdu1-dlg.xml b/gui/dialogs/mcdu1-dlg.xml
similarity index 99%
rename from Systems/mcdu1-dlg.xml
rename to gui/dialogs/mcdu1-dlg.xml
index f0c6388f..2afaf0e5 100644
--- a/Systems/mcdu1-dlg.xml
+++ b/gui/dialogs/mcdu1-dlg.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/mcdu2-dlg.xml b/gui/dialogs/mcdu2-dlg.xml
similarity index 99%
rename from Systems/mcdu2-dlg.xml
rename to gui/dialogs/mcdu2-dlg.xml
index db65118b..2bc1d0d6 100644
--- a/Systems/mcdu2-dlg.xml
+++ b/gui/dialogs/mcdu2-dlg.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
diff --git a/Systems/it-gui.xml b/gui/it-gui.xml
similarity index 81%
rename from Systems/it-gui.xml
rename to gui/it-gui.xml
index 3ac4217c..93e59607 100644
--- a/Systems/it-gui.xml
+++ b/gui/it-gui.xml
@@ -2,90 +2,86 @@
<!-- IT-GUI -->
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
<PropertyList>
<style n="0">
<colors n="0">
<background n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.05</blue>
<green>0.05</green>
<red>0.05</red>
</background>
<button n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
</button>
<checkbox-foreground n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.05</blue>
<green>0.05</green>
<red>0.05</red>
</checkbox-foreground>
<checkbox-highlight n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</checkbox-highlight>
<checkbox-misc n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</checkbox-misc>
<combo-editfield n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
</combo-editfield>
<dial-misc n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</dial-misc>
<hrule n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>1.0</blue>
<green>0.0</green>
<red>1.0</red>
</hrule>
<input n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
</input>
<input-legend n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</input-legend>
<input-misc n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</input-misc>
<radio-foreground n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.0</blue>
<green>0.0</green>
<red>0.0</red>
</radio-foreground>
<select-editfield n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
@@ -97,13 +93,13 @@
<red>0.4</red>
</slider>
<textbox-editable n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
</textbox-editable>
<vrule n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>1.0</blue>
<green>0.0</green>
<red>1.0</red>
@@ -114,79 +110,79 @@
<style n="1">
<colors n="0">
<background n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.05</blue>
<green>0.05</green>
<red>0.05</red>
</background>
<button n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
</button>
<checkbox-foreground n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.05</blue>
<green>0.05</green>
<red>0.05</red>
</checkbox-foreground>
<checkbox-highlight n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</checkbox-highlight>
<checkbox-misc n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</checkbox-misc>
<combo-editfield n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
</combo-editfield>
<dial-misc n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</dial-misc>
<hrule n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>1.0</blue>
<green>0.0</green>
<red>1.0</red>
</hrule>
<input n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
</input>
<input-legend n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</input-legend>
<input-misc n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.9</blue>
<green>0.9</green>
<red>0.9</red>
</input-misc>
<radio-foreground n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.0</blue>
<green>0.0</green>
<red>0.0</red>
</radio-foreground>
<select-editfield n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
@@ -198,13 +194,13 @@
<red>0.4</red>
</slider>
<textbox-editable n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>0.2</blue>
<green>0.2</green>
<red>0.2</red>
</textbox-editable>
<vrule n="0">
- <alpha>0.9</alpha>
+ <alpha>0.95</alpha>
<blue>1.0</blue>
<green>0.0</green>
<red>1.0</red>
diff --git a/revision.txt b/revision.txt
index 0a3a8672..e0af25d9 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4705
\ No newline at end of file
+4714
\ No newline at end of file