FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

76_SolarForecast.pm: contrib 0.63.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26065 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2022-05-20 14:41:28 +00:00
parent 70577691e7
commit 100ed2a97d
1 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
fhem/contrib/DS_Starter/76_SolarForecast.pm
View File

@ -2900,8 +2900,8 @@ sub _manageConsumerData {
__planSwitchTimes ($paref); # Consumer Switch Zeiten planen
__switchConsumer ($paref); # Consumer schalten
## consumer Hash ergänzen, Reading generieren
###############################################
## Consumer Schaltstatus und Schaltzeit ermitteln
###################################################
# my $rswstate = ConsumerVal ($hash, $c, "rswstate", "state"); # Reading mit Schaltstatus
# my $costate = ReadingsVal ($consumer, $rswstate, ""); # Schaltstatus
my $costate = isConsumerOn ($hash, $c) ? "on" :
@ -2910,7 +2910,7 @@ sub _manageConsumerData {
$data{$type}{$name}{consumers}{$c}{state} = $costate;
my ($pstate,$starttime,$stoptime) = __planningStateAndTimes ($paref);
my ($pstate,$starttime,$stoptime) = __getPlanningStateAndTimes ($paref);
push @$daref, "consumer${c}<>" ."name='$alias' state='$costate' planningstate='$pstate' "; # Consumer Infos
push @$daref, "consumer${c}_planned_start<>"."$starttime" if($starttime); # Consumer Start geplant
@ -3388,7 +3388,7 @@ sub __switchConsumer {
## Restlaufzeit Verbraucher ermitteln
######################################
my ($planstate,$startstr,$stoptstr) = __planningStateAndTimes ($paref);
my ($planstate,$startstr,$stoptstr) = __getPlanningStateAndTimes ($paref);
my $isConsRecommended = ConsumerVal ($hash, $c, "isConsumptionRecommended", 0);
$data{$type}{$name}{consumers}{$c}{remainTime} = 0;
@ -3552,24 +3552,36 @@ return $ena;
}
###################################################################
# Consumer Planungsstatus mit Schaltzeiten liefern
# Consumer Planstatus und Planzeit ermitteln
###################################################################
sub __planningStateAndTimes {
sub __getPlanningStateAndTimes {
my $paref = shift;
my $hash = $paref->{hash};
my $c = $paref->{consumer};
my $pstate = ConsumerVal ($hash, $c, "planstate", "");
$pstate = $pstate =~ /planned/xs ? "planned" :
$pstate =~ /switched\son/xs ? "started" :
$pstate =~ /switched\soff/xs ? "finished" :
$pstate =~ /priority/xs ? $pstate :
$pstate = $pstate =~ /planned/xs ? "planned" :
$pstate =~ /switching\son/xs ? "starting" :
$pstate =~ /switched\son/xs ? "started" :
$pstate =~ /switching\soff/xs ? "stopping" :
$pstate =~ /switched\soff/xs ? "finished" :
$pstate =~ /priority/xs ? $pstate :
"unknown";
my $startts = ConsumerVal ($hash, $c, "planswitchon", "");
my $stopts = ConsumerVal ($hash, $c, "planswitchoff", "");
#my $swtime = "";
#if ($pstate eq "started") {
# ($swtime, $startts) = lastConsumerSwitchtime ($hash, $c);
# Log3 ($hash->{NAME}, 1, "$hash->{NAME} - $c, swtime: $swtime, startts: $startts");
#}
#elsif ($pstate eq "finished") {
# ($swtime, $stopts) = lastConsumerSwitchtime ($hash, $c);
# Log3 ($hash->{NAME}, 1, "$hash->{NAME} - $c, swtime: $swtime, stopts:$stopts ");
#}
my $starttime = '';
my $stoptime = '';
$starttime = timestampToTimestring ($startts) if($startts);
@ -4929,7 +4941,7 @@ sub _graphicConsumerLegend {
$paref->{consumer} = $c;
my ($planstate,$starttime,$stoptime) = __planningStateAndTimes ($paref);
my ($planstate,$starttime,$stoptime) = __getPlanningStateAndTimes ($paref);
my $pstate = $caicon eq "times" ? $hqtxt{pstate}{$lang} : $htitles{pstate}{$lang};
$pstate =~ s/<pstate>/$planstate/xs;
@ -7217,9 +7229,9 @@ sub isConsumerOn {
return;
}
my $reg = ConsumerVal ($hash, $c, "onreg", "on");
my $rswstate = ConsumerVal ($hash, $c, "rswstate", "state"); # Reading mit Schaltstatus
my $swstate = ReadingsVal ($cname, $rswstate, "undef");
my $reg = ConsumerVal ($hash, $c, "onreg", "on");
my $rswstate = ConsumerVal ($hash, $c, "rswstate", "state"); # Reading mit Schaltstatus
my $swstate = ReadingsVal ($cname, $rswstate, "undef");
if ($swstate =~ m/^$reg$/x) {
return 1;
@ -7254,6 +7266,28 @@ sub isConsumerOff {
return;
}
################################################################
# liefert die Zeit des letzten Schaltvorganges
################################################################
sub lastConsumerSwitchtime {
my $hash = shift;
my $c = shift;
my $name = $hash->{NAME};
my $cname = ConsumerVal ($hash, $c, "name", ""); # Devicename Customer
if(!$defs{$cname}) {
Log3($name, 1, qq{$name - the consumer device "$cname" is invalid, the last switching time can't be identified});
return;
}
my $rswstate = ConsumerVal ($hash, $c, "rswstate", "state"); # Reading mit Schaltstatus
my $swtime = ReadingsTimestamp ($cname, $rswstate, ""); # Zeitstempel im Format 2016-02-16 19:34:24
my $swtimets = timestringToTimestamp ($swtime) if($swtime); # Unix Timestamp Format erzeugen
return ($swtime, $swtimets);
}
################################################################
# Funktion liefert "1" wenn die zusätzliche Einschaltbedingung
# aus dem Schlüssel "swoncond" im Consumer Attribut wahr ist