ENG page

Models/Instruments/Lower-ECAM/Lower-ECAM-eng.nas

@@ -1,6 +1,11 @@
 # A3XX Lower ECAM Canvas
 # Copyright (c) 2021 Josh Davidson (Octal450) and Jonathan Redpath
 
+var fuel_used_lbs1 = props.globals.getNode("/systems/fuel/fuel-used-1", 1);
+var fuel_used_lbs2 = props.globals.getNode("/systems/fuel/fuel-used-2", 1);
+
+var QT2LTR = 0.946353;
+
 var canvas_lowerECAMPageEng =
 {
 	new: func(svg,name) {
@@ -21,8 +26,108 @@ var canvas_lowerECAMPageEng =
 		obj.units = acconfig_weight_kgs.getValue();
 		
 		# init
+		obj["FUEL-clog-1"].hide();
+		obj["FUEL-clog-2"].hide();
+		obj["OIL-clog-1"].hide();
+		obj["OIL-clog-2"].hide();
+		
+		obj.quantity = [nil, nil];
 		
 		obj.update_items = [
+			props.UpdateManager.FromHashValue("engOilQt1", 0.005, func(val) {
+				if (obj.units) {
+					obj.quantity[0] = sprintf("%2.1f",(0.1 * math.round(val * QT2LTR * 10,5)));
+					obj["OilQT1"].setText(sprintf("%s", left(obj.quantity[0], (size(obj.quantity[0]) == 4 ? 2 : 1))));
+					obj["OilQT1-decimal"].setText(sprintf("%s", right(obj.quantity[0],1)));
+					obj["OilQT1-needle"].setRotation(((val * QT2LTR) + 90) * D2R);
+				} else {
+					obj.quantity[0] = sprintf("%2.1f",(0.1 * math.round(val * 10,5)));
+					obj["OilQT1"].setText(sprintf("%s", left(obj.quantity[0], (size(obj.quantity[0]) == 4 ? 2 : 1))));
+					obj["OilQT1-decimal"].setText(sprintf("%s", right(obj.quantity[0],1)));
+					obj["OilQT1-needle"].setRotation((val + 90) * D2R);
+				}
+			}),
+			props.UpdateManager.FromHashValue("engOilQt2", 0.005, func(val) {
+				if (obj.units) {
+					obj.quantity[1] = sprintf("%2.1f",(0.1 * math.round(val * QT2LTR * 10,5)));
+					obj["OilQT2"].setText(sprintf("%s", left(obj.quantity[1], (size(obj.quantity[1]) == 4 ? 2 : 1))));
+					obj["OilQT2-decimal"].setText(sprintf("%s", right(obj.quantity[1],1)));
+					obj["OilQT2-needle"].setRotation(((val * QT2LTR) + 90) * D2R);
+				} else {
+					obj.quantity[1] = sprintf("%2.1f",(0.1 * math.round(val * 10,5)));
+					obj["OilQT2"].setText(sprintf("%s", left(obj.quantity[1], (size(obj.quantity[1]) == 4 ? 2 : 1))));
+					obj["OilQT2-decimal"].setText(sprintf("%s", right(obj.quantity[1],1)));
+					obj["OilQT2-needle"].setRotation((val + 90) * D2R);
+				}
+			}),
+			props.UpdateManager.FromHashValue("engOilPsi1", 0.25, func(val) {
+				if (val >= 13) {
+					obj["OilPSI1"].setColor(0.0509,0.7529,0.2941);
+					obj["OilPSI1-needle"].setColor(0.0509,0.7529,0.2941);
+				} else {
+					obj["OilPSI1"].setColor(1,0,0);
+					obj["OilPSI1-needle"].setColor(1,0,0);
+				}
+
+				obj["OilPSI1"].setText(sprintf("%s", math.round(val)));
+				obj["OilPSI1-needle"].setRotation((val + 90) * D2R);
+			}),
+			props.UpdateManager.FromHashValue("engOilPsi2", 0.25, func(val) {
+				if (val >= 13) {
+					obj["OilPSI2"].setColor(0.0509,0.7529,0.2941);
+					obj["OilPSI2-needle"].setColor(0.0509,0.7529,0.2941);
+				} else {
+					obj["OilPSI2"].setColor(1,0,0);
+					obj["OilPSI2-needle"].setColor(1,0,0);
+				}
+				
+				obj["OilPSI2"].setText(sprintf("%s", math.round(val)));
+				obj["OilPSI2-needle"].setRotation((val + 90) * D2R);
+			}),
+			props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) {
+				if (val) {
+					obj["Fused-weight-unit"].setText("KG");
+					obj["Fused-oil-unit"].setText("LTR");
+					# immediately update parameters
+					obj.quantity[0] = sprintf("%2.1f",(0.1 * math.round(pts.Engines.Engine.oilQt[0].getValue() * QT2LTR * 10,5)));
+					obj["OilQT1"].setText(sprintf("%s", left(obj.quantity[0], (size(obj.quantity[0]) == 4 ? 2 : 1))));
+					obj["OilQT1-decimal"].setText(sprintf("%s", right(obj.quantity[0],1)));
+					obj["OilQT1-needle"].setRotation(((pts.Engines.Engine.oilQt[0].getValue() * QT2LTR) + 90) * D2R);
+					obj.quantity[1] = sprintf("%2.1f",(0.1 * math.round(pts.Engines.Engine.oilQt[1].getValue() * QT2LTR * 10,5)));
+					obj["OilQT2"].setText(sprintf("%s", left(obj.quantity[1], (size(obj.quantity[1]) == 4 ? 2 : 1))));
+					obj["OilQT2-decimal"].setText(sprintf("%s", right(obj.quantity[1],1)));
+					obj["OilQT2-needle"].setRotation(((pts.Engines.Engine.oilQt[1].getValue() * QT2LTR) + 90) * D2R);
+					obj["FUEL-used-1"].setText(sprintf("%s", math.round(fuel_used_lbs1.getValue() * LBS2KGS, 10)));
+					obj["FUEL-used-2"].setText(sprintf("%s", math.round(fuel_used_lbs2.getValue() * LBS2KGS, 10)));
+				} else {
+					obj["Fused-weight-unit"].setText("LBS");
+					obj["Fused-oil-unit"].setText("QT");
+					obj.quantity[0] = sprintf("%2.1f",(0.1 * math.round(pts.Engines.Engine.oilQt[0].getValue() * 10,5)));
+					obj["OilQT1"].setText(sprintf("%s", left(obj.quantity[0], (size(obj.quantity[0]) == 4 ? 2 : 1))));
+					obj["OilQT1-decimal"].setText(sprintf("%s", right(obj.quantity[0],1)));
+					obj["OilQT1-needle"].setRotation((pts.Engines.Engine.oilQt[0].getValue() + 90) * D2R);
+					obj.quantity[1] = sprintf("%2.1f",(0.1 * math.round(pts.Engines.Engine.oilQt[1].getValue() * 10,5)));
+					obj["OilQT2"].setText(sprintf("%s", left(obj.quantity[1], (size(obj.quantity[1]) == 4 ? 2 : 1))));
+					obj["OilQT2-decimal"].setText(sprintf("%s", right(obj.quantity[1],1)));
+					obj["OilQT2-needle"].setRotation((pts.Engines.Engine.oilQt[1].getValue() + 90) * D2R);
+					obj["FUEL-used-1"].setText(sprintf("%s", math.round(fuel_used_lbs1.getValue(), 10)));
+					obj["FUEL-used-2"].setText(sprintf("%s", math.round(fuel_used_lbs2.getValue(), 10)));
+				}
+			}),
+			props.UpdateManager.FromHashValue("engFuelUsed1", 1, func(val) {
+				if (obj.units) {
+					obj["FUEL-used-1"].setText(sprintf("%s", math.round(val * LBS2KGS, 10)));
+				} else {
+					obj["FUEL-used-1"].setText(sprintf("%s", math.round(val, 10)));
+				}
+			}),
+			props.UpdateManager.FromHashValue("engFuelUsed2", 1, func(val) {
+				if (obj.units) {
+					obj["FUEL-used-2"].setText(sprintf("%s", math.round(val * LBS2KGS, 10)));
+				} else {
+					obj["FUEL-used-2"].setText(sprintf("%s", math.round(val, 10)));
+				}
+			}),
 		];
 		
 		obj.displayedGForce = 0;
