Merge master into Stable

.github/workflows/github-actions-python.yml

@@ -13,6 +13,8 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: "3.5"
+        env:
+          PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

ladelog.sh

@@ -30,7 +30,7 @@ fi
 getTimeDiffString() {
 	minutes=$1
 
-	if ((minutes > 60)); then
+	if ((minutes >= 60)); then
 		text="$((minutes / 60)) H $((minutes % 60)) Min"
 	elif ((minutes >= 0)); then
 		text="$minutes Min"
@@ -122,7 +122,7 @@ processChargepoint() {
 			# calculate actual meter value difference since plugged
 			pluggedladungbishergeladen=$(echo "scale=2;($llkwh - $pluggedladungstartkwh)/1" | bc | sed 's/^\./0./')
 			echo "$pluggedladungbishergeladen" >"${RAMDISKDIR}/pluggedladungbishergeladen${chargePointKey}"
-			openwbDebugLog "CHARGESTAT" 1 "charged since plugged: $pluggedladungstartkwh - $llkwh = $pluggedladungbishergeladen"
+			openwbDebugLog "CHARGESTAT" 1 "charged since plugged: $llkwh - $pluggedladungstartkwh = $pluggedladungbishergeladen"
 			# reset unplug timer
 			echo 0 >"${RAMDISKDIR}/pluggedtimer${chargePointKey}"
 		else
@@ -171,7 +171,7 @@ processChargepoint() {
 				# format time charged
 				restzeittext=$(getTimeDiffString "$restzeit")
 				echo "$restzeittext" >"${RAMDISKDIR}/restzeit${chargePointKey}"
-				openwbDebugLog "CHARGESTAT" 1 "energyCharged=${bishergeladen}kWh; rangeCharged=${gelr}km; timeRemaining=${restzeit}m ($restzeittext)"
+				openwbDebugLog "CHARGESTAT" 1 "energyCharged: ${llkwh} - ${ladelstart}=${bishergeladen}kWh; rangeCharged=${gelr}km; timeRemaining=${restzeit}m ($restzeittext)"
 			else
 				# new charge detected
 				openwbDebugLog "CHARGESTAT" 1 "new charge detected"

loadvars.sh

@@ -1092,7 +1092,7 @@ loadvars(){
 	fi
 	echo $hausverbrauch > /var/www/html/openWB/ramdisk/hausverbrauch
 	usesimbezug=0
-	if [[ $wattbezugmodul == "bezug_solarwatt" ]]|| [[ $wattbezugmodul == "bezug_rct" ]]|| [[ $wattbezugmodul == "bezug_kostalplenticoreem300haus" ]] || [[ $wattbezugmodul == "bezug_solarlog" ]] ; then
+	if [[ $wattbezugmodul == "bezug_rct" ]]|| [[ $wattbezugmodul == "bezug_kostalplenticoreem300haus" ]]  ; then
 		usesimbezug=1
 	fi
 	if ((usesimbezug == 1)); then
@@ -1134,7 +1134,7 @@ loadvars(){
 	if [[ $speichermodul == "speicher_kostalplenticore" ]] && [[ $pvwattmodul == "wr_plenticore" ]]; then
 		usesimpv=1
 	fi
-	if [[ $pvwattmodul == "wr_rct" ]]|| [[ $pvwattmodul == "wr_solarwatt" ]] || [[ $pvwattmodul == "wr_kostalpikovar2" ]]; then
+	if [[ $pvwattmodul == "wr_rct" ]] || [[ $pvwattmodul == "wr_kostalpikovar2" ]] ; then
 		usesimpv=1
 	fi
 	if ((usesimpv == 1)); then
@@ -1182,7 +1182,7 @@ loadvars(){
 		echo "$pvallwh" > /var/www/html/openWB/ramdisk/pvallwh
 	fi
 
-	if [[ $speichermodul == "speicher_tesvoltsma" ]] || [[ $speichermodul == "speicher_solarwatt" ]] || [[ $speichermodul == "speicher_rct" ]]|| [[ $speichermodul == "speicher_kostalplenticore" ]] ; then
+	if [[ $speichermodul == "speicher_tesvoltsma" ]] || [[ $speichermodul == "speicher_rct" ]] || [[ $speichermodul == "speicher_kostalplenticore" ]] ; then
 		ra='^-?[0-9]+$'
 		watt2=$(</var/www/html/openWB/ramdisk/speicherleistung)
 		if [[ -e /var/www/html/openWB/ramdisk/speicherwatt0pos ]]; then

modules/bezug_sungrow/main.sh

@@ -13,7 +13,7 @@ fi
 if [[ "$pvwattmodul" == "wr_sungrow" ]]; then
 	echo "value read at pv modul" >/dev/null
 else
-	bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.devices.sungrow.device" "counter" "$speicher1_ip" "$sungrowspeicherid" "$sungrowsr" >>"$MYLOGFILE" 2>&1
+	bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.devices.sungrow.device" "counter" "$speicher1_ip" "$sungrowspeicherport" "$sungrowspeicherid" "$sungrowsr" >>"$MYLOGFILE" 2>&1
 	ret=$?
 fi
 

modules/owbpro/main.sh

@@ -5,16 +5,19 @@ answer=$(timeout 4 curl -s $ip/connect.php | jq .)
 if [[ $answer == *"vehicle_id"* ]]; then
 	watt=$(echo $answer |jq '.power_all')
 	watt=$(echo $watt | sed 's/\..*$//')
-	APhase1=$(echo $answer | jq ".currents[0]" ) 
-	APhase2=$(echo $answer | jq ".currents[1]" ) 
-	APhase3=$(echo $answer | jq ".currents[2]" ) 
+	APhase1=$(echo $answer | jq ".currents[0]" )
+	APhase2=$(echo $answer | jq ".currents[1]" )
+	APhase3=$(echo $answer | jq ".currents[2]" )
+	VPhase1=$(echo $answer | jq ".voltages[0]" )
+	VPhase2=$(echo $answer | jq ".voltages[1]" )
+	VPhase3=$(echo $answer | jq ".voltages[2]" )
 	boolChargeStat=$(echo $answer | jq ".charge_state" )
 	if [ $boolChargeStat = true ]; then
 		boolChargeStat=1
 	else
 		boolChargeStat=0
 	fi
-	boolPlugStat=$(echo $answer | jq ".plug_state") 
+	boolPlugStat=$(echo $answer | jq ".plug_state")
 	if [ $boolPlugStat = true ]; then
 		boolPlugStat=1
 	else
@@ -28,6 +31,9 @@ if [[ $answer == *"vehicle_id"* ]]; then
 		echo $APhase1 > /var/www/html/openWB/ramdisk/lla1
 		echo $APhase2 > /var/www/html/openWB/ramdisk/lla2
 		echo $APhase3 > /var/www/html/openWB/ramdisk/lla3
+		echo $VPhase1 > /var/www/html/openWB/ramdisk/llv1
+		echo $VPhase2 > /var/www/html/openWB/ramdisk/llv2
+		echo $VPhase3 > /var/www/html/openWB/ramdisk/llv3
 		echo $watt > /var/www/html/openWB/ramdisk/llaktuell
 		echo $kWhCounter > /var/www/html/openWB/ramdisk/llkwh
 		echo $boolPlugStat > /var/www/html/openWB/ramdisk/plugstat
@@ -37,6 +43,9 @@ if [[ $answer == *"vehicle_id"* ]]; then
 		echo $APhase1 > /var/www/html/openWB/ramdisk/llas11
 		echo $APhase2 > /var/www/html/openWB/ramdisk/llas12
 		echo $APhase3 > /var/www/html/openWB/ramdisk/llas13
+		echo $VPhase1 > /var/www/html/openWB/ramdisk/llvs11
+		echo $VPhase2 > /var/www/html/openWB/ramdisk/llvs12
+		echo $VPhase3 > /var/www/html/openWB/ramdisk/llvs13
 		echo $watt > /var/www/html/openWB/ramdisk/llaktuells1
 		echo $kWhCounter > /var/www/html/openWB/ramdisk/llkwhs1
 		echo $boolPlugStat > /var/www/html/openWB/ramdisk/plugstats1
@@ -46,6 +55,9 @@ if [[ $answer == *"vehicle_id"* ]]; then
 		echo $APhase1 > /var/www/html/openWB/ramdisk/llas21
 		echo $APhase2 > /var/www/html/openWB/ramdisk/llas22
 		echo $APhase3 > /var/www/html/openWB/ramdisk/llas23
+		echo $VPhase1 > /var/www/html/openWB/ramdisk/llvs21
+		echo $VPhase2 > /var/www/html/openWB/ramdisk/llvs22
+		echo $VPhase3 > /var/www/html/openWB/ramdisk/llvs23
 		echo $watt > /var/www/html/openWB/ramdisk/llaktuells2
 		echo $kWhCounter > /var/www/html/openWB/ramdisk/llkwhs2
 		echo $boolPlugStat > /var/www/html/openWB/ramdisk/plugstatlp3
@@ -55,6 +67,9 @@ if [[ $answer == *"vehicle_id"* ]]; then
 		echo $APhase1 > /var/www/html/openWB/ramdisk/lla1lp$chargep
 		echo $APhase2 > /var/www/html/openWB/ramdisk/lla2lp$chargep
 		echo $APhase3 > /var/www/html/openWB/ramdisk/lla3lp$chargep
+		echo $VPhase1 > /var/www/html/openWB/ramdisk/llv1lp$chargep
+		echo $VPhase2 > /var/www/html/openWB/ramdisk/llv2lp$chargep
+		echo $VPhase3 > /var/www/html/openWB/ramdisk/llv3lp$chargep
 		echo $watt > /var/www/html/openWB/ramdisk/llaktuelllp$chargep
 		echo $kWhCounter > /var/www/html/openWB/ramdisk/llkwhlp$chargep
 		echo $boolPlugStat > /var/www/html/openWB/ramdisk/plugstatlp$chargep

modules/soc_http/main.sh

@@ -64,7 +64,7 @@ getAndWriteSoc(){
 	re='^-?[0-9]+$'
 	openwbDebugLog ${DMOD} 1 "Lp$CHARGEPOINT: Requesting SoC"
 	echo 0 > "$soctimerfile"
-	soc=$(curl --connect-timeout 15 -s "$ip" | cut -f1 -d".")
+	soc=$(curl --connect-timeout 15 -s -g "$ip" | cut -f1 -d".")
 
 	if  [[ $soc =~ $re ]] ; then
 		if (( soc != 0 )) ; then