Skip to content

Commit

Permalink
KAP140: Upstream update to reiszner/KAP140@8e24f86
Browse files Browse the repository at this point in the history 
Refactoring to button press events, so external hardware can more easily integrate with the KAP140

(Dedicated to Angi, who put my brain into autopilot :) I love you)
  • Loading branch information
@hbeni
hbeni committed Nov 3, 2022
1 parent 5498f25 commit a88a8e6
Show file tree
Hide file tree
Showing 6 changed files with 633 additions and 1,336 deletions.
6 changes: 4 additions & 2 deletions Models/Instruments/Avionics/kap140/kap140-properties.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<hsi-installed type="bool">false</hsi-installed>
<baro-tied type="bool">false</baro-tied>
</config>
<event>
<button-cws type="bool">false</button-cws>
<button-disc type="bool">false</button-disc>
</event>
<panel>
<state type="int">0</state>
<state-old type="int">0</state-old>
Expand Down Expand Up @@ -92,8 +96,6 @@
</elevator-trim-servo>
</servo>
<settings>
<ap-disc type="bool">false</ap-disc>
<cws type="bool">false</cws>
<from-hdg type="bool">false</from-hdg>
<lateral-mode type="int">0</lateral-mode>
<lateral-arm type="int">0</lateral-arm>
Expand Down
32 changes: 14 additions & 18 deletions Models/Instruments/Avionics/kap140/kap140-proprules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ We have captured the localizer and the GS.
<output>autopilot/kap140/panel/baro-timer</output>
<output>autopilot/kap140/panel/nav-timer</output>
<output>autopilot/kap140/panel/gs-timer</output>
<output>autopilot/kap140/settings/cws</output>
<output>autopilot/kap140/settings/ap-disc</output>
<output>autopilot/kap140/event/button-cws</output>
<output>autopilot/kap140/event/button-disc</output>
<output>autopilot/kap140/servo/roll-servo/check-timer</output>
<output>autopilot/kap140/servo/pitch-servo/check-timer</output>
</filter>
Expand Down Expand Up @@ -1098,7 +1098,7 @@ We have captured the localizer and the GS.
<property>autopilot/kap140/roll-axis-fail</property>
<not><property>autopilot/kap140/sensors/turn-indicator-operable</property></not>
<and>
<not><property>autopilot/kap140/settings/cws</property></not>
<not><property>autopilot/kap140/event/button-cws</property></not>
<property>autopilot/kap140/sensors/excess-g</property>
</and>
<and>
Expand Down Expand Up @@ -1167,8 +1167,8 @@ We have captured the localizer and the GS.
<output>autopilot/kap140/panel/baro-timer</output>
<output>autopilot/kap140/panel/digit-timer</output>
<output>autopilot/kap140/panel/button-ap</output>
<output>autopilot/kap140/settings/cws</output>
<output>autopilot/kap140/settings/ap-disc</output>
<output>autopilot/kap140/event/button-cws</output>
<output>autopilot/kap140/event/button-disc</output>
<output>autopilot/kap140/sensors/pitch-up</output>
<output>autopilot/kap140/sensors/pitch-down</output>
</filter>
Expand All @@ -1181,15 +1181,15 @@ We have captured the localizer and the GS.
<debug>false</debug>
<enable>
<condition>
<property>autopilot/kap140/settings/ap-disc</property>
<property>autopilot/kap140/event/button-disc</property>
<less-than>
<property>autopilot/kap140/panel/state</property>
<value>6</value>
</less-than>
</condition>
</enable>
<input>0</input>
<output>autopilot/kap140/settings/ap-disc</output>
<output>autopilot/kap140/event/button-disc</output>
</filter>

<filter>
Expand All @@ -1198,7 +1198,7 @@ We have captured the localizer and the GS.
<debug>false</debug>
<enable>
<condition>
<property>autopilot/kap140/settings/ap-disc</property>
<property>autopilot/kap140/event/button-disc</property>
<equals>
<property>autopilot/kap140/panel/state</property>
<value>6</value>
Expand All @@ -1219,7 +1219,7 @@ We have captured the localizer and the GS.
<debug>false</debug>
<enable>
<condition>
<property>autopilot/kap140/settings/ap-disc</property>
<property>autopilot/kap140/event/button-disc</property>
<equals>
<property>autopilot/kap140/panel/state</property>
<value>6</value>
Expand Down Expand Up @@ -1646,7 +1646,7 @@ We have captured the localizer and the GS.
<property>autopilot/kap140/settings/vertical-mode</property>
<value>1</value>
</equals>
<property>autopilot/kap140/settings/cws</property>
<property>autopilot/kap140/event/button-cws</property>
</condition>
</enable>
<input>autopilot/internal/vert-speed-fpm</input>
Expand Down Expand Up @@ -1698,7 +1698,7 @@ We have captured the localizer and the GS.
<property>autopilot/kap140/settings/vertical-mode</property>
<value>1</value>
</equals>
<not><property>autopilot/kap140/settings/cws</property></not>
<not><property>autopilot/kap140/event/button-cws</property></not>
<not-equals>
<expression>
<mod>
Expand Down Expand Up @@ -1746,7 +1746,7 @@ We have captured the localizer and the GS.
<property>autopilot/kap140/settings/vertical-mode</property>
<value>2</value>
</equals>
<property>autopilot/kap140/settings/cws</property>
<property>autopilot/kap140/event/button-cws</property>
</condition>
</enable>
<input>
Expand Down Expand Up @@ -1869,7 +1869,6 @@ We have captured the localizer and the GS.
<value>6</value>
</less-than>
<property>instrumentation/nav-source/signal-valid</property>

<or>
<!-- with DG+ROL mode: capture once the calculated intercept course is smaller than the commanded ROL course difference -->
<and>
Expand All @@ -1878,7 +1877,6 @@ We have captured the localizer and the GS.
<property>autopilot/kap140/settings/lateral-mode</property>
<value>1</value>
</equals>

<greater-than-equals>
<expression>
<difference>
Expand All @@ -1889,7 +1887,6 @@ We have captured the localizer and the GS.
<value>0</value>
</greater-than-equals>
</and>

<!-- with HSI or DG+HDG: capture just using the radial course error -->
<property alias="/params/hsi-installed" />
<and>
Expand All @@ -1899,7 +1896,6 @@ We have captured the localizer and the GS.
</not-equals>
</and>
</or>

<less-than>
<expression>
<abs><property>instrumentation/nav-source/heading-needle-deflection-norm</property></abs>
Expand Down Expand Up @@ -2794,7 +2790,7 @@ We have captured the localizer and the GS.
<value>6</value>
</equals>
<not><property>/autopilot/kap140/roll-axis-fail</property></not>
<not><property>/autopilot/kap140/settings/cws</property></not>
<not><property>/autopilot/kap140/event/button-cws</property></not>
</input>
<output>/autopilot/internal/logic/roll-active</output>
</logic>
Expand Down Expand Up @@ -2944,7 +2940,7 @@ We have captured the localizer and the GS.
<value>6</value>
</equals>
<not><property>/autopilot/kap140/pitch-axis-fail</property></not>
<not><property>/autopilot/kap140/settings/cws</property></not>
<not><property>/autopilot/kap140/event/button-cws</property></not>
</input>
<output>/autopilot/internal/logic/pitch-active</output>
</logic>
Expand Down
Loading

0 comments on commit a88a8e6

Please sign in to comment.