p38192567
/
followme_e-tron
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Smart Instruments: improve battery remaining display

This commit is contained in:
Sidi Liang 2021-04-30 15:25:23 +08:00
parent fad31a3eb9
commit 8b3a19d2cc
No known key found for this signature in database
GPG Key ID: 9785F5EECFFA5311
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Nasal/SmartInstruments.nas
View File

@ -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){

5
Nasal/electrical.nas
View File

@ -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);

4
Nasal/node_setup.nas
View File

@ -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);