Sim: Autopush tweaks and cleanup

This commit is contained in:
Joshua Davidson 2018-08-24 09:13:37 -04:00
parent cc1622c33b
commit e67bd958f2
10 changed files with 27 additions and 69 deletions

View file

@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</tank> </tank>
</propulsion> </propulsion>
<system file="pushback"/>
<system file="fuel"/> <system file="fuel"/>
<system file="glass-effect1"/> <system file="glass-effect1"/>
<system file="a320-fcs"/> <system file="a320-fcs"/>

View file

@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</tank> </tank>
</propulsion> </propulsion>
<system file="pushback"/>
<system file="fuel"/> <system file="fuel"/>
<system file="glass-effect1"/> <system file="glass-effect1"/>
<system file="a320-fcs"/> <system file="a320-fcs"/>

View file

@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</tank> </tank>
</propulsion> </propulsion>
<system file="pushback"/>
<system file="fuel"/> <system file="fuel"/>
<system file="glass-effect1"/> <system file="glass-effect1"/>
<system file="a320-fcs"/> <system file="a320-fcs"/>

View file

@ -28,7 +28,7 @@
<model> <model>
<pushback> <pushback>
<position-norm>0</position-norm> <position-norm type="double">0</position-norm>
<enabled type="int"/> <enabled type="int"/>
<available type="int">1</available> <available type="int">1</available>
<chocks alias="/controls/gear/wheel-chocks"/> <chocks alias="/controls/gear/wheel-chocks"/>
@ -244,8 +244,7 @@
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
var autopush_dlg = gui.Dialog.new("sim/gui/dialogs/announce/dialog", "Aircraft/IDG-A32X/AircraftConfig/autopush.xml"); acconfig.autopush_dlg.open();
autopush_dlg.open();
</script> </script>
</binding> </binding>
</item> </item>
@ -398,6 +397,18 @@
</fuel> </fuel>
</consumables> </consumables>
<fdm>
<jsbsim>
<external_reactions>
<tractor>
<magnitude alias="/sim/model/pushback/force-lbf"/>
<x alias="/sim/model/pushback/force-x"/>
<y alias="/sim/model/pushback/force-y"/>
</tractor>
</external_reactions>
</jsbsim>
</fdm>
<payload> <payload>
<weight n="0"> <weight n="0">
<name>Cockpit Crew</name> <name>Cockpit Crew</name>
@ -1537,15 +1548,5 @@
<file>Nasal/autopush_route.nas</file> <file>Nasal/autopush_route.nas</file>
</autopush_route> </autopush_route>
</nasal> </nasal>
<fdm>
<jsbsim>
<external_reactions>
<tractor>
<magnitude alias="/sim/model/pushback/force-lbf"/>
<x alias="/sim/model/pushback/force-x"/>
<y alias="/sim/model/pushback/force-y"/>
</tractor>
</external_reactions>
</jsbsim>
</fdm>
</PropertyList> </PropertyList>

View file

@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</tank> </tank>
</propulsion> </propulsion>
<system file="pushback"/>
<system file="fuel"/> <system file="fuel"/>
<system file="glass-effect1"/> <system file="glass-effect1"/>
<system file="a320-fcs"/> <system file="a320-fcs"/>

View file

@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</tank> </tank>
</propulsion> </propulsion>
<system file="pushback"/>
<system file="fuel"/> <system file="fuel"/>
<system file="glass-effect1"/> <system file="glass-effect1"/>
<system file="a320-fcs"/> <system file="a320-fcs"/>

View file

@ -109,6 +109,7 @@ var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Air
var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/IDG-A32X/AircraftConfig/error-mismatch.xml"); var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/IDG-A32X/AircraftConfig/error-mismatch.xml");
var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml"); var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml");
var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-quality.xml"); var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-quality.xml");
var autopush_dlg = gui.Dialog.new("sim/gui/dialogs/autopush/dialog", "Aircraft/IDG-A32X/AircraftConfig/autopush.xml");
spinning.start(); spinning.start();
init_dlg.open(); init_dlg.open();

View file

@ -1,17 +1,13 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- <!--
AUTOPUSH AUTOPUSH
Pushback dialog. Waypoint model.
Copyright (c) 2018 Autopush authors: Copyright (c) 2018 Autopush authors:
Michael Danilov <mike.d.ft402 -eh- gmail.com> Michael Danilov <mike.d.ft402 -eh- gmail.com>
Joshua Davidson http://github.com/it0uchpods Joshua Davidson http://github.com/it0uchpods
Merspieler http://gitlab.com/merspieler Merspieler http://github.com/merspieler
Original code (c) FlightGear
Distribute under the terms of GPLv2. Distribute under the terms of GPLv2.
--> -->
<PropertyList> <PropertyList>
@ -33,9 +29,9 @@ Distribute under the terms of GPLv2.
<button> <button>
<halign>right</halign> <halign>right</halign>
<pref-width>16</pref-width> <pref-width>20</pref-width>
<pref-height>16</pref-height> <pref-height>20</pref-height>
<legend/> <legend>X</legend>
<key>Esc</key> <key>Esc</key>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>
@ -284,7 +280,8 @@ Distribute under the terms of GPLv2.
<row>1</row> <row>1</row>
<col>3</col> <col>3</col>
<halign>left</halign> <halign>left</halign>
<label>Show</label> <label>Always Show</label>
<live>true</live>
<property>/sim/model/pushback/route/show</property> <property>/sim/model/pushback/route/show</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>

View file

@ -1,36 +0,0 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!--
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
-->
<system name="pushback">
<property>/sim/model/pushback/target-speed-fps</property>
<channel name="Pushback">
<switch name="systems/pushback/linked">
<default value="-1"/>
<test value="0">
/sim/model/pushback/position-norm gt 0.95
/gear/gear/wow == 1
gear/unit[0]/wheel-speed-fps lt 50
</test>
</switch>
<summer name="systems/pushback/speed-error">
<input>/sim/model/pushback/target-speed-fps</input>
<input>-gear/unit[0]/wheel-speed-fps</input>
</summer>
<switch name="systems/pushback/force-output">
<default value="0"/>
<test value="systems/pushback/force">
systems/pushback/linked == 0
</test>
<output>external_reactions/pushback/magnitude</output>
</switch>
</channel>
</system>

View file

@ -1 +1 @@
4625 4626