From 8b3a19d2cc9e6cd708c7386ea34c630e02b70a08 Mon Sep 17 00:00:00 2001
From: Sidi Liang <1467329765@qq.com>
Date: Fri, 30 Apr 2021 15:25:23 +0800
Subject: [PATCH] Smart Instruments: improve battery remaining display

---
 Nasal/SmartInstruments.nas | 4 +++-
 Nasal/electrical.nas       | 5 ++++-
 Nasal/node_setup.nas       | 4 +---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Nasal/SmartInstruments.nas b/Nasal/SmartInstruments.nas
index cdf3bb3..9fbb350 100644
--- a/Nasal/SmartInstruments.nas
+++ b/Nasal/SmartInstruments.nas
@@ -148,7 +148,9 @@ var SmartInstruments = {
         #//Power
         me.power.updateText(sprintf("%i", engine.engine_1.activePower_kW));
         #//Battery
-        me.batteryRemainingDisplay.updateText(me.information.systems.electrical.getBatteryRemainingPercentage(followme.circuit_1));
+        me.batteryRemainingDisplay.updateText(me.information.systems.electrical.getMainBatteryRemainingPercentage);
+        if(me.information.systems.electrical.getMainBatteryRemainingPercentageFloat <= 20.0) me.batteryRemainingDisplay.setColor(1,0,0);
+        else me.batteryRemainingDisplay.setColor(0.58,0.894,1);
         runtimeTextAdjust(me.batteryRemainingDisplay);
         #//Gear
         if(engine.engine_1.direction == 1){
diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index 004a68b..12bf98a 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -6,7 +6,7 @@
 io.include("library.nas");
 
 var electricalDebug = Debugger.new("Electrical");
-electricalDebug.setDebugLevel(3);
+electricalDebug.setDebugLevel(0);
 
 var kWh2kWs = func(kWh){
     return kWh * 3600;
@@ -245,6 +245,9 @@ var Circuit = {
         props.getNode("/systems/electrical/e-tron/battery-remaining-percent", 1).setValue(me.parallelConnection[0].units[0].getRemainingPercentage());
         props.getNode("/systems/electrical/e-tron/battery-remaining-percent-float", 1).setValue(me.parallelConnection[0].units[0].getRemainingPercentageFloat());
 
+        vehicleInformation.systems.electrical.getMainBatteryRemainingPercentage = me.parallelConnection[0].units[0].getRemainingPercentage();
+        vehicleInformation.systems.electrical.getMainBatteryRemainingPercentageFloat = me.parallelConnection[0].units[0].getRemainingPercentageFloat();
+
         electricalDebug.debugPrint("current: "~me.current, 1);
         electricalDebug.debugPrint("voltage: "~me.voltage(), 1);
         electricalDebug.debugPrint("Main Battery Remaining: "~me.parallelConnection[0].units[0].remaining, 1);
diff --git a/Nasal/node_setup.nas b/Nasal/node_setup.nas
index a2f06e4..1d6bbb2 100644
--- a/Nasal/node_setup.nas
+++ b/Nasal/node_setup.nas
@@ -69,9 +69,7 @@ vehicleInformation.systems.speedometer.type = vehicleInformation.systems.speedom
 vehicleInformation.systems.batteryGauge = vehicleInformation.systems.getNode("battery-gauge", 1);
 vehicleInformation.systems.batteryGauge.type = vehicleInformation.systems.batteryGauge.getNode("type", 1);
 vehicleInformation.systems.electrical = {};
-vehicleInformation.systems.electrical.getBatteryRemainingPercentage = func(circuit){
-    return circuit.parallelConnection[0].units[0].getRemainingPercentage();
-}
+
 #//Safety
 vehicleInformation.systems.safety = vehicleInformation.systems.getNode("safety", 1);
 vehicleInformation.systems.safety.aebActivated = vehicleInformation.systems.safety.getNode("aeb_activated", 1);