From 712afc68990b834539ef47b8b3babbc9a51cb9bc Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 1 Dec 2017 07:24:52 -0500 Subject: [PATCH] A32X: fix ground service dialog, formatting --- AircraftConfig/groundservices.xml | 375 ++++++++++++------------------ AircraftConfig/main.xml | 125 ++++++++-- Nasal/ground_services.nas | 96 +++----- revision.txt | 2 +- 4 files changed, 288 insertions(+), 310 deletions(-) diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml index 8839fa3b..b9ed9875 100644 --- a/AircraftConfig/groundservices.xml +++ b/AircraftConfig/groundservices.xml @@ -4,10 +4,9 @@ ############################################## # Copyright (c) Joshua Davidson (it0uchpods) # ############################################## -# modified by D-ECHO for Ground Services --> - + @@ -32,244 +31,156 @@ - + + + + vbox + + + + left + /services/deicing_truck/enable + + dialog-apply + + true + + + + + + + left + + /services/fuel-truck/connect + + /services/fuel-truck/enable + + dialog-apply + + true + + + + + left + + /services/fuel-truck/enable + + /services/fuel-truck/connect + + dialog-apply + + true + + + + + left + /services/catering/enable + + dialog-apply + + true + + + + + + + left + /services/baggage/enable + + dialog-apply + + true + - vbox + hbox - - - left - /services/deicing_truck/enable - - dialog-apply - - true - - - - - - - left - - /services/fuel-truck/connect - - /services/fuel-truck/enable - - dialog-apply - - true - - - - - left - - /services/fuel-truck/enable - - /services/fuel-truck/connect - - dialog-apply - - true - - - - - left - /services/catering/enable - - dialog-apply - - true - - - - - - - left - /services/baggage/enable - - dialog-apply - - true - - - - + + true + - - - - left - /services/stairs/l1 - - dialog-apply - - true - - - - - left - /services/stairs/l4 - - dialog-apply - - true - - - - - left - /services/stairs/cover - - dialog-apply - - true - - - - - - - - - - - left - /services/chokes/nose - - dialog-apply - - true - - - - - left - /services/chokes/left - - dialog-apply - - true - - - - - left - /services/chokes/right - - dialog-apply - - true - - - - - - - - - - left - /controls/switches/cart - - property-assign - /controls/electrical/switches/gen-ext - 0 - - - - - /controls/gear/brake-parking - 1 - - - /velocities/groundspeed-kt - 2 - - - - - dialog-apply - - true - - - - - left - /controls/pneumatic/switches/groundair - - property-toggle - /controls/pneumatic/switches/groundair - - - - - /controls/gear/brake-parking - 1 - - - /velocities/groundspeed-kt - 2 - - - - - dialog-apply - - true - - + + true + + + + left + /services/stairs/l1 + + dialog-apply + + true + + + + + left + /services/stairs/l4 + + dialog-apply + + true + + + + + left + /services/stairs/cover + + dialog-apply + + true + + diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml index 899949fd..eef6d27c 100644 --- a/AircraftConfig/main.xml +++ b/AircraftConfig/main.xml @@ -193,11 +193,102 @@ nasal + + + left + /services/chokes/nose + + dialog-apply + + + /systems/acconfig/unused/unused + + true + + + + + left + /services/chokes/left + + dialog-apply + + + /systems/acconfig/unused/unused + + true + + + + + left + /services/chokes/right + + dialog-apply + + + /systems/acconfig/unused/unused + + true + + + + + left + /controls/switches/cart + + property-assign + /controls/electrical/switches/gen-ext + 0 + + + + + /controls/gear/brake-parking + 1 + + + /velocities/groundspeed-kt + 2 + + + + + dialog-apply + + true + + + + + left + /controls/pneumatic/switches/groundair + + property-toggle + /controls/pneumatic/switches/groundair + + + + + /controls/gear/brake-parking + 1 + + + /velocities/groundspeed-kt + 2 + + + + + dialog-apply + + true + @@ -209,22 +300,22 @@ - - /controls/gear/brake-parking - 1 - - - /velocities/groundspeed-kt - 2 - - - /systems/electrical/bus/ac2 - 115 - - - /controls/electrical/switches/gen-ext - 0 - + + /controls/gear/brake-parking + 1 + + + /velocities/groundspeed-kt + 2 + + + /systems/electrical/bus/ac2 + 115 + + + /controls/electrical/switches/gen-ext + 0 + diff --git a/Nasal/ground_services.nas b/Nasal/ground_services.nas index 811f6765..52721e2e 100644 --- a/Nasal/ground_services.nas +++ b/Nasal/ground_services.nas @@ -1,5 +1,5 @@ -# adapted from 787-8 (omega) - +# A32X Ground Services +# D-ECHO, adapted from omega95 var door = aircraft.door.new("/services/deicing_truck/crane", 20); var door3 = aircraft.door.new("/services/deicing_truck/deicing", 20); @@ -7,75 +7,54 @@ var door3 = aircraft.door.new("/services/deicing_truck/deicing", 20); var ground_services = { init : func { me.UPDATE_INTERVAL = 0.1; - me.loopid = 0; - - me.ice_time = 0; - - # Catering Truck - - setprop("/services/catering/scissor-deg", 0); - setprop("/services/catering/position-norm", 0); - - # De-icing Truck - - setprop("/services/deicing_truck/enable", 0); - setprop("/services/deicing_truck/de-ice", 0); - - # Set them all to 0 if the aircraft is not stationary - - if (getprop("/velocities/groundspeed-kt") > 10) { - setprop("/services/chokes/nose", 0); - setprop("/services/chokes/left", 0); - setprop("/services/chokes/right", 0); - setprop("/services/fuel-truck/enable", 0); - setprop("/services/ext-pwr/enable", 0); - setprop("/services/deicing_truck/enable", 0); - setprop("/services/catering/enable", 0); - } - - me.reset(); - }, - update : func { - - # Chokes and Parking Brakes Control + me.loopid = 0; + me.ice_time = 0; - # if ((getprop("/services/chokes/nose") == 1) or (getprop("/services/chokes/left") == 1) or (getprop("/services/chokes/right") == 1) or (getprop("/controls/parking-brake") == 1)) - # setprop("/controls/gear/brake-parking", 1); - # else - # setprop("/controls/gear/brake-parking", 0); - - - # Catering Truck Controls - - var cater_pos = getprop("/services/catering/position-norm"); - - var scissor_deg = 3.325 * (1/D2R) * math.asin(cater_pos / (2 * 3.6612)); - - setprop("/services/catering/scissor-deg", scissor_deg); - - + # Catering Truck + setprop("/services/catering/scissor-deg", 0); + setprop("/services/catering/position-norm", 0); # De-icing Truck + setprop("/services/deicing_truck/enable", 0); + setprop("/services/deicing_truck/de-ice", 0); - if (getprop("/services/deicing_truck/enable") and getprop("/services/deicing_truck/de-ice")) - { + # Set them all to 0 if the aircraft is not stationary + if (getprop("/velocities/groundspeed-kt") >= 2) { + setprop("/services/chokes/nose", 0); + setprop("/services/chokes/left", 0); + setprop("/services/chokes/right", 0); + setprop("/services/fuel-truck/enable", 0); + setprop("/services/ext-pwr/enable", 0); + setprop("/services/deicing_truck/enable", 0); + setprop("/services/catering/enable", 0); + } + + me.reset(); + }, + update : func { + # Catering Truck Controls + var cater_pos = getprop("/services/catering/position-norm"); + var scissor_deg = 3.325 * (1/D2R) * math.asin(cater_pos / (2 * 3.6612)); + setprop("/services/catering/scissor-deg", scissor_deg); - if (me.ice_time == 2){ + # De-icing Truck + if (getprop("/services/deicing_truck/enable") and getprop("/services/deicing_truck/de-ice")) { + if (me.ice_time == 2) { door.move(1); ground_message ("Lifting De-icing Crane..."); } - if (me.ice_time == 220){ + if (me.ice_time == 220) { door3.move(1); ground_message ("Starting De-icing Process..."); } - if (me.ice_time == 420){ + if (me.ice_time == 420) { door3.move(0); ground_message ("De-icing Process Completed..."); } - if (me.ice_time == 650){ + if (me.ice_time == 650) { door.move(0); ground_message ("Lowering De-icing Crane..."); } @@ -88,12 +67,11 @@ var ground_services = { setprop("/controls/ice/wing/eng2", 30); } - } else + } else { me.ice_time = 0; + } - - me.ice_time += 1; - + me.ice_time += 1; }, reset : func { me.loopid += 1; @@ -110,8 +88,6 @@ var ground_message = func (string) { setprop("/sim/messages/ground", string); } - setlistener("sim/signals/fdm-initialized", func { ground_services.init(); - print("Ground Services ..... Initialized"); }); diff --git a/revision.txt b/revision.txt index b52b8b63..457561c7 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4047 \ No newline at end of file +4048 \ No newline at end of file