From c7a8502893091b9acab9c23c29c5c18d316704f3 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 23 Jun 2018 11:43:08 -0400 Subject: [PATCH] 3D: Fix missing pushback, enable the new model for it --- Models/A320-100-CFM.xml | 24 +- Models/A320-200-CFM.xml | 23 +- Models/A320-200-IAE.xml | 21 +- Models/A320neo-CFM.xml | 26 +- Models/A320neo-PW.xml | 24 +- Models/Goldhofert-autopush.xml | 130 ---------- Models/Services/Pushback/Douglas.xml | 371 +++++++++++++-------------- Systems/a320-fcs.xml | 7 + revision.txt | 2 +- 9 files changed, 227 insertions(+), 401 deletions(-) delete mode 100644 Models/Goldhofert-autopush.xml diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml index 4e6fb174..b03a9ab4 100644 --- a/Models/A320-100-CFM.xml +++ b/Models/A320-100-CFM.xml @@ -15,12 +15,11 @@ 1.7005004 - Fuselage Aircraft/IDG-A32X/Models/Fuselages/A320-100/fuselage.xml - - + + Flightdeck @@ -316,23 +315,14 @@ Pushback - Models/Goldhofert-autopush.xml + Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml - 5.55 + 6.0 0 - -4.14 - - + -4.24 - - Aircraft/Generic/marker.xml - - - - + @@ -362,7 +352,7 @@ livery_update.stop(); - + ground_services diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml index 3b2f71bd..4744be8e 100644 --- a/Models/A320-200-CFM.xml +++ b/Models/A320-200-CFM.xml @@ -18,8 +18,8 @@ Fuselage Aircraft/IDG-A32X/Models/Fuselages/A320/fuselage.xml - - + + Flightdeck @@ -341,27 +341,18 @@ -1.25 - - Aircraft/Generic/marker.xml - Pushback - Models/Goldhofert-autopush.xml + Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml - 5.55 + 6.0 0 - -4.14 - - + -4.24 - - - + @@ -391,7 +382,7 @@ livery_update.stop(); - + ground_services diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index bc17b952..05569058 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -344,23 +344,14 @@ Pushback - Models/Goldhofert-autopush.xml + Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml - 5.55 + 6.0 0 - -4.14 - - + -4.24 - - Aircraft/Generic/marker.xml - - - - + @@ -390,8 +381,8 @@ livery_update.stop(); - - + + ground_services diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml index 8b47fce4..4f6911f6 100644 --- a/Models/A320neo-CFM.xml +++ b/Models/A320neo-CFM.xml @@ -15,12 +15,11 @@ 1.7005004 - Fuselage Aircraft/IDG-A32X/Models/Fuselages/A320neo/fuselage.xml - - + + Flightdeck @@ -325,23 +324,14 @@ Pushback - Models/Goldhofert-autopush.xml + Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml - 5.55 + 6.0 0 - -4.14 - - + -4.24 - - Aircraft/Generic/marker.xml - - - - + @@ -371,8 +361,8 @@ livery_update.stop(); - - + + ground_services diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml index 03f9897b..f20d9e2a 100644 --- a/Models/A320neo-PW.xml +++ b/Models/A320neo-PW.xml @@ -15,12 +15,11 @@ 1.7005004 - Fuselage Aircraft/IDG-A32X/Models/Fuselages/A320neo/fuselage.xml - - + + Flightdeck @@ -325,23 +324,14 @@ Pushback - Models/Goldhofert-autopush.xml + Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml - 5.55 + 6.0 0 - -4.14 - - + -4.24 - - Aircraft/Generic/marker.xml - - - - + @@ -378,7 +368,7 @@ livery_update.stop(); - + ground_services diff --git a/Models/Goldhofert-autopush.xml b/Models/Goldhofert-autopush.xml deleted file mode 100644 index 1f256db7..00000000 --- a/Models/Goldhofert-autopush.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - Models/Airport/Pushback/Goldhofert.ac - - - - - Models/Airport/Pushback/Goldhofert-warning-light.xml - - -2.908 - 0.260 - 1.326 - 0 - - - - - Models/Airport/Pushback/Goldhofert-warning-light.xml - - -1.781 - 0.260 - 1.326 - 90 - - - - - spin - wheelfl - wheelfr - - gear/gear[0]/rollspeed-ms - -16.3 -
- -2.8976 - 0 - 0.5809 -
- - 0 - 1 - 0 - -
- - - spin - wheelrl - wheelrr - - gear/gear[0]/rollspeed-ms - -16.3 -
- 2.0501 - 0 - 0.5735 -
- - 0 - 1 - 0 - -
- - - select - - - sim/model/pushback/connected - - - - - rotate - - gear/gear/steering-norm - - 70.0 -
- 0 - 0 - 0 -
- - 0 - 0 - -1 - -
- - - translate - - gear/gear[0]/compression-ft - 0.3048 - - 0 - 0 - 1 - - - - - rotate - - orientation/pitch-deg - - 2.0 -
- 0 - 0 - 0 -
- - 0 - 1 - 0 - -
-
diff --git a/Models/Services/Pushback/Douglas.xml b/Models/Services/Pushback/Douglas.xml index 9b7f2987..d2a9219f 100644 --- a/Models/Services/Pushback/Douglas.xml +++ b/Models/Services/Pushback/Douglas.xml @@ -1,198 +1,195 @@ + - Douglas.ac - + + + Douglas.ac - + + + textranslate + /sim/time/sun-angle-rad + 1.60 + 0.318471338 +
+ 0 + 0 + 0 +
+ + -1 + 0 + 0 + +
- - textranslate - /sim/time/sun-angle-rad - 1.60 - 0.318471338 -
- 0 - 0 - 0 -
- - -1 - 0 - 0 - -
+ + material + + + /sim/time/sun-angle-rad + 1.60 + + + + 1 + 1 + 1 + + - - material - - - /sim/time/sun-angle-rad - 1.60 - - - - 1 - 1 - 1 - - + + material + + + /sim/time/sun-angle-rad + 1.60 + + + + 0 + 0 + 0 + + - - material - - - /sim/time/sun-angle-rad - 1.60 - - - - 0 - 0 - 0 - - + + select + + sim/model/pushback/enabled + gear/gear[0]/wow + + - - select - - sim/model/pushback/enabled - gear/gear[0]/wow - - + + rotate + fdm/jsbsim/fcs/pushback-steer-deg + -1 +
+ 1.53665 + 0 + 0 +
+ + 0 + 0 + 1 + +
- - rotate - - - sim/model/pushback/position-norm - 0.99 - - - gear/gear[0]/steering-norm - -70 -
- 3 - 0 - 0 -
- - 0 - 0 - 1 - -
+ + + rotate + sim/model/pushback/position-norm + -90 + 90 +
+ 0 + 0 + 0 +
+ + 0 + 0 + 1 + +
- - - rotate - sim/model/pushback/position-norm - -90 - 90 -
- 0 - 0 - 0 -
- - 0 - 0 - 1 - -
+ + + translate + gear/gear[0]/compression-ft + 0.3048 + + 0 + 0 + 1 + + - - - translate - gear/gear[0]/compression-ft - 0.3048 - - 0 - 0 - 1 - - - - - - translate - sim/model/pushback/position-norm - - 1.0000000.000000 - 0.9500001.961477 - 0.9000003.910862 - 0.8500005.836134 - 0.8000007.725425 - 0.7500009.567086 - 0.70000011.349763 - 0.65000013.062464 - 0.60000014.694631 - 0.55000016.236201 - 0.50000017.677670 - 0.45000019.010149 - 0.40000020.225425 - 0.35000021.316004 - 0.30000022.275163 - 0.25000023.096988 - 0.20000023.776413 - 0.15000024.309248 - 0.10000024.692209 - 0.05000024.922933 - 0.00000025.000000 - - - -1 - 0 - 0 - - - - translate - sim/model/pushback/position-norm - - 1.0000000.000000 - 0.9500000.077067 - 0.9000000.307791 - 0.8500000.690752 - 0.8000001.223587 - 0.7500001.903012 - 0.7000002.724837 - 0.6500003.683996 - 0.6000004.774575 - 0.5500005.989851 - 0.5000007.322330 - 0.4500008.763799 - 0.40000010.305369 - 0.35000011.937536 - 0.30000013.650238 - 0.25000015.432914 - 0.20000017.274575 - 0.15000019.163866 - 0.10000021.089138 - 0.05000023.038523 - 0.00000025.000000 - - - 0 - -1 - 0 - - - - - rotate - orientation/pitch-deg - -1 -
- 0 - 0 - 0 -
- - 0 - 1 - 0 - -
-
+ + + translate + sim/model/pushback/position-norm + + 1.0000000.000000 + 0.9500001.961477 + 0.9000003.910862 + 0.8500005.836134 + 0.8000007.725425 + 0.7500009.567086 + 0.70000011.349763 + 0.65000013.062464 + 0.60000014.694631 + 0.55000016.236201 + 0.50000017.677670 + 0.45000019.010149 + 0.40000020.225425 + 0.35000021.316004 + 0.30000022.275163 + 0.25000023.096988 + 0.20000023.776413 + 0.15000024.309248 + 0.10000024.692209 + 0.05000024.922933 + 0.00000025.000000 + + + -1 + 0 + 0 + + + + + translate + sim/model/pushback/position-norm + + 1.0000000.000000 + 0.9500000.077067 + 0.9000000.307791 + 0.8500000.690752 + 0.8000001.223587 + 0.7500001.903012 + 0.7000002.724837 + 0.6500003.683996 + 0.6000004.774575 + 0.5500005.989851 + 0.5000007.322330 + 0.4500008.763799 + 0.40000010.305369 + 0.35000011.937536 + 0.30000013.650238 + 0.25000015.432914 + 0.20000017.274575 + 0.15000019.163866 + 0.10000021.089138 + 0.05000023.038523 + 0.00000025.000000 + + + 0 + -1 + 0 + + + + + + rotate + orientation/pitch-deg + -1 +
+ 0 + 0 + 0 +
+ + 0 + 1 + 0 + +
+ diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 28a69dbf..837b49e7 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1919,6 +1919,13 @@ 70 fcs/steer-pos-deg[0] + + + + + /sim/model/pushback/position-norm gt 0.999 + + diff --git a/revision.txt b/revision.txt index a06e235b..2ddf42af 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4510 \ No newline at end of file +4511 \ No newline at end of file