From edf2744313e5631078d24eb9271fa6a69cbbbd3d Mon Sep 17 00:00:00 2001 From: DS_Starter Date: Sat, 21 Jun 2025 17:40:22 +0000 Subject: [PATCH] 76_SolarForecast: contrib Version 1.52.16 git-svn-id: https://svn.fhem.de/fhem/trunk@30060 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/76_SolarForecast.pm | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm index f1890b3b9..833c884c6 100644 --- a/fhem/contrib/DS_Starter/76_SolarForecast.pm +++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm @@ -160,7 +160,7 @@ BEGIN { # Versions History intern my %vNotesIntern = ( - "1.52.16"=> "21.06.2025 _genSpecialReadings: new option remainingChargeHrsMinPwrBat_XX ", + "1.52.16"=> "21.06.2025 _genSpecialReadings: new option remainingSurplsHrsMinPwrBat_XX ", "1.52.15"=> "20.06.2025 ctrlBatSocManagementXX->loadAbort expanded by unlock condition ", "1.52.14"=> "18.06.2025 _beamGraphic: rework linear and logarithmic normalization of beam height ", "1.52.13"=> "17.06.2025 _genSpecialReadings: new option remainingHrsWoChargeRcmdBat_XX, edit comref ", @@ -1474,12 +1474,12 @@ my %hcsr = ( $hcsr{'remainingHrsWoChargeRcmdBat_'.$bn}{unit} = ''; $hcsr{'remainingHrsWoChargeRcmdBat_'.$bn}{def} = '-'; - $hcsr{'remainingChargeHrsMinPwrBat_'.$bn}{fnr} = 5; - $hcsr{'remainingChargeHrsMinPwrBat_'.$bn}{fn} = \&NexthoursVal; - $hcsr{'remainingChargeHrsMinPwrBat_'.$bn}{par} = 'pvfc'; - $hcsr{'remainingChargeHrsMinPwrBat_'.$bn}{par1} = 'confc'; - $hcsr{'remainingChargeHrsMinPwrBat_'.$bn}{unit} = ''; - $hcsr{'remainingChargeHrsMinPwrBat_'.$bn}{def} = '0'; + $hcsr{'remainingSurplsHrsMinPwrBat_'.$bn}{fnr} = 5; + $hcsr{'remainingSurplsHrsMinPwrBat_'.$bn}{fn} = \&NexthoursVal; + $hcsr{'remainingSurplsHrsMinPwrBat_'.$bn}{par} = 'pvfc'; + $hcsr{'remainingSurplsHrsMinPwrBat_'.$bn}{par1} = 'confc'; + $hcsr{'remainingSurplsHrsMinPwrBat_'.$bn}{unit} = ''; + $hcsr{'remainingSurplsHrsMinPwrBat_'.$bn}{def} = '0'; } # Funktiontemplate zur Speicherung von Werten in pvHistory @@ -6477,7 +6477,7 @@ sub _attrcreateSpecialRdgs { ## no critic "not used" return qq{The consumer "consumer$cn" is currently not registered as an active consumer!}; } } - elsif ($avl =~ /remainingChargeHrsMinPwrBat_/xs) { + elsif ($avl =~ /remainingSurplsHrsMinPwrBat_/xs) { my $bn = (split "_", $avl)[1]; my $parsed = __parseAttrBatSoc ($name, AttrVal ($name, 'ctrlBatSocManagement'.$bn, undef)); my $loadAbort = $parsed->{loadAbort}; @@ -14439,7 +14439,7 @@ sub _genSpecialReadings { storeReading ($prpo.'_'.$kpi, $n); } - elsif ($kpi =~ /remainingChargeHrsMinPwrBat_/xs) { + elsif ($kpi =~ /remainingSurplsHrsMinPwrBat_/xs) { my $bn = (split "_", $kpi)[1]; my $parsed = __parseAttrBatSoc ($name, AttrVal ($name, 'ctrlBatSocManagement'.$bn, undef)); my $loadAbort = $parsed->{loadAbort}; @@ -26030,7 +26030,7 @@ to ensure that the system configuration is correct. daysUntilBatteryCare_XX Days until the next battery XX maintenance (reaching the charge 'maxSoC' from attribute ctrlBatSocManagementXX) lastretrieval_time the last retrieval time of the selected radiation data API lastretrieval_timestamp the timestamp of the last retrieval time of the selected radiation data API - remainingChargeHrsMinPwrBat_XX the remaining number of hours on the current day in which the PV surplus (Wh) is higher than the + remainingSurplsHrsMinPwrBat_XX the remaining number of hours on the current day in which the PV surplus (Wh) is higher than the calculated hourly integral of a minimum charging power of battery XX. The <MinPwr> is specified in the ctrlBatSocManagementXX->loadAbort attribute. remainingHrsWoChargeRcmdBat_XX the remaining number of hours without charging recommendation for battery XX on the current day @@ -28669,7 +28669,7 @@ die ordnungsgemäße Anlagenkonfiguration geprüft werden. daysUntilBatteryCare_XX Tage bis zur nächsten Batterie XX Pflege (Erreichen der Ladung 'maxSoC' aus Attribut ctrlBatSocManagementXX) lastretrieval_time der letzte Abrufzeitpunkt der gewählten Strahlungsdaten-API lastretrieval_timestamp der Timestamp der letzen Abrufzeitpunkt der gewählten Strahlungsdaten-API - remainingChargeHrsMinPwrBat_XX die verbleibende Anzahl Stunden am aktuellen Tag, in denen der PV-Überschuß (Wh) höher ist als das + remainingSurplsHrsMinPwrBat_XX die verbleibende Anzahl Stunden am aktuellen Tag, in denen der PV-Überschuß (Wh) höher ist als das kalkulierte Stundenintegral einer minimalen Ladeleistung der Batterie XX. Die Angabe <MinPwr> erfolgt im Attribut ctrlBatSocManagementXX->loadAbort. remainingHrsWoChargeRcmdBat_XX die verbleibende Anzahl Stunden ohne Ladeempfehlung für Batterie XX am aktuellen Tag