Sim: Autopush tweaks and cleanup
This commit is contained in:
Joshua Davidson
parent
cc1622c33b
commit
e67bd958f2
10 changed files with 27 additions and 69 deletions
|
|
@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
|
|||
</tank>
|
||||
</propulsion>
|
||||
|
||||
<system file="pushback"/>
|
||||
<system file="fuel"/>
|
||||
<system file="glass-effect1"/>
|
||||
<system file="a320-fcs"/>
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
|
|||
</tank>
|
||||
</propulsion>
|
||||
|
||||
<system file="pushback"/>
|
||||
<system file="fuel"/>
|
||||
<system file="glass-effect1"/>
|
||||
<system file="a320-fcs"/>
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
|
|||
</tank>
|
||||
</propulsion>
|
||||
|
||||
<system file="pushback"/>
|
||||
<system file="fuel"/>
|
||||
<system file="glass-effect1"/>
|
||||
<system file="a320-fcs"/>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
<model>
|
||||
<pushback>
|
||||
<position-norm>0</position-norm>
|
||||
<position-norm type="double">0</position-norm>
|
||||
<enabled type="int"/>
|
||||
<available type="int">1</available>
|
||||
<chocks alias="/controls/gear/wheel-chocks"/>
|
||||
|
|
@ -244,8 +244,7 @@
|
|||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var autopush_dlg = gui.Dialog.new("sim/gui/dialogs/announce/dialog", "Aircraft/IDG-A32X/AircraftConfig/autopush.xml");
|
||||
autopush_dlg.open();
|
||||
acconfig.autopush_dlg.open();
|
||||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
|
@ -398,6 +397,18 @@
|
|||
</fuel>
|
||||
</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>
|
||||
<weight n="0">
|
||||
<name>Cockpit Crew</name>
|
||||
|
|
@ -1537,15 +1548,5 @@
|
|||
<file>Nasal/autopush_route.nas</file>
|
||||
</autopush_route>
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
|
|||
</tank>
|
||||
</propulsion>
|
||||
|
||||
<system file="pushback"/>
|
||||
<system file="fuel"/>
|
||||
<system file="glass-effect1"/>
|
||||
<system file="a320-fcs"/>
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
|
|||
</tank>
|
||||
</propulsion>
|
||||
|
||||
<system file="pushback"/>
|
||||
<system file="fuel"/>
|
||||
<system file="glass-effect1"/>
|
||||
<system file="a320-fcs"/>
|
||||
|
|
|
|||
|
|
@ -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 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 autopush_dlg = gui.Dialog.new("sim/gui/dialogs/autopush/dialog", "Aircraft/IDG-A32X/AircraftConfig/autopush.xml");
|
||||
spinning.start();
|
||||
init_dlg.open();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,13 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<!--
|
||||
|
||||
AUTOPUSH
|
||||
Pushback dialog.
|
||||
|
||||
Waypoint model.
|
||||
Copyright (c) 2018 Autopush authors:
|
||||
Michael Danilov <mike.d.ft402 -eh- gmail.com>
|
||||
Joshua Davidson http://github.com/it0uchpods
|
||||
Merspieler http://gitlab.com/merspieler
|
||||
Original code (c) FlightGear
|
||||
Merspieler http://github.com/merspieler
|
||||
Distribute under the terms of GPLv2.
|
||||
|
||||
-->
|
||||
|
||||
<PropertyList>
|
||||
|
|
@ -33,9 +29,9 @@ Distribute under the terms of GPLv2.
|
|||
|
||||
<button>
|
||||
<halign>right</halign>
|
||||
<pref-width>16</pref-width>
|
||||
<pref-height>16</pref-height>
|
||||
<legend/>
|
||||
<pref-width>20</pref-width>
|
||||
<pref-height>20</pref-height>
|
||||
<legend>X</legend>
|
||||
<key>Esc</key>
|
||||
<binding>
|
||||
<command>dialog-close</command>
|
||||
|
|
@ -284,7 +280,8 @@ Distribute under the terms of GPLv2.
|
|||
<row>1</row>
|
||||
<col>3</col>
|
||||
<halign>left</halign>
|
||||
<label>Show</label>
|
||||
<label>Always Show</label>
|
||||
<live>true</live>
|
||||
<property>/sim/model/pushback/route/show</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -1 +1 @@
|
|||
4625
|
||||
4626
|
||||
Reference in a new issue