Merge pull request snaptec#2320 from benderl/bugfix

fix energy charged
webermax · Jul 22, 2022 · 295784e · 295784e
2 parents 6a05750 + 62a52d8
commit 295784e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ladelog.sh b/ladelog.sh
@@ -163,7 +163,7 @@ processChargepoint(){
 				gelr=$(echo "scale=0;$bishergeladen * 100 / ${!averageConsumptionVariableName}" |bc)
 				echo "$gelr" > "${RAMDISKDIR}/gelr${chargePointKey}"
 				# calculate time remaining if energy limit is set
-				energyChargeLimitVariableName="lademkwh$chargePointKey"
+				energyChargeLimitVariableName="lademkwh$chargePointKey2"
 				restzeit=$(echo "scale=0;(${!energyChargeLimitVariableName} - $bishergeladen) * 1000 * 60 / $ladeleistung" |bc)
 				echo "$restzeit" > "${RAMDISKDIR}/restzeit${chargePointKey}m"
 				# format time charged

diff --git a/runs/initRamdisk.sh b/runs/initRamdisk.sh
@@ -132,7 +132,7 @@ initRamdisk(){
 	echo 0 > $RamdiskPath/llv3lp6
 	echo 0 > $RamdiskPath/llv3lp7
 	echo 0 > $RamdiskPath/llv3lp8
-	echo 0 > $RamdiskPath/pluggedladungbishergeladen
+	echo 0 > $RamdiskPath/pluggedladungbishergeladenlp1
 	echo 0 > $RamdiskPath/pluggedladungbishergeladenlp2
 	echo 0 > $RamdiskPath/pluggedladungbishergeladenlp3
 	echo 0 > $RamdiskPath/pluggedladungbishergeladenlp4

diff --git a/runs/pubmqtt.sh b/runs/pubmqtt.sh
@@ -147,7 +147,7 @@ mqttvar["lp/5/boolChargeStat"]=chargestatlp5
 mqttvar["lp/6/boolChargeStat"]=chargestatlp6
 mqttvar["lp/7/boolChargeStat"]=chargestatlp7
 mqttvar["lp/8/boolChargeStat"]=chargestatlp8
-mqttvar["lp/1/kWhChargedSincePlugged"]=pluggedladungbishergeladen
+mqttvar["lp/1/kWhChargedSincePlugged"]=pluggedladungbishergeladenlp1
 mqttvar["lp/2/kWhChargedSincePlugged"]=pluggedladungbishergeladenlp2
 mqttvar["lp/3/kWhChargedSincePlugged"]=pluggedladungbishergeladenlp3
 mqttvar["lp/4/kWhChargedSincePlugged"]=pluggedladungbishergeladenlp4

diff --git a/slavemode.sh b/slavemode.sh
@@ -291,7 +291,7 @@ function endChargeAndAbortOnChargeLimits() {
 	local energyChargedSincePlugin=0
 
 	if (( chargePoint == 1 )); then
-		energyChargedSincePlugin=$(<"ramdisk/pluggedladungbishergeladen")
+		energyChargedSincePlugin=$(<"ramdisk/pluggedladungbishergeladenlp1")
 	elif (( chargePoint == 2 )); then
 		energyChargedSincePlugin=$(<"ramdisk/pluggedladungbishergeladenlp2")
 	elif (( chargePoint == 3 )); then