From e498edb4a35fd62df645d5e94a0eb6609b6be700 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Thu, 5 May 2022 14:00:45 +0100
Subject: [PATCH 1/2] Minor formatting

---
 Nasal/Systems/electrical.nas |  3 ---
 Nasal/Systems/tyresmoke.nas  | 14 +++++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Nasal/Systems/electrical.nas b/Nasal/Systems/electrical.nas
index 7a9b8efe..5d939410 100644
--- a/Nasal/Systems/electrical.nas
+++ b/Nasal/Systems/electrical.nas
@@ -192,9 +192,6 @@ var ELEC = {
 		me.Fail.tr1Fault.setBoolValue(0);
 		me.Fail.tr2Fault.setBoolValue(0);
 	},
-	loop: func() {
-		# Empty
-	},
 };
 
 setlistener("/systems/fmgc/power/power-1-on", func(val) {
diff --git a/Nasal/Systems/tyresmoke.nas b/Nasal/Systems/tyresmoke.nas
index 3da224aa..ce925851 100755
--- a/Nasal/Systems/tyresmoke.nas
+++ b/Nasal/Systems/tyresmoke.nas
@@ -10,26 +10,26 @@ var tyresmoke_2 = aircraft.tyresmoke.new(2, 0, 0.8, 0);
 setlistener("/gear/gear[0]/position-norm", func {
 	if (pts.Gear.position[0].getValue()){
 		run_tyresmoke0 = 1;
-	}else{
+	} else {
 		run_tyresmoke0 = 0;
 	}
-},1,0);
+}, 1, 0);
 
 setlistener("/gear/gear[1]/position-norm", func {
 	if (pts.Gear.position[1].getValue()){
 		run_tyresmoke1 = 1;
-	}else{
+	} else {
 		run_tyresmoke1 = 0;
 	}
-},1,0);
+}, 1, 0);
 
 setlistener("/gear/gear[2]/position-norm", func {
 	if (pts.Gear.position[2].getValue()){
 		run_tyresmoke2 = 1;
-	}else{
+	} else {
 		run_tyresmoke2 = 0;
 	}
-},1,0);
+}, 1, 0);
 
 #============================ Rain ===================================
 aircraft.rain.init();
@@ -44,7 +44,7 @@ var tyresmoke_and_rain = func {
 		tyresmoke_2.update();
 	aircraft.rain.update();
 	settimer(tyresmoke_and_rain, 0);
-}# end tyresmoke_and_rain
+}
 
 # == fire it up ===
 tyresmoke_and_rain();

From b0dc826480b36cd5ecdf1c51694ebed325212687 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Thu, 5 May 2022 14:03:56 +0100
Subject: [PATCH 2/2] PFD: make the altitude field display flight levels with
 correct spacing

---
 Models/Instruments/PFD/PFD.nas | 15 +++++----------
 Nasal/Systems/electrical.nas   |  3 +++
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas
index 82bdba9f..8ace2c3c 100644
--- a/Models/Instruments/PFD/PFD.nas
+++ b/Models/Instruments/PFD/PFD.nas
@@ -687,23 +687,18 @@ var canvas_pfd = {
 			}),
 			props.UpdateManager.FromHashList(["altimeterHpa","altimeterInhg","altimeterInhgMode"], 0.005, func(val) {
 				if (val.altimeterInhgMode == 0) {
-					obj["QNH_setting"].setText(sprintf("%4.0f", val.altimeterHpa));
+					obj["QNH_setting"].setText(sprintf("%4d", val.altimeterHpa));
 				} else {
 					obj["QNH_setting"].setText(sprintf("%2.2f", val.altimeterInhg));
 				}
 			}),
 			props.UpdateManager.FromHashList(["altimeterStd","altitudeAutopilot"], 1, func(val) {
 				if (val.altimeterStd == 1) {
-					if (val.altitudeAutopilot < 10000) {
-						obj["ALT_digit_UP"].setText(sprintf("%s", "FL   " ~ val.altitudeAutopilot / 100));
-						obj["ALT_digit_DN"].setText(sprintf("%s", "FL   " ~ val.altitudeAutopilot / 100));
-					} else {
-						obj["ALT_digit_UP"].setText(sprintf("%s", "FL " ~ val.altitudeAutopilot / 100));
-						obj["ALT_digit_DN"].setText(sprintf("%s", "FL " ~ val.altitudeAutopilot / 100));
-					}
+					obj["ALT_digit_UP"].setText(sprintf("FL%3d", val.altitudeAutopilot / 100));
+					obj["ALT_digit_DN"].setText(sprintf("FL%3d", val.altitudeAutopilot / 100));
 				} else {
-					obj["ALT_digit_UP"].setText(sprintf("%5.0f", val.altitudeAutopilot));
-					obj["ALT_digit_DN"].setText(sprintf("%5.0f", val.altitudeAutopilot));
+					obj["ALT_digit_UP"].setText(sprintf("%5d", val.altitudeAutopilot));
+					obj["ALT_digit_DN"].setText(sprintf("%5d", val.altitudeAutopilot));
 				}
 			}),
 			props.UpdateManager.FromHashValue("managedSpd", 1, func(val) {
diff --git a/Nasal/Systems/electrical.nas b/Nasal/Systems/electrical.nas
index 5d939410..0a73cf34 100644
--- a/Nasal/Systems/electrical.nas
+++ b/Nasal/Systems/electrical.nas
@@ -192,6 +192,9 @@ var ELEC = {
 		me.Fail.tr1Fault.setBoolValue(0);
 		me.Fail.tr2Fault.setBoolValue(0);
 	},
+	loop: func() {
+		# Empty, required for Emesary
+	},
 };
 
 setlistener("/systems/fmgc/power/power-1-on", func(val) {