From 9c690c3e177793f276dc7a6fd23765ed4d10aa78 Mon Sep 17 00:00:00 2001 From: Joshua Davidson <joshuadavidson2000@gmail.com> Date: Thu, 20 Dec 2018 00:29:17 -0500 Subject: [PATCH] Control: FBW Tweaked --- Systems/a320-fcs.xml | 36 ++++++++++++------------------------ revision.txt | 2 +- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index a0f8bcf9..51828e5a 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -436,14 +436,10 @@ </test> </switch> - <fcs_function name="fbw/roll/rate-error"> - <function> - <difference> - <property>fbw/roll/p-r_s-s</property> - <property>fbw/roll/rate-demand-lag</property> - </difference> - </function> - </fcs_function> + <summer name="fbw/roll/rate-error"> + <input>fbw/roll/p-r_s-s</input> + <input>-fbw/roll/rate-demand-lag</input> + </summer> <switch name="fbw/roll/trigger"> <default value="0"/> @@ -735,14 +731,10 @@ </function> </fcs_function> - <fcs_function name="fbw/pitch/g-error"> - <function> - <difference> - <property>fbw/pitch/g-computed</property> - <property>fbw/pitch/g-demand</property> - </difference> - </function> - </fcs_function> + <summer name="fbw/pitch/g-error"> + <input>fbw/pitch/g-computed</input> + <input>-fbw/pitch/g-demand</input> + </summer> <!-- Goes to Systems/fbw-pitch.xml then back as fbw/pitch/g-pi --> @@ -883,14 +875,10 @@ </test> </switch> - <fcs_function name="fbw/pitch/rate-error"> - <function> - <difference> - <property>fbw/pitch/t-r_s-s</property> - <property>fbw/pitch/rate-demand-lag</property> - </difference> - </function> - </fcs_function> + <summer name="fbw/pitch/rate-error"> + <input>fbw/pitch/t-r_s-s</input> + <input>-fbw/pitch/rate-demand-lag</input> + </summer> <switch name="fbw/pitch/trigger"> <default value="0"/> diff --git a/revision.txt b/revision.txt index e0af25d9..2fd0758c 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4714 \ No newline at end of file +4715 \ No newline at end of file