This commit is contained in:
Jonathan Redpath 2017-05-05 11:30:02 +01:00
commit 0b643bdccf
21 changed files with 470 additions and 479 deletions

View file

@ -330,20 +330,10 @@
</output> </output>
</it-autoflight> </it-autoflight>
<apu> <apu>
<rpm type="float">0</rpm> <rpm type="float">0</rpm>
<egt type="float">0</egt> <egt type="float">0</egt>
</apu> </apu>
<autopilot>
<autobrake>
<config>
<idle-throttle type="double">0.1</idle-throttle>
<pilot-input type="double">0</pilot-input>
</config>
<step type="int">0</step>
</autobrake>
</autopilot>
<controls> <controls>
<adirs n="0"> <adirs n="0">
@ -446,7 +436,7 @@
</lighting> </lighting>
<switches> <switches>
<!-- Smoking is bad :P --> <!-- Smoking is bad :P -->
<no-smoking-sign type="bool">true</no-smoking-sign> <no-smoking-sign type="bool">1</no-smoking-sign>
<seatbelt-sign type="bool">0</seatbelt-sign> <seatbelt-sign type="bool">0</seatbelt-sign>
<annun-test>0</annun-test> <annun-test>0</annun-test>
</switches> </switches>

View file

@ -33,8 +33,8 @@
<object-name>BatteryBtn12O</object-name> <object-name>BatteryBtn12O</object-name>
<object-name>BatteryBtn21F</object-name> <object-name>BatteryBtn21F</object-name>
<object-name>BatteryBtn22O</object-name> <object-name>BatteryBtn22O</object-name>
<object-name>Battery-lvl</object-name> <object-name>Battery-volt</object-name>
<object-name>Battery-lvl-test</object-name> <object-name>Battery-volt-test</object-name>
<object-name>BlueElecPump1F</object-name> <object-name>BlueElecPump1F</object-name>
<object-name>BlueElecPump2O</object-name> <object-name>BlueElecPump2O</object-name>
<object-name>BusTieBtn2O</object-name> <object-name>BusTieBtn2O</object-name>
@ -95,7 +95,8 @@
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>Adirs-coords</object-name> <object-name>Adirs-coords</object-name>
<object-name>Battery-lvl</object-name> <object-name>Battery-volt</object-name>
<object-name>Battery-volt-test</object-name>
<emission> <emission>
<red>1</red> <red>1</red>
<green>1</green> <green>1</green>
@ -1690,9 +1691,9 @@
<binding> <binding>
<command>property-cycle</command> <command>property-cycle</command>
<property>/controls/pneumatic/switches/pack-flo</property> <property>/controls/pneumatic/switches/pack-flo</property>
<value>7</value>
<value>9</value>
<value>11</value> <value>11</value>
<value>9</value>
<value>7</value>
</binding> </binding>
</action> </action>
</animation> </animation>
@ -2579,7 +2580,7 @@
<!-- Texts --> <!-- Texts -->
<text> <text>
<name>Adirs-coords</name> <name>Adirs-coords</name>
<offsets> <offsets>
<x-m>0.005</x-m> <x-m>0.005</x-m>
@ -2595,18 +2596,18 @@
<format type="string">%s</format> <format type="string">%s</format>
<property>/controls/adirs/display/text</property> <property>/controls/adirs/display/text</property>
<font type="string">LED-8.txf</font> <font type="string">LED-8.txf</font>
<draw-text>true</draw-text> <draw-text type="bool">true</draw-text>
<draw-alignment>false</draw-alignment> <draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox>false</draw-boundingbox> <draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0095</character-size> <character-size>0.0095</character-size>
<font-resolution> <font-resolution>
<width>32</width> <width type="int">32</width>
<height>32</height> <height type="int">32</height>
</font-resolution> </font-resolution>
</text> </text>
<text> <text>
<name>Battery-lvl</name> <name>Battery-volt</name>
<offsets> <offsets>
<x-m>-0.008</x-m> <x-m>-0.008</x-m>
<y-m>-0.057</y-m> <y-m>-0.057</y-m>
@ -2621,18 +2622,18 @@
<format type="string">%2.1f</format> <format type="string">%2.1f</format>
<property>/systems/electrical/battery1-volts</property> <property>/systems/electrical/battery1-volts</property>
<font type="string">led.txf</font> <font type="string">led.txf</font>
<draw-text>true</draw-text> <draw-text type="bool">true</draw-text>
<draw-alignment>false</draw-alignment> <draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox>false</draw-boundingbox> <draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.007</character-size> <character-size>0.007</character-size>
<font-resolution> <font-resolution>
<width>32</width> <width type="int">32</width>
<height>32</height> <height type="int">32</height>
</font-resolution> </font-resolution>
</text> </text>
<text> <text>
<name>Battery-lvl-test</name> <name>Battery-volt-test</name>
<offsets> <offsets>
<x-m>-0.008</x-m> <x-m>-0.008</x-m>
<y-m>-0.057</y-m> <y-m>-0.057</y-m>
@ -2647,18 +2648,18 @@
<format type="string">88.8</format> <format type="string">88.8</format>
<property>autopilot/serviceable</property> <property>autopilot/serviceable</property>
<font type="string">led.txf</font> <font type="string">led.txf</font>
<draw-text>true</draw-text> <draw-text type="bool">true</draw-text>
<draw-alignment>false</draw-alignment> <draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox>false</draw-boundingbox> <draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.007</character-size> <character-size>0.007</character-size>
<font-resolution> <font-resolution>
<width>32</width> <width type="int">32</width>
<height>32</height> <height type="int">32</height>
</font-resolution> </font-resolution>
</text> </text>
<text> <text>
<name>Battery-lvl</name> <name>Battery-volt</name>
<offsets> <offsets>
<x-m>-0.008</x-m> <x-m>-0.008</x-m>
<y-m>0.035</y-m> <y-m>0.035</y-m>
@ -2673,18 +2674,18 @@
<format type="string">%2.1f</format> <format type="string">%2.1f</format>
<property>/systems/electrical/battery2-volts</property> <property>/systems/electrical/battery2-volts</property>
<font type="string">led.txf</font> <font type="string">led.txf</font>
<draw-text>true</draw-text> <draw-text type="bool">true</draw-text>
<draw-alignment>false</draw-alignment> <draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox>false</draw-boundingbox> <draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.007</character-size> <character-size>0.007</character-size>
<font-resolution> <font-resolution>
<width>32</width> <width type="int">32</width>
<height>32</height> <height type="int">32</height>
</font-resolution> </font-resolution>
</text> </text>
<text> <text>
<name>Battery-lvl-test</name> <name>Battery-volt-test</name>
<offsets> <offsets>
<x-m>-0.008</x-m> <x-m>-0.008</x-m>
<y-m>0.035</y-m> <y-m>0.035</y-m>
@ -2699,19 +2700,19 @@
<format type="string">88.8</format> <format type="string">88.8</format>
<property>autopilot/serviceable</property> <property>autopilot/serviceable</property>
<font type="string">led.txf</font> <font type="string">led.txf</font>
<draw-text>true</draw-text> <draw-text type="bool">true</draw-text>
<draw-alignment>false</draw-alignment> <draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox>false</draw-boundingbox> <draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.007</character-size> <character-size>0.007</character-size>
<font-resolution> <font-resolution>
<width>32</width> <width type="int">32</width>
<height>32</height> <height type="int">32</height>
</font-resolution> </font-resolution>
</text> </text>
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>Battery-lvl</object-name> <object-name>Battery-volt</object-name>
<condition> <condition>
<equals> <equals>
<property>/controls/switches/annun-test</property> <property>/controls/switches/annun-test</property>
@ -2722,7 +2723,7 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>Battery-lvl-test</object-name> <object-name>Battery-volt-test</object-name>
<condition> <condition>
<equals> <equals>
<property>/controls/switches/annun-test</property> <property>/controls/switches/annun-test</property>

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 401 KiB

After

Width:  |  Height:  |  Size: 435 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 470 KiB

After

Width:  |  Height:  |  Size: 428 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 331 KiB

After

Width:  |  Height:  |  Size: 331 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 MiB

After

Width:  |  Height:  |  Size: 487 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 497 KiB

After

Width:  |  Height:  |  Size: 488 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 KiB

After

Width:  |  Height:  |  Size: 280 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 489 KiB

After

Width:  |  Height:  |  Size: 479 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 511 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 604 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 450 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 526 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 485 KiB

After

Width:  |  Height:  |  Size: 477 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 432 KiB

After

Width:  |  Height:  |  Size: 434 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 515 KiB

After

Width:  |  Height:  |  Size: 507 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 KiB

After

Width:  |  Height:  |  Size: 469 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 497 KiB

After

Width:  |  Height:  |  Size: 488 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 484 KiB

After

Width:  |  Height:  |  Size: 474 KiB

View file

@ -283,14 +283,14 @@
</filter> </filter>
<pid-controller> <pid-controller>
<name>AP PITCH HELPER PLUS</name> <name>FBW PITCH HELPER PLUS</name>
<debug>false</debug> <debug>false</debug>
<enable> <enable>
<condition> <condition>
<and> <and>
<greater-than> <greater-than>
<property>/controls/flight/elevator-fbw</property> <property>/controls/flight/elevator-fbw</property>
<value>0.1</value> <value>0.01</value>
</greater-than> </greater-than>
<equals> <equals>
<property>/it-autoflight/output/ap1</property> <property>/it-autoflight/output/ap1</property>
@ -327,7 +327,7 @@
<property>/controls/flight/elevator-trim-cmd</property> <property>/controls/flight/elevator-trim-cmd</property>
</output> </output>
<config> <config>
<Kp>0.08</Kp> <Kp>0.09</Kp>
<beta>1.0</beta> <beta>1.0</beta>
<alpha>0.1</alpha> <alpha>0.1</alpha>
<gamma>0.0</gamma> <gamma>0.0</gamma>
@ -346,7 +346,7 @@
<and> <and>
<less-than> <less-than>
<property>/controls/flight/elevator-fbw</property> <property>/controls/flight/elevator-fbw</property>
<value>-0.1</value> <value>-0.01</value>
</less-than> </less-than>
<equals> <equals>
<property>/it-autoflight/output/ap1</property> <property>/it-autoflight/output/ap1</property>
@ -383,7 +383,7 @@
<property>/controls/flight/elevator-trim-cmd</property> <property>/controls/flight/elevator-trim-cmd</property>
</output> </output>
<config> <config>
<Kp>-0.08</Kp> <Kp>-0.09</Kp>
<beta>1.0</beta> <beta>1.0</beta>
<alpha>0.1</alpha> <alpha>0.1</alpha>
<gamma>0.0</gamma> <gamma>0.0</gamma>
@ -429,11 +429,11 @@
<or> <or>
<greater-than> <greater-than>
<property>/controls/flight/elevator-fbw</property> <property>/controls/flight/elevator-fbw</property>
<value>0.05</value> <value>0.01</value>
</greater-than> </greater-than>
<less-than> <less-than>
<property>/controls/flight/elevator-fbw</property> <property>/controls/flight/elevator-fbw</property>
<value>-0.05</value> <value>-0.01</value>
</less-than> </less-than>
</or> </or>
</and> </and>