Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

76_SMAPortal: contrib 1.5.3

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@19040 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-03-26 17:40:00 +00:00
parent 1e2fcb4594
commit 24e3b46dac
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/DS_Starter/76_SMAPortal.pm
View File

@ -128,6 +128,7 @@ BEGIN {
readingsBulkUpdate readingsBulkUpdate
readingsBulkUpdateIfChanged readingsBulkUpdateIfChanged
readingsBeginUpdate readingsBeginUpdate
readingsDelete
readingsEndUpdate readingsEndUpdate
ReadingsVal ReadingsVal
RemoveInternalTimer RemoveInternalTimer
@ -141,6 +142,7 @@ BEGIN {
# Versions History intern # Versions History intern
our %vNotesIntern = ( our %vNotesIntern = (
"1.5.3" => "26.03.2019 delete L1_ErrorMessages, L1_WarningMessages if no errors or warnings occur ",
"1.5.2" => "25.03.2019 prevent module from deactivation in case of unavailable Meta.pm ", "1.5.2" => "25.03.2019 prevent module from deactivation in case of unavailable Meta.pm ",
"1.5.1" => "24.03.2019 fix \$VAR1 problem Forum: #27667.msg922983.html#msg922983 ", "1.5.1" => "24.03.2019 fix \$VAR1 problem Forum: #27667.msg922983.html#msg922983 ",
"1.5.0" => "23.03.2019 add consumer data ", "1.5.0" => "23.03.2019 add consumer data ",
@ -641,7 +643,7 @@ sub ParseData($) {
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
my ($FeedIn_done,$GridConsumption_done,$PV_done,$AutarkyQuote_done,$SelfConsumption_done) = (0,0,0,0,0); my ($FeedIn_done,$GridConsumption_done,$PV_done,$AutarkyQuote_done,$SelfConsumption_done) = (0,0,0,0,0);
my ($SelfConsumptionQuote_done,$SelfSupply_done) = (0,0); my ($SelfConsumptionQuote_done,$SelfSupply_done,$errMsg,$warnMsg) = (0,0,0,0);
for my $k (keys %$livedata_content) { for my $k (keys %$livedata_content) {
my $new_val = ""; my $new_val = "";
if (defined $livedata_content->{$k}) { if (defined $livedata_content->{$k}) {
@ -666,13 +668,15 @@ sub ParseData($) {
if ($new_val && $k !~ /__type/i) { if ($new_val && $k !~ /__type/i) {
Log3 $name, 4, "$name -> $k - $new_val"; Log3 $name, 4, "$name -> $k - $new_val";
readingsBulkUpdate($hash, "L1_$k", $new_val); readingsBulkUpdate($hash, "L1_$k", $new_val);
$FeedIn_done = 1 if($k =~ /^FeedIn$/); $FeedIn_done = 1 if($k =~ /^FeedIn$/);
$GridConsumption_done = 1 if($k =~ /^GridConsumption$/); $GridConsumption_done = 1 if($k =~ /^GridConsumption$/);
$PV_done = 1 if($k =~ /^PV$/); $PV_done = 1 if($k =~ /^PV$/);
$AutarkyQuote_done = 1 if($k =~ /^AutarkyQuote$/); $AutarkyQuote_done = 1 if($k =~ /^AutarkyQuote$/);
$SelfConsumption_done = 1 if($k =~ /^SelfConsumption$/); $SelfConsumption_done = 1 if($k =~ /^SelfConsumption$/);
$SelfConsumptionQuote_done = 1 if($k =~ /^SelfConsumptionQuote$/); $SelfConsumptionQuote_done = 1 if($k =~ /^SelfConsumptionQuote$/);
$SelfSupply_done = 1 if($k =~ /^SelfSupply$/); $SelfSupply_done = 1 if($k =~ /^SelfSupply$/);
$errMsg = 1 if($k =~ /^ErrorMessages$/);
$warnMsg = 1 if($k =~ /^WarningMessages$/);
} }
} }
} }
@ -684,9 +688,11 @@ sub ParseData($) {
readingsBulkUpdate($hash, "L1_SelfConsumption", 0) if(!$SelfConsumption_done); readingsBulkUpdate($hash, "L1_SelfConsumption", 0) if(!$SelfConsumption_done);
readingsBulkUpdate($hash, "L1_SelfConsumptionQuote", 0) if(!$SelfConsumptionQuote_done); readingsBulkUpdate($hash, "L1_SelfConsumptionQuote", 0) if(!$SelfConsumptionQuote_done);
readingsBulkUpdate($hash, "L1_SelfSupply", 0) if(!$SelfSupply_done); readingsBulkUpdate($hash, "L1_SelfSupply", 0) if(!$SelfSupply_done);
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
readingsDelete($hash,"L1_ErrorMessages") if(!$errMsg);
readingsDelete($hash,"L1_WarningMessages") if(!$warnMsg);
if ($forecast_content && $forecast_content !~ m/undefined/i) { if ($forecast_content && $forecast_content !~ m/undefined/i) {
# Auswertung der Forecast Daten # Auswertung der Forecast Daten
extractForecastData($hash,$forecast_content); extractForecastData($hash,$forecast_content);