@@ -62,10 +167,10 @@ var canvas_lowerECAMPageEng =
 		return ["TAT","SAT","GW","UTCh","UTCm","GLoad","GW-weight-unit"];
 	},
 	getKeys: func() {
-		return["Bulk","BulkLine","BulkLbl","Exit1L","Exit1R","Cabin1Left","Cabin1LeftLbl","Cabin1LeftLine","Cabin1LeftSlide","Cabin1Right","Cabin1RightLbl","Cabin1RightLine","Cabin1RightSlide","Cabin2Left","Cabin2LeftLbl",
+		return["OilQT1-needle","OilQT2-needle","OilQT1","OilQT2","OilQT1-decimal","OilQT2-decimal","OilPSI1-needle","OilPSI2-needle","OilPSI1","OilPSI2",
-		"Cabin2LeftLine","Cabin2LeftSlide","Cabin2Right","Cabin2RightLbl","Cabin2RightLine","Cabin2RightSlide","Cabin3Left","Cabin3LeftLbl","Cabin3LeftLine","Cabin3LeftSlide","Cabin3Right","Cabin3RightLbl","Cabin3RightLine","Cabin3RightSlide","AvionicsLine1",
+		"FUEL-used-1","FUEL-used-2", "Fused-weight-unit","Fused-oil-unit","FUEL-clog-1","FUEL-clog-2","OIL-clog-1","OIL-clog-2","OilTemp1","OilTemp2",
-		"AvionicsLbl1","AvionicsLine2","AvionicsLbl2","Cargo1Line","Cargo1Lbl","Cargo1Door","Cargo2Line","Cargo2Lbl","Cargo2Door","ExitLSlide","ExitLLine","ExitLLbl","ExitRSlide","ExitRLine","ExitRLbl","Cabin4Left","Cabin4LeftLbl","Cabin4LeftLine",
+		"VIB-N1-1","VIB-N1-2","VIB-N2-1","VIB-N2-2"];
-		"Cabin4LeftSlide","Cabin4Right","Cabin4RightLbl","Cabin4RightLine","Cabin4RightSlide","DOOROXY-REGUL-LO-PR"];},
+	},
 	updateBottom: func(notification) {
 		foreach(var update_item_bottom; me.updateItemsBottom)
         {
@@ -140,6 +245,12 @@ var canvas_lowerECAMPageEng =
 };
 
 var input = {
+	engFuelUsed1: "/systems/fuel/fuel-used-1",
+	engFuelUsed2: "/systems/fuel/fuel-used-2",
+	engOilQt1: "/engines/engine[0]/oil-qt-actual",
+	engOilQt2: "/engines/engine[1]/oil-qt-actual",
+	engOilPsi1: "/engines/engine[0]/oil-psi-actual",
+	engOilPsi2: "/engines/engine[1]/oil-psi-actual",
 };
 
 foreach (var name; keys(input)) {

Models/Instruments/Lower-ECAM/Lower-ECAM-old.nas

@@ -46,9 +46,6 @@ var hp_valve_state = 0;
 var xbleedcmdstate = 0;
 var ramAirState = 0;
 
-# Conversion factor pounds to kilogram
-LBS2KGS = 0.4535924;
-
 # Fetch Nodes
 var acconfig_weight_kgs = props.globals.getNode("/systems/acconfig/options/weight-kgs", 1);
 var rate = props.globals.getNode("/systems/acconfig/options/lecam-rate", 1);
@@ -105,10 +102,9 @@ var gs_kt = props.globals.getNode("/velocities/groundspeed-kt", 1);
 var switch_wing_aice = props.globals.getNode("/controls/ice-protection/wing", 1);
 var pack1_bypass = props.globals.getNode("/systems/pneumatics/pack-1-bypass", 1);
 var pack2_bypass = props.globals.getNode("/systems/pneumatics/pack-2-bypass", 1);
-var oil_qt1_actual = props.globals.getNode("/engines/engine[0]/oil-qt-actual", 1);
+var oil_qt1_actual = props.globals.getNode("", 1);
 var oil_qt2_actual = props.globals.getNode("/engines/engine[1]/oil-qt-actual", 1);
-var fuel_used_lbs1 = props.globals.getNode("/systems/fuel/fuel-used-1", 1);
+var fuel_used_lbs1 = props.globals.getNode("", 1);
-var fuel_used_lbs2 = props.globals.getNode("/systems/fuel/fuel-used-2", 1);
 var doorL1_pos = props.globals.getNode("/sim/model/door-positions/doorl1/position-norm", 1);
 var doorR1_pos = props.globals.getNode("/sim/model/door-positions/doorr1/position-norm", 1);
 var doorL4_pos = props.globals.getNode("/sim/model/door-positions/doorl4/position-norm", 1);
@@ -1657,50 +1653,18 @@ var canvas_lowerECAM_eng = {
 		return m;
 	},
 	getKeys: func() {
-		return ["TAT","SAT","GW","UTCh","UTCm","GLoad","GW-weight-unit","OilQT1-needle","OilQT2-needle","OilQT1","OilQT2","OilQT1-decimal","OilQT2-decimal","OilPSI1-needle","OilPSI2-needle","OilPSI1","OilPSI2","FUEL-used-1","FUEL-used-2", "Fused-weight-unit"];
+		return ["TAT","SAT","GW","UTCh","UTCm","GLoad","GW-weight-unit",];
 	},
 	update: func() {
 		# Oil Quantity
-		me["OilQT1"].setText(sprintf("%s", int(oil_qt1_actual.getValue())));
-		me["OilQT2"].setText(sprintf("%s", int(oil_qt2_actual.getValue())));
-		me["OilQT1-decimal"].setText(sprintf("%s", int(10*math.mod(oil_qt1_actual.getValue(),1))));
-		me["OilQT2-decimal"].setText(sprintf("%s", int(10*math.mod(oil_qt2_actual.getValue(),1))));
 		
-		me["OilQT1-needle"].setRotation((oil_qt1.getValue() + 90) * D2R);
-		me["OilQT2-needle"].setRotation((oil_qt2.getValue() + 90) * D2R);
 
 		# Oil Pressure
-		if (pts.Engines.Engine.oilPsi[0].getValue() >= 20) {
-			me["OilPSI1"].setColor(0.0509,0.7529,0.2941);
-			me["OilPSI1-needle"].setColor(0.0509,0.7529,0.2941);
-		} else {
-			me["OilPSI1"].setColor(1,0,0);
-			me["OilPSI1-needle"].setColor(1,0,0);
-		}
 		
-		if (pts.Engines.Engine.oilPsi[1].getValue() >= 20) {
-			me["OilPSI2"].setColor(0.0509,0.7529,0.2941);
-			me["OilPSI2-needle"].setColor(0.0509,0.7529,0.2941);
-		} else {
-			me["OilPSI2"].setColor(1,0,0);
-			me["OilPSI2-needle"].setColor(1,0,0);
-		}
-
-		me["OilPSI1"].setText(sprintf("%s", math.round(pts.Engines.Engine.oilPsi[0].getValue())));
-		me["OilPSI2"].setText(sprintf("%s", math.round(pts.Engines.Engine.oilPsi[1].getValue())));
-
-		me["OilPSI1-needle"].setRotation((oil_psi1.getValue() + 90) * D2R);
-		me["OilPSI2-needle"].setRotation((oil_psi2.getValue() + 90) * D2R);
 
 		# Fuel Used
 		if (acconfig_weight_kgs.getValue()) {
-			me["FUEL-used-1"].setText(sprintf("%s", math.round(fuel_used_lbs1.getValue() * LBS2KGS, 10)));
-			me["FUEL-used-2"].setText(sprintf("%s", math.round(fuel_used_lbs2.getValue() * LBS2KGS, 10)));
-			me["Fused-weight-unit"].setText("KG");
 		} else {
-			me["FUEL-used-1"].setText(sprintf("%s", math.round(fuel_used_lbs1.getValue(), 10)));
-			me["FUEL-used-2"].setText(sprintf("%s", math.round(fuel_used_lbs2.getValue(), 10)));
-			me["Fused-weight-unit"].setText("LBS");
 		}
 		
 		me.updateBottomStatus();

Models/Instruments/Lower-ECAM/res/eng.svg

@@ -12,8 +12,8 @@
    viewBox="0 0 1024 1024"
    version="1.1"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="eng-eis2.svg">
+   sodipodi:docname="eng.svg">
   <metadata
      id="metadata375">
     <rdf:RDF>
@@ -37,14 +37,14 @@
      guidetolerance="10"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
+     inkscape:window-width="1366"
-     inkscape:window-height="1030"
+     inkscape:window-height="705"
      id="namedview371"
      showgrid="true"
-     inkscape:zoom="0.5"
+     inkscape:zoom="1"
-     inkscape:cx="988.67552"
+     inkscape:cx="593.89152"
-     inkscape:cy="398.82462"
+     inkscape:cy="650.40507"
-     inkscape:window-x="1592"
+     inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2">
@@ -81,8 +81,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="500.75214"
      y="977.31793"
-     id="text6232"
+     id="text6232"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3726-1-4-5-7"
        x="500.75214"
@@ -93,8 +92,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="254.86758"
      y="938.9859"
-     id="text6233"
+     id="text6233"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3726-1-4-5-3"
        x="254.86758"
@@ -105,8 +103,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="940.17981"
      y="939.82428"
-     id="GW-weight-unit"
+     id="GW-weight-unit"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3726-1-4-5-7-7"
        x="940.17981"
@@ -117,8 +114,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="695.24951"
      y="939.8045"
-     id="text3912"
+     id="text3912"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3914"
        x="695.24951"
@@ -129,8 +125,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="48.73233"
      y="939.2984"
-     id="text6235"
+     id="text6235"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3914-9"
        x="48.73233"
@@ -141,8 +136,7 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="47.952412"
      y="975.40332"
-     id="text6236"
+     id="text6236"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan3914-9-4"
        x="47.952412"
@@ -154,8 +148,7 @@
      x="212.32626"
      y="938.96637"
      id="TAT"
-     inkscape:label="#text5149"
+     inkscape:label="#text5149"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan5151-5-7-1"
        x="212.32626"
@@ -167,8 +160,7 @@
      x="212.3264"
      y="975.40363"
      id="SAT"
-     inkscape:label="#text5149"
+     inkscape:label="#text5149"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan5151-5-7-1-0"
        x="212.3264"
@@ -180,15 +172,13 @@
      x="925.0899"
      y="939.78522"
      id="GW"
-     inkscape:label="#text5149"
+     inkscape:label="#text5149"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan5151-5-7-1-9"
        x="925.0899"
        y="939.78522"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b">120000</tspan></text>
   <text
-     sodipodi:linespacing="0%"
      id="text4170"
      y="975.42352"
      x="254.86758"
@@ -200,7 +190,6 @@
        id="tspan4172"
        sodipodi:role="line">°C</tspan></text>
   <text
-     sodipodi:linespacing="0%"
      inkscape:label="#text5149"
      id="UTCh"
      y="976.25214"
@@ -218,8 +207,7 @@
      x="560.88452"
      y="976.25214"
      id="UTCm"
-     inkscape:label="#text5149"
+     inkscape:label="#text5149"><tspan
-     sodipodi:linespacing="0%"><tspan
        sodipodi:role="line"
        id="tspan4180"
        x="560.88452"
@@ -236,7 +224,7 @@
        id="tspan861"
        x="512.93152"
        y="940.98541"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999905px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1">G.LOAD 0.6</tspan></text>
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1">G.LOAD 0.6</tspan></text>
   <text
      xml:space="preserve"
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -328,7 +316,8 @@
      style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      x="482.23218"
      y="296.8558"
-     id="text4949"><tspan
+     id="Fused-oil-unit"
+     inkscape:label="#text4949"><tspan
        sodipodi:role="line"
        id="tspan3726-1-4-5-3-5-9-4"
        x="482.23218"
@@ -342,7 +331,7 @@
      id="text4476"><tspan
        sodipodi:role="line"
        id="tspan4478"
-       x="505.625"
+       x="504.4375"
        y="284"
        style="font-size:32px;line-height:1.25"> </tspan></text>
   <text
@@ -668,19 +657,20 @@
      inkscape:transform-center-x="70.6625" />
   <text
      xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
+     style="font-style:normal;font-weight:normal;font-size:12.00003052px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75000191"
-     x="264.69138"
+     x="264.69104"
-     y="181.87299"
+     y="181.87344"
      id="FUEL-used-1"
-     inkscape:label="#text5832"><tspan
+     inkscape:label="#text5832"
+     transform="scale(1.0000025,0.99999749)"><tspan
        sodipodi:role="line"
        id="tspan5830-5-2"
-       x="264.69138"
+       x="264.69104"
-       y="181.87299"
+       y="181.87344"
-       style="font-size:30.00000191px;line-height:1.25;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">0000</tspan></text>
+       style="font-size:30.0000782px;line-height:1.25;fill:#0dc04b;fill-opacity:1;stroke-width:0.75000191">0000</tspan></text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
+     style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
      x="682.74243"
      y="181.74864"
      id="FUEL-used-2"
@@ -690,4 +680,128 @@
        x="682.74243"
        y="181.74864"
        style="font-size:30.00000191px;line-height:1.25;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">0000</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:11.99998569px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bb6100;fill-opacity:1;stroke:none;stroke-width:0.74999911"
+     x="679.57947"
+     y="209.71054"
+     id="FUEL-clog-2"
+     inkscape:label="#text5832"
+     transform="scale(0.9999988,1.0000012)"><tspan
+       sodipodi:role="line"
+       id="tspan5830-2"
+       x="679.57947"
+       y="209.71054"
+       style="font-size:29.99996567px;line-height:1.25;fill:#bb6100;fill-opacity:1;stroke-width:0.74999911">CLOG</tspan></text>
+  <text
+     transform="scale(0.9999988,1.0000012)"
+     inkscape:label="#text5832"
+     id="FUEL-clog-1"
+     y="209.71054"
+     x="261.52823"
+     style="font-style:normal;font-weight:normal;font-size:11.99998569px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bb6100;fill-opacity:1;stroke:none;stroke-width:0.74999911"
+     xml:space="preserve"><tspan
+       style="font-size:29.99996567px;line-height:1.25;fill:#bb6100;fill-opacity:1;stroke-width:0.74999911"
+       y="209.71054"
+       x="261.52823"
+       id="tspan933"
+       sodipodi:role="line">CLOG</tspan></text>
+  <text
+     transform="scale(0.9999988,1.0000012)"
+     inkscape:label="#text5832"
+     id="OIL-clog-2"
+     y="476.71021"
+     x="679.57947"
+     style="font-style:normal;font-weight:normal;font-size:11.99998569px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bb6100;fill-opacity:1;stroke:none;stroke-width:0.74999911"
+     xml:space="preserve"><tspan
+       style="font-size:29.99996567px;line-height:1.25;fill:#bb6100;fill-opacity:1;stroke-width:0.74999911"
+       y="476.71021"
+       x="679.57947"
+       id="tspan937"
+       sodipodi:role="line">CLOG</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:11.99998569px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bb6100;fill-opacity:1;stroke:none;stroke-width:0.74999911"
+     x="261.52823"
+     y="476.71021"
+     id="OIL-clog-1"
+     inkscape:label="#text5832"
+     transform="scale(0.9999988,1.0000012)"><tspan
+       sodipodi:role="line"
+       id="tspan941"
+       x="261.52823"
+       y="476.71021"
+       style="font-size:29.99996567px;line-height:1.25;fill:#bb6100;fill-opacity:1;stroke-width:0.74999911">CLOG</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="327.60934"
+     y="538.25732"
+     id="OilTemp1"
+     inkscape:label="#text5149"><tspan
+       sodipodi:role="line"
+       id="tspan5151-5-8-1"
+       x="327.60934"
+       y="538.25732"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px">22</tspan></text>
+  <text
+     inkscape:label="#text5149"
+     id="VIB-N1-1"
+     y="623.00732"
+     x="327.60934"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px"
+       y="623.00732"
+       x="327.60934"
+       id="tspan981"
+       sodipodi:role="line">0.6</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="327.60934"
+     y="683.75732"
+     id="VIB-N2-1"
+     inkscape:label="#text5149"><tspan
+       sodipodi:role="line"
+       id="tspan985"
+       x="327.60934"
+       y="683.75732"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px">0.1</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="757.85675"
+     y="623.00732"
+     id="VIB-N1-2"
+     inkscape:label="#text5149"><tspan
+       sodipodi:role="line"
+       id="tspan989"
+       x="757.85675"
+       y="623.00732"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px">0.6</tspan></text>
+  <text
+     inkscape:label="#text5149"
+     id="VIB-N2-2"
+     y="683.75732"
+     x="757.85675"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px"
+       y="683.75732"
+       x="757.85675"
+       id="tspan993"
+       sodipodi:role="line">0.1</tspan></text>
+  <text
+     inkscape:label="#text5149"
+     id="OilTemp2"
+     y="538.25732"
+     x="745.15948"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px"
+       y="538.25732"
+       x="745.15948"
+       id="tspan997"
+       sodipodi:role="line">22</tspan></text>
 </svg>

Nasal/Libraries/property-tree-setup.nas

@@ -87,6 +87,7 @@ var Engines = {
 		n1Actual: [props.globals.getNode("/engines/engine[0]/n1-actual"), props.globals.getNode("/engines/engine[1]/n1-actual")],
 		n2Actual: [props.globals.getNode("/engines/engine[0]/n2-actual"), props.globals.getNode("/engines/engine[1]/n2-actual")],
 		oilPsi: [props.globals.getNode("/engines/engine[0]/oil-psi-actual"), props.globals.getNode("/engines/engine[1]/oil-psi-actual")],
+		oilQt: [props.globals.getNode("/engines/engine[0]/oil-qt-actual"), props.globals.getNode("/engines/engine[1]/oil-qt-actual")],
 		thrust: [props.globals.getNode("/engines/engine[0]/thrust-lb"), props.globals.getNode("/engines/engine[1]/thrust-lb")],
 		reverser: [props.globals.getNode("/engines/engine[0]/reverser-pos-norm"), props.globals.getNode("/engines/engine[1]/reverser-pos-norm")],
 		state: [props.globals.getNode("/engines/engine[0]/state"), props.globals.getNode("/engines/engine[1]/state")],