From a89f2e00d960eb26e904c4252571627f9e7363ad Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Mon, 11 Nov 2019 18:59:37 +0000
Subject: [PATCH] A320: fix refuelling t :wq
---
AircraftConfig/fuel.xml | 30 +++++++++++++++++++++++++-----
Nasal/payload.nas | 4 +++-
revision.txt | 2 +-
3 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/AircraftConfig/fuel.xml b/AircraftConfig/fuel.xml
index ce0c1eb6..da20f183 100644
--- a/AircraftConfig/fuel.xml
+++ b/AircraftConfig/fuel.xml
@@ -6,6 +6,15 @@
<PropertyList>
+ <nasal>
+
+ <close>
+ <![CDATA[
+ systems.FUEL.Nodes.requestLbs.setValue(0);
+ ]]>
+ </close>
+ </nasal>
+
<name>fuel-dlg</name>
<layout>vbox</layout>
@@ -132,11 +141,22 @@
<binding>
<command>nasal</command>
<script>
- if ((getprop("/services/fuel-truck/enable") == 1) and (getprop("/services/fuel-truck/connect") == 1)) {
- systems.fuelSvc.refuel();
- screen.log.write("Refueling process started.", 0, 0.584, 1);
- } else
- screen.log.write("Please Enable and Connect the Fuel Truck First!", 1, 0, 0);
+ <![CDATA[
+ if (systems.fuelSvc.Nodes.requestLbs.getValue() > 0) {
+ if ((getprop("/services/fuel-truck/enable") == 1) and getprop("/services/fuel-truck/connect") == 1) {
+ if (systems.fuelSvc.Nodes.requestTotalLbs.getValue() - pts.Consumables.Fuel.totalFuelLbs.getValue() > 0) {
+ systems.fuelSvc.refuel();
+ screen.log.write("Refueling process started.", 0, 0.584, 1);
+ } else {
+ screen.log.write("Refuelling complete.", 0, 0.584, 1);
+ }
+ } else {
+ screen.log.write("Please Enable and Connect the Fuel Truck First!", 1, 0, 0);
+ }
+ } else {
+ screen.log.write("Refuelling quantity incorrect.", 0, 0.584, 1);
+ }
+ ]]>
</script>
</binding>
</button>
diff --git a/Nasal/payload.nas b/Nasal/payload.nas
index a392164b..6a2d1095 100644
--- a/Nasal/payload.nas
+++ b/Nasal/payload.nas
@@ -44,6 +44,7 @@ var fuelSvc = {
stop: func() {
systems.FUEL.refuelling.setBoolValue(0);
+ me.Nodes.requestLbs.setValue(0);
systems.FUEL.Valves.refuelLeft.setBoolValue(0);
systems.FUEL.Valves.refuelCenter.setBoolValue(0);
systems.FUEL.Valves.refuelRight.setBoolValue(0);
@@ -80,7 +81,8 @@ var fuelTimer = maketimer(0.25, func() {
systems.FUEL.Valves.refuelRight.setBoolValue(0);
}
- if (abs(pts.Consumables.Fuel.totalFuelLbs.getValue() - fuelSvc.Nodes.requestTotalLbs.getValue()) < 5) {
+ if (fuelSvc.Nodes.requestTotalLbs.getValue() - pts.Consumables.Fuel.totalFuelLbs.getValue() <= 0) {
+ screen.log.write("Refuelling complete.", 0, 0.584, 1);
fuelSvc.stop();
fuelTimer.stop();
}
diff --git a/revision.txt b/revision.txt
index 9a037142..9d607966 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-10
\ No newline at end of file
+11
\ No newline at end of file