FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

76_SMAPortal: contrib 3.3.4

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22389 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-07-12 06:09:34 +00:00
parent 0c48a1ad1b
commit ee467ad477
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fhem/contrib/DS_Starter/76_SMAPortal.pm
View File

@ -1,5 +1,5 @@
######################################################################################################################### #########################################################################################################################
# $Id: 76_SMAPortal.pm 22332 2020-07-02 20:47:30Z DS_Starter $ # $Id: 76_SMAPortal.pm 22369 2020-07-07 19:30:51Z DS_Starter $
######################################################################################################################### #########################################################################################################################
# 76_SMAPortal.pm # 76_SMAPortal.pm
# #
@ -136,7 +136,8 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"3.3.3" => "05.07.2020 change extractLiveData ", "3.3.4" => "12.07.2020 fix break in header if hourCount was reduced ",
"3.3.3" => "07.07.2020 change extractLiveData, minor fixes ",
"3.3.2" => "05.07.2020 change timeout calc, new reading lastSuccessTime ", "3.3.2" => "05.07.2020 change timeout calc, new reading lastSuccessTime ",
"3.3.1" => "03.07.2020 change retry repetition and new cycle wait time ", "3.3.1" => "03.07.2020 change retry repetition and new cycle wait time ",
"3.3.0" => "02.07.2020 fix typo, new attribute noHomeManager ", "3.3.0" => "02.07.2020 fix typo, new attribute noHomeManager ",
@ -2779,12 +2780,12 @@ sub setVersionInfo {
if($modules{$type}{META}{x_prereqs_src} && !$hash->{HELPER}{MODMETAABSENT}) { if($modules{$type}{META}{x_prereqs_src} && !$hash->{HELPER}{MODMETAABSENT}) {
# META-Daten sind vorhanden # META-Daten sind vorhanden
$modules{$type}{META}{version} = "v".$v; # Version aus META.json überschreiben, Anzeige mit {Dumper $modules{SMAPortal}{META}} $modules{$type}{META}{version} = "v".$v; # Version aus META.json überschreiben, Anzeige mit {Dumper $modules{SMAPortal}{META}}
if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 76_SMAPortal.pm 22332 2020-07-02 20:47:30Z DS_Starter $ im Kopf komplett! vorhanden ) if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 76_SMAPortal.pm 22369 2020-07-07 19:30:51Z DS_Starter $ im Kopf komplett! vorhanden )
$modules{$type}{META}{x_version} =~ s/1\.1\.1/$v/gx; $modules{$type}{META}{x_version} =~ s/1\.1\.1/$v/gx;
} else { } else {
$modules{$type}{META}{x_version} = $v; $modules{$type}{META}{x_version} = $v;
} }
return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 76_SMAPortal.pm 22332 2020-07-02 20:47:30Z DS_Starter $ im Kopf komplett! vorhanden ) return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 76_SMAPortal.pm 22369 2020-07-07 19:30:51Z DS_Starter $ im Kopf komplett! vorhanden )
if(__PACKAGE__ eq "FHEM::$type" || __PACKAGE__ eq $type) { if(__PACKAGE__ eq "FHEM::$type" || __PACKAGE__ eq $type) {
# es wird mit Packages gearbeitet -> Perl übliche Modulversion setzen # es wird mit Packages gearbeitet -> Perl übliche Modulversion setzen
# mit {<Modul>->VERSION()} im FHEMWEB kann Modulversion abgefragt werden # mit {<Modul>->VERSION()} im FHEMWEB kann Modulversion abgefragt werden
@ -3092,14 +3093,14 @@ sub PortalAsHtml {
$icon = FW_makeImage($icon) if (defined($icon)); $icon = FW_makeImage($icon) if (defined($icon));
my $co4h = ReadingsNum ($name,"${fmin}_Next04Hours_Consumption", 0); my $co4h = ReadingsNum ($name,"${fmin}_Next04Hours_Consumption", 0);
my $coRe = ReadingsNum ($name,"${fmin}_RestOfDay_Consumption", 0); my $coRe = ReadingsNum ($name,"${fmin}_RestOfDay_Consumption", 0);
my $coTo = ReadingsNum ($name,"${fmin}_Tomorrow_Consumption", 0); my $coTo = ReadingsNum ($name,"${fmin}_Tomorrow_Consumption", 0);
my $coCu = ReadingsNum ($name,"${ldlv}_GridConsumption", 0); my $coCu = ReadingsNum ($name,"${ldlv}_GridConsumption", 0);
my $pv4h = ReadingsNum($name,"${fmin}_Next04Hours_PV", 0); my $pv4h = ReadingsNum ($name,"${fmin}_Next04Hours_PV", 0);
my $pvRe = ReadingsNum($name,"${fmin}_RestOfDay_PV", 0); my $pvRe = ReadingsNum ($name,"${fmin}_RestOfDay_PV", 0);
my $pvTo = ReadingsNum($name,"${fmin}_Tomorrow_PV", 0); my $pvTo = ReadingsNum ($name,"${fmin}_Tomorrow_PV", 0);
my $pvCu = ReadingsNum($name,"${ldlv}_PV", 0); my $pvCu = ReadingsNum ($name,"${ldlv}_PV", 0);
if ($kw eq 'kWh') { if ($kw eq 'kWh') {
$co4h = sprintf("%.1f" , $co4h/1000)."&nbsp;kWh"; $co4h = sprintf("%.1f" , $co4h/1000)."&nbsp;kWh";
@ -3130,14 +3131,14 @@ sub PortalAsHtml {
my $lup = ReadingsTimestamp($name, "${fmin}_ForecastToday_Consumption", "0000-00-00 00:00:00"); # letzter Forecast Update my $lup = ReadingsTimestamp($name, "${fmin}_ForecastToday_Consumption", "0000-00-00 00:00:00"); # letzter Forecast Update
my $lupt = "last update:"; my $lupt = "last update:";
my $lblPv4h = "next 4h:"; my $lblPv4h = "next&nbsp;4h:";
my $lblPvRe = "today:"; my $lblPvRe = "today:";
my $lblPvTo = "tomorrow:"; my $lblPvTo = "tomorrow:";
my $lblPvCu = "actual"; my $lblPvCu = "actual";
if(AttrVal("global","language","EN") eq "DE") { # Header globales Sprachschema Deutsch if(AttrVal("global","language","EN") eq "DE") { # Header globales Sprachschema Deutsch
$lupt = "Stand:"; $lupt = "Stand:";
$lblPv4h = encode("utf8", "nächste 4h:"); $lblPv4h = encode("utf8", "nächste&nbsp;4h:");
$lblPvRe = "heute:"; $lblPvRe = "heute:";
$lblPvTo = "morgen:"; $lblPvTo = "morgen:";
$lblPvCu = "aktuell"; $lblPvCu = "aktuell";
@ -3201,16 +3202,16 @@ sub PortalAsHtml {
$_ =~ s/^\s+|\s+$//gx; #trim it, if blanks were used $_ =~ s/^\s+|\s+$//gx; #trim it, if blanks were used
#check if listed device is planned #check if listed device is planned
if (ReadingsVal($name, "${cclv}_".$itemName."_Planned", "no") eq "yes") { if (ReadingsVal($name, "${fmaj}_".$itemName."_Planned", "no") eq "yes") {
#get start and end hour #get start and end hour
my ($start, $end); # werden auf Balken Pos 0 - 23 umgerechnet, nicht auf Stunde !!, Pos = 24 -> ungültige Pos = keine Anzeige my ($start, $end); # werden auf Balken Pos 0 - 23 umgerechnet, nicht auf Stunde !!, Pos = 24 -> ungültige Pos = keine Anzeige
if(AttrVal("global","language","EN") eq "DE") { if(AttrVal("global","language","EN") eq "DE") {
(undef,undef,undef,$start) = ReadingsVal($name,"${cclv}_".$itemName."_PlannedOpTimeBegin",'00.00.0000 24') =~ m/(\d{2}).(\d{2}).(\d{4})\s(\d{2})/x; (undef,undef,undef,$start) = ReadingsVal($name,"${fmaj}_".$itemName."_PlannedOpTimeBegin",'00.00.0000 24') =~ m/(\d{2}).(\d{2}).(\d{4})\s(\d{2})/x;
(undef,undef,undef,$end) = ReadingsVal($name,"${cclv}_".$itemName."_PlannedOpTimeEnd",'00.00.0000 24') =~ m/(\d{2}).(\d{2}).(\d{4})\s(\d{2})/x; (undef,undef,undef,$end) = ReadingsVal($name,"${fmaj}_".$itemName."_PlannedOpTimeEnd",'00.00.0000 24') =~ m/(\d{2}).(\d{2}).(\d{4})\s(\d{2})/x;
} else { } else {
(undef,undef,undef,$start) = ReadingsVal($name,"${cclv}_".$itemName."_PlannedOpTimeBegin",'0000-00-00 24') =~ m/(\d{4})-(\d{2})-(\d{2})\s(\d{2})/x; (undef,undef,undef,$start) = ReadingsVal($name,"${fmaj}_".$itemName."_PlannedOpTimeBegin",'0000-00-00 24') =~ m/(\d{4})-(\d{2})-(\d{2})\s(\d{2})/x;
(undef,undef,undef,$end) = ReadingsVal($name,"${cclv}_".$itemName."_PlannedOpTimeEnd",'0000-00-00 24') =~ m/(\d{4})-(\d{2})-(\d{2})\s(\d{2})/x; (undef,undef,undef,$end) = ReadingsVal($name,"${fmaj}_".$itemName."_PlannedOpTimeEnd",'0000-00-00 24') =~ m/(\d{4})-(\d{2})-(\d{2})\s(\d{2})/x;
} }
$start = int($start); $start = int($start);