mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-02-25 03:44:52 +00:00
76_SolarForecast: max. possible inverters set to 4
git-svn-id: https://svn.fhem.de/fhem/trunk@29678 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1
parent
c9498a0e9f
commit
eb4023db4d
@ -1,5 +1,6 @@
|
||||
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
||||
# Do not insert empty lines here, update check depends on it
|
||||
- feature: 76_SolarForecast: max. possible inverters set to 4
|
||||
- feature: 98_vitoconnect.pm: enhanced error mapping
|
||||
now also language dependent
|
||||
- bugfix: 98_vitoconnect.pm: closing of file_handles, removed JSON::XS
|
||||
|
||||
@ -159,6 +159,8 @@ BEGIN {
|
||||
|
||||
# Versions History intern
|
||||
my %vNotesIntern = (
|
||||
"1.46.2" => "19.02.2025 aiAddRawData: save original data and sort to bin in sub aiAddInstancePV instead, _calcConsForecast_circular: include epiecAVG ".
|
||||
"fix NOTIFYDEV for consumers, change MAXINVERTER to 4 ",
|
||||
"1.46.1" => "18.02.2025 improve temp2bin, correct Log output to consumptionHistory, set setupStringDeclination can be free integer between 0..90 ",
|
||||
"1.46.0" => "17.02.2025 Notification System: print out last/next file pull if no messages are present, improvements and activation of ".
|
||||
"_calcConsForecast_circular, checkPlantConfig: add Data Memory check pvHistory 'con' ".
|
||||
@ -385,7 +387,7 @@ use constant {
|
||||
MAXBATTERIES => 3, # maximale Anzahl der möglichen Batterien
|
||||
MAXCONSUMER => 16, # maximale Anzahl der möglichen Consumer (Attribut)
|
||||
MAXPRODUCER => 3, # maximale Anzahl der möglichen anderen Produzenten (Attribut)
|
||||
MAXINVERTER => 3, # maximale Anzahl der möglichen Inverter
|
||||
MAXINVERTER => 4, # maximale Anzahl der möglichen Inverter
|
||||
|
||||
MAXSOCDEF => 95, # default Wert (%) auf den die Batterie maximal aufgeladen werden soll bzw. als aufgeladen gilt
|
||||
CARECYCLEDEF => 20, # default max. Anzahl Tage die zwischen der Batterieladung auf maxSoC liegen dürfen
|
||||
@ -5892,7 +5894,7 @@ sub _attrctrlDebug { ## no critic "not used"
|
||||
my $paref = shift;
|
||||
my $name = $paref->{name};
|
||||
my $aName = $paref->{aName};
|
||||
my $aVal = $paref->{aVal};
|
||||
my $aVal = $paref->{aVal} // '';
|
||||
|
||||
my $te = 'consumerSwitching';
|
||||
|
||||
@ -12004,7 +12006,7 @@ sub _calcConsForecast_circular {
|
||||
my $t = $paref->{t};
|
||||
my $date = $paref->{date}; # aktuelles Datum
|
||||
my $day = $paref->{day}; # aktuelles Tagdatum (01...31)
|
||||
my $dayname = $paref->{dayname}; # aktueller Tagname
|
||||
my $todayname = $paref->{dayname}; # aktueller Tagname
|
||||
|
||||
my $hash = $defs{$name};
|
||||
my $acref = $data{$name}{consumers};
|
||||
@ -12019,13 +12021,18 @@ sub _calcConsForecast_circular {
|
||||
my (@cona, $exconfc, $csme, %usage);
|
||||
$usage{tom}{con} = 0;
|
||||
|
||||
debugLog ($paref, 'consumption|consumption_long', "################### Start Consumption forecast ###################");
|
||||
debugLog ($paref, 'consumption_long', "Basics - installed locale: ".LOCALE_TIME.", used scheme: $lct");
|
||||
|
||||
## Verbrauch der hod-Stunden 01..24 u. gesamten Tag ermitteln
|
||||
###############################################################
|
||||
for my $h (1..24) { # Median für jede Stunde / Tag berechnen
|
||||
my $dt = timestringsFromOffset ($st, $h * 3559); # eine Sek. weniger als 1 Stunde
|
||||
$dt = timestringsFromOffset ($st, $h * 3559); # eine Sek. weniger als 1 Stunde
|
||||
my $dayname = $dt->{dayname};
|
||||
my $hh = sprintf "%02d", $h;
|
||||
|
||||
debugLog ($paref, 'consumption_long', "process Today dayname: $dayname, Tomorrow dayname: $tomdayname") if($h == 1);
|
||||
|
||||
my (@conh, @conhtom);
|
||||
my $mix = 0;
|
||||
|
||||
@ -12081,6 +12088,7 @@ sub _calcConsForecast_circular {
|
||||
|
||||
for my $n (sort{$a<=>$b} keys %{$data{$name}{pvhist}}) {
|
||||
next if ($n eq $day); # aktuellen (unvollständigen) Tag nicht berücksichtigen
|
||||
my $do = 1;
|
||||
|
||||
for my $c (sort{$a<=>$b} keys %{$acref}) { # historischer Verbrauch aller registrierten Verbraucher aufaddieren
|
||||
$exconfc = ConsumerVal ($hash, $c, 'exconfc', 0);
|
||||
@ -12088,9 +12096,7 @@ sub _calcConsForecast_circular {
|
||||
if ($exconfc) {
|
||||
## Tageswert Excludes finden und summieren
|
||||
############################################
|
||||
if ($exconfc == 1) { # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
|
||||
my $do = 1;
|
||||
|
||||
if ($do && $exconfc == 1) { # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
|
||||
if ($swdfcfc) { # nur gleiche Tage (Mo...So) einbeziehen
|
||||
my $hdn = HistoryVal ($hash, $n, 99, 'dayname', undef);
|
||||
$do = 0 if(!$hdn || $hdn ne $tomdayname);
|
||||
@ -12108,23 +12114,44 @@ sub _calcConsForecast_circular {
|
||||
}
|
||||
}
|
||||
|
||||
## hist. On-Stunden aller Tage aufnehmen
|
||||
##########################################
|
||||
## Stundenweise exkludes und inkludes aufnehmen
|
||||
#################################################
|
||||
$do = 1;
|
||||
if ($swdfcfc) { # nur gleiche Tage (Mo...So) einbeziehen
|
||||
my $hdn = HistoryVal ($hash, $n, 99, 'dayname', undef);
|
||||
$do = 0 if(!$hdn || $hdn ne $todayname);
|
||||
}
|
||||
|
||||
if ($do) {
|
||||
my $epiecelem = 1;
|
||||
|
||||
for my $h (1..24) { # excludieren ob exconfc 1 oder 2
|
||||
my $hh = sprintf "%02d", $h;
|
||||
$csme = HistoryVal ($hash, $n, $hh, "csme${c}", 0);
|
||||
|
||||
if ($csme) {
|
||||
$csme = sprintf "%.2f", $csme;
|
||||
$usage{$hh}{histcon} += $csme;
|
||||
$usage{$hh}{histnum}++;
|
||||
|
||||
debugLog ($paref, 'consumption_long', "consumer '$c' register for exclude day $n, hod: $hh - ".$csme." Wh");
|
||||
}
|
||||
|
||||
if ($exconfc == 2 && $lap == 1) { # Planungsdaten des Consumers inkludieren
|
||||
my $ehp = $data{$name}{consumers}{$c}{ehodpieces}{$hh};
|
||||
if ($exconfc == 2 && $lap == 1) { # AVG-Daten des Consumers inkludieren
|
||||
my $rt = $st + (3600 * ($h - 1)); # Schleifenlaufzeit
|
||||
my $plson = ConsumerVal ($name, $c, 'planswitchon', $st + 86400); # geplante Switch-on Zeit des Consumers
|
||||
my $plsoff = ConsumerVal ($name, $c, 'planswitchoff', 0); # geplante Switch-off Zeit des Consumers
|
||||
|
||||
if (defined $ehp) {
|
||||
$usage{$hh}{plancon} += $ehp;
|
||||
if ($rt >= $plson && $rt <= $plsoff) {
|
||||
if (defined $data{$name}{consumers}{$c}{epiecAVG}{$epiecelem}) {
|
||||
$usage{$hh}{plancon} += $data{$name}{consumers}{$c}{epiecAVG}{$epiecelem};
|
||||
$usage{$hh}{plannum}++;
|
||||
|
||||
debugLog ($paref, 'consumption_long', "consumer '$c' register epiecAVG: ".$data{$name}{consumers}{$c}{epiecAVG}{$epiecelem}." Wh for include in Hour $hh");
|
||||
|
||||
$epiecelem++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -12143,7 +12170,7 @@ sub _calcConsForecast_circular {
|
||||
|
||||
if (defined $usage{$hh}{histnum}) { # historische Stundenverbräuche exkludieren
|
||||
my $exhcon = sprintf "%.0f", ($usage{$hh}{histcon} / $usage{$hh}{histnum}); # durchschnittlichen Verbrauchswert
|
||||
$usage{$hh}{con} -= $exhcon;
|
||||
$usage{$hh}{con} -= $exhcon if($usage{$hh}{con} > $exhcon);
|
||||
|
||||
debugLog ($paref, 'consumption_long', "excl. hist $exhcon Wh for Hour $hh, Considered value numbers: ".$usage{$hh}{histnum});
|
||||
}
|
||||
@ -17053,9 +17080,13 @@ sub aiAddInstancePV { ## no critic "not used"
|
||||
my $rr1c = AiRawdataVal ($hash, $idx, 'rr1c', undef);
|
||||
my $sunalt = AiRawdataVal ($hash, $idx, 'sunalt', 0);
|
||||
|
||||
my $tbin = temp2bin ($temp) if(defined $temp);
|
||||
my $cbin = cloud2bin ($wcc) if(defined $wcc);
|
||||
my $sabin = sunalt2bin ($sunalt);
|
||||
|
||||
eval { $dtree->add_instance (attributes => { rad1h => $rad1h,
|
||||
temp => $temp,
|
||||
wcc => $wcc,
|
||||
temp => $tbin,
|
||||
wcc => $cbin,
|
||||
rr1c => $rr1c,
|
||||
sunalt => $sunalt,
|
||||
hod => $hod
|
||||
@ -17402,17 +17433,13 @@ sub aiAddRawData {
|
||||
my $rr1c = HistoryVal ($hash, $pvd, $hod, 'rr1c', undef);
|
||||
my $rad1h = HistoryVal ($hash, $pvd, $hod, 'rad1h', undef);
|
||||
|
||||
my $tbin = temp2bin ($temp) if(defined $temp);
|
||||
my $cbin = cloud2bin ($wcc) if(defined $wcc);
|
||||
my $sabin = sunalt2bin ($sunalt);
|
||||
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{sunalt} = $sabin;
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{sunalt} = $sunalt;
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{sunaz} = $sunaz;
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{dayname} = $dayname;
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{hod} = $hod;
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{temp} = $tbin if(defined $tbin);
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{temp} = sprintf "%.0f", $temp if(defined $temp);
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{con} = $con if(defined $con && $con >= 0);
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{wcc} = $cbin if(defined $cbin);
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{wcc} = $wcc if(defined $wcc);
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{rr1c} = $rr1c if(defined $rr1c);
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{rad1h} = $rad1h if(defined $rad1h && $rad1h > 0);
|
||||
|
||||
@ -17428,7 +17455,7 @@ sub aiAddRawData {
|
||||
my $pvrl = HistoryVal ($hash, $pvd, $hod, 'pvrl', undef);
|
||||
$data{$name}{aidectree}{airaw}{$ridx}{pvrl} = $pvrl if(defined $pvrl && $pvrl > 0);
|
||||
|
||||
debugLog ($paref, 'aiProcess', "AI raw add - idx: $ridx, day: $pvd, hod: $hod, sunalt: $sabin, sunaz: $sunaz, rad1h: ".(defined $rad1h ? $rad1h : '-').", pvrl: ".(defined $pvrl ? $pvrl : '-').", con: ".(defined $con ? $con : '-').", wcc: ".(defined $cbin ? $cbin : '-').", rr1c: ".(defined $rr1c ? $rr1c : '-').", temp: ".(defined $tbin ? $tbin : '-'), 4);
|
||||
debugLog ($paref, 'aiProcess', "AI raw add - idx: $ridx, day: $pvd, hod: $hod, sunalt: $sunalt, sunaz: $sunaz, rad1h: ".(defined $rad1h ? $rad1h : '-').", pvrl: ".(defined $pvrl ? $pvrl : '-').", con: ".(defined $con ? $con : '-').", wcc: ".(defined $wcc ? $wcc : '-').", rr1c: ".(defined $rr1c ? $rr1c : '-').", temp: ".(defined $temp ? $temp : '-'), 4);
|
||||
}
|
||||
}
|
||||
|
||||
@ -19805,8 +19832,8 @@ sub createAssociatedWith {
|
||||
for my $c (sort{$a<=>$b} keys %{$data{$name}{consumers}}) { # Consumer Devices
|
||||
my $consumer = AttrVal ($name, "consumer${c}", "");
|
||||
my ($ac,$hc) = parseParams ($consumer);
|
||||
my $codev = $ac->[0] // '';
|
||||
my $dswitch = $hc->{switchdev} // ''; # alternatives Schaltdevice
|
||||
my ($codev) = split ":", ($ac->[0] // '');
|
||||
my ($dswitch) = split ":", ($hc->{switchdev} // ''); # alternatives Schaltdevice
|
||||
push @cd, $codev if($codev);
|
||||
push @cd, $dswitch if($dswitch);
|
||||
}
|
||||
@ -21809,6 +21836,8 @@ return $def;
|
||||
# ehodpieces - geplante Energiescheiben nach Tagesstunde (hour of day) (Hash)
|
||||
# dswoncond - Device zur Lieferung einer zusätzliche Einschaltbedingung
|
||||
# planstate - Planungsstatus
|
||||
# planswitchon - geplante Switch-On Zeit
|
||||
# planswitchoff - geplante Switch-Off Zeit
|
||||
# planSupplement - Ergänzung zum Planungsstatus
|
||||
# rswoncond - Reading zur Lieferung einer zusätzliche Einschaltbedingung
|
||||
# swoncondregex - Regex einer zusätzliche Einschaltbedingung
|
||||
|
||||
@ -159,7 +159,8 @@ BEGIN {
|
||||
|
||||
# Versions History intern
|
||||
my %vNotesIntern = (
|
||||
"1.46.2" => "19.02.2025 aiAddRawData: save original data and sort to bin in sub aiAddInstancePV instead, _calcConsForecast_circular: include epiecAVG ",
|
||||
"1.46.2" => "19.02.2025 aiAddRawData: save original data and sort to bin in sub aiAddInstancePV instead, _calcConsForecast_circular: include epiecAVG ".
|
||||
"fix NOTIFYDEV for consumers, change MAXINVERTER to 4 ",
|
||||
"1.46.1" => "18.02.2025 improve temp2bin, correct Log output to consumptionHistory, set setupStringDeclination can be free integer between 0..90 ",
|
||||
"1.46.0" => "17.02.2025 Notification System: print out last/next file pull if no messages are present, improvements and activation of ".
|
||||
"_calcConsForecast_circular, checkPlantConfig: add Data Memory check pvHistory 'con' ".
|
||||
@ -386,7 +387,7 @@ use constant {
|
||||
MAXBATTERIES => 3, # maximale Anzahl der möglichen Batterien
|
||||
MAXCONSUMER => 16, # maximale Anzahl der möglichen Consumer (Attribut)
|
||||
MAXPRODUCER => 3, # maximale Anzahl der möglichen anderen Produzenten (Attribut)
|
||||
MAXINVERTER => 3, # maximale Anzahl der möglichen Inverter
|
||||
MAXINVERTER => 4, # maximale Anzahl der möglichen Inverter
|
||||
|
||||
MAXSOCDEF => 95, # default Wert (%) auf den die Batterie maximal aufgeladen werden soll bzw. als aufgeladen gilt
|
||||
CARECYCLEDEF => 20, # default max. Anzahl Tage die zwischen der Batterieladung auf maxSoC liegen dürfen
|
||||
@ -12005,7 +12006,7 @@ sub _calcConsForecast_circular {
|
||||
my $t = $paref->{t};
|
||||
my $date = $paref->{date}; # aktuelles Datum
|
||||
my $day = $paref->{day}; # aktuelles Tagdatum (01...31)
|
||||
my $dayname = $paref->{dayname}; # aktueller Tagname
|
||||
my $todayname = $paref->{dayname}; # aktueller Tagname
|
||||
|
||||
my $hash = $defs{$name};
|
||||
my $acref = $data{$name}{consumers};
|
||||
@ -12087,6 +12088,7 @@ sub _calcConsForecast_circular {
|
||||
|
||||
for my $n (sort{$a<=>$b} keys %{$data{$name}{pvhist}}) {
|
||||
next if ($n eq $day); # aktuellen (unvollständigen) Tag nicht berücksichtigen
|
||||
my $do = 1;
|
||||
|
||||
for my $c (sort{$a<=>$b} keys %{$acref}) { # historischer Verbrauch aller registrierten Verbraucher aufaddieren
|
||||
$exconfc = ConsumerVal ($hash, $c, 'exconfc', 0);
|
||||
@ -12094,9 +12096,7 @@ sub _calcConsForecast_circular {
|
||||
if ($exconfc) {
|
||||
## Tageswert Excludes finden und summieren
|
||||
############################################
|
||||
if ($exconfc == 1) { # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
|
||||
my $do = 1;
|
||||
|
||||
if ($do && $exconfc == 1) { # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
|
||||
if ($swdfcfc) { # nur gleiche Tage (Mo...So) einbeziehen
|
||||
my $hdn = HistoryVal ($hash, $n, 99, 'dayname', undef);
|
||||
$do = 0 if(!$hdn || $hdn ne $tomdayname);
|
||||
@ -12114,8 +12114,15 @@ sub _calcConsForecast_circular {
|
||||
}
|
||||
}
|
||||
|
||||
## hist. On-Stunden aller Tage aufnehmen
|
||||
##########################################
|
||||
## Stundenweise exkludes und inkludes aufnehmen
|
||||
#################################################
|
||||
$do = 1;
|
||||
if ($swdfcfc) { # nur gleiche Tage (Mo...So) einbeziehen
|
||||
my $hdn = HistoryVal ($hash, $n, 99, 'dayname', undef);
|
||||
$do = 0 if(!$hdn || $hdn ne $todayname);
|
||||
}
|
||||
|
||||
if ($do) {
|
||||
my $epiecelem = 1;
|
||||
|
||||
for my $h (1..24) { # excludieren ob exconfc 1 oder 2
|
||||
@ -12123,8 +12130,11 @@ sub _calcConsForecast_circular {
|
||||
$csme = HistoryVal ($hash, $n, $hh, "csme${c}", 0);
|
||||
|
||||
if ($csme) {
|
||||
$csme = sprintf "%.2f", $csme;
|
||||
$usage{$hh}{histcon} += $csme;
|
||||
$usage{$hh}{histnum}++;
|
||||
|
||||
debugLog ($paref, 'consumption_long', "consumer '$c' register for exclude day $n, hod: $hh - ".$csme." Wh");
|
||||
}
|
||||
|
||||
if ($exconfc == 2 && $lap == 1) { # AVG-Daten des Consumers inkludieren
|
||||
@ -12146,6 +12156,7 @@ sub _calcConsForecast_circular {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$lap++;
|
||||
}
|
||||
@ -19821,8 +19832,8 @@ sub createAssociatedWith {
|
||||
for my $c (sort{$a<=>$b} keys %{$data{$name}{consumers}}) { # Consumer Devices
|
||||
my $consumer = AttrVal ($name, "consumer${c}", "");
|
||||
my ($ac,$hc) = parseParams ($consumer);
|
||||
my $codev = $ac->[0] // '';
|
||||
my $dswitch = $hc->{switchdev} // ''; # alternatives Schaltdevice
|
||||
my ($codev) = split ":", ($ac->[0] // '');
|
||||
my ($dswitch) = split ":", ($hc->{switchdev} // ''); # alternatives Schaltdevice
|
||||
push @cd, $codev if($codev);
|
||||
push @cd, $dswitch if($dswitch);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user