diff --git a/fhem/FHEM/76_SolarForecast.pm b/fhem/FHEM/76_SolarForecast.pm
index 226d604af..0380ac7a6 100644
--- a/fhem/FHEM/76_SolarForecast.pm
+++ b/fhem/FHEM/76_SolarForecast.pm
@@ -157,7 +157,8 @@ BEGIN {
# Versions History intern
my %vNotesIntern = (
- "1.22.0" => "01.06.2024 change setter currentMeterDev to attr setupMeterDev, plantConfiguration: setModel after restore ",
+ "1.22.0" => "01.06.2024 change setter currentMeterDev to attr setupMeterDev, plantConfiguration: setModel after restore ".
+ "delete reset currentMeterSet ",
"1.21.5" => "30.05.2024 listDataPool: list current can operate three hash levels, first preparation for remote objects ",
"1.21.4" => "28.05.2024 __getCyclesAndRuntime: rename numberDayStarts to cycleDayNum ".
"currentRunMtsConsumer_XX: edit commandref, Consumers: replace avgruntime by runtimeAvgDay ".
@@ -1412,7 +1413,6 @@ sub Set {
consumption
currentBatterySet
currentInverterSet
- currentMeterSet
energyH4TriggerSet
inverterStringSet
moduleRoofTopSet
@@ -2400,29 +2400,6 @@ sub _setreset { ## no critic "not used"
return;
}
- if ($prop eq 'currentMeterSet') {
- readingsDelete ($hash, "Current_GridConsumption");
- readingsDelete ($hash, "Current_GridFeedIn");
- delete $data{$type}{$name}{circular}{'99'}{initdayfeedin};
- delete $data{$type}{$name}{circular}{'99'}{gridcontotal};
- delete $data{$type}{$name}{circular}{'99'}{initdaygcon};
- delete $data{$type}{$name}{circular}{'99'}{feedintotal};
- delete $data{$type}{$name}{current}{gridconsumption};
- delete $data{$type}{$name}{current}{tomorrowconsumption};
- delete $data{$type}{$name}{current}{gridfeedin};
- delete $data{$type}{$name}{current}{consumption};
- delete $data{$type}{$name}{current}{autarkyrate};
- delete $data{$type}{$name}{current}{selfconsumption};
- delete $data{$type}{$name}{current}{selfconsumptionrate};
- delete $data{$type}{$name}{current}{eFeedInTariff};
- delete $data{$type}{$name}{current}{eFeedInTariffCcy};
- delete $data{$type}{$name}{current}{ePurchasePrice};
- delete $data{$type}{$name}{current}{ePurchasePriceCcy};
- delete $data{$type}{$name}{current}{x_remote};
-
- writeCacheToFile ($hash, "plantconfig", $plantcfg.$name); # Anlagenkonfiguration File schreiben
- }
-
if ($prop eq 'currentBatterySet') {
readingsDelete ($hash, 'Current_PowerBatIn');
readingsDelete ($hash, 'Current_PowerBatOut');
@@ -5671,7 +5648,24 @@ sub _attrMeterDev { ## no critic "not used"
}
}
- if ($paref->{cmd} eq 'del' ) {
+ if ($paref->{cmd} eq 'del' ) {
+ readingsDelete ($hash, "Current_GridConsumption");
+ readingsDelete ($hash, "Current_GridFeedIn");
+ delete $data{$type}{$name}{circular}{'99'}{initdayfeedin};
+ delete $data{$type}{$name}{circular}{'99'}{gridcontotal};
+ delete $data{$type}{$name}{circular}{'99'}{initdaygcon};
+ delete $data{$type}{$name}{circular}{'99'}{feedintotal};
+ delete $data{$type}{$name}{current}{gridconsumption};
+ delete $data{$type}{$name}{current}{tomorrowconsumption};
+ delete $data{$type}{$name}{current}{gridfeedin};
+ delete $data{$type}{$name}{current}{consumption};
+ delete $data{$type}{$name}{current}{autarkyrate};
+ delete $data{$type}{$name}{current}{selfconsumption};
+ delete $data{$type}{$name}{current}{selfconsumptionrate};
+ delete $data{$type}{$name}{current}{eFeedInTariff};
+ delete $data{$type}{$name}{current}{eFeedInTariffCcy};
+ delete $data{$type}{$name}{current}{ePurchasePrice};
+ delete $data{$type}{$name}{current}{ePurchasePriceCcy};
delete $data{$type}{$name}{current}{x_remote};
}
@@ -18800,7 +18794,6 @@ to ensure that the system configuration is correct.
| set <name> reset consumption <Day> <Hour> (e.g. set <name> reset consumption 08 10) |
currentBatterySet | deletes the set battery device and corresponding data. |
currentInverterSet | deletes the set inverter device and corresponding data. |
- currentMeterSet | deletes the set meter device and corresponding data. |
energyH4TriggerSet | deletes the 4-hour energy trigger points |
inverterStringSet | deletes the string configuration of the installation |
powerTriggerSet | deletes the trigger points for PV generation values |
@@ -20350,12 +20343,11 @@ to ensure that the system configuration is correct.
Example:
- attr <name> setupMeterDev Meter gcon=Wirkleistung:W contotal=BezWirkZaehler:kWh gfeedin=-gcon feedtotal=EinWirkZaehler:kWh conprice=powerCost:€ feedprice=0.1269:€
-
- # Device Meter provides the current grid reference in the reading "Wirkleistung" (W),
- the sum of the grid reference in the reading "BezWirkZaehler" (kWh), the current feed in "Wirkleistung" if "Wirkleistung" is negative,
- the sum of the feed in the reading "EinWirkZaehler". (kWh)
+ attr <name> setupMeterDev Meter gcon=Wirkleistung:W contotal=BezWirkZaehler:kWh gfeedin=-gcon feedtotal=EinWirkZaehler:kWh conprice=powerCost:€ feedprice=0.1269:€
+
+
+ Note: Deleting the attribute also removes the internally corresponding data.
@@ -21082,7 +21074,6 @@ die ordnungsgemäße Anlagenkonfiguration geprüft werden.
| set <name> reset consumption <Tag> <Stunde> (z.B. set <name> reset consumption 08 10) |
currentBatterySet | löscht das eingestellte Batteriedevice und korrespondierende Daten |
currentInverterSet | löscht das eingestellte Inverterdevice und korrespondierende Daten |
- currentMeterSet | löscht das eingestellte Meterdevice und korrespondierende Daten |
energyH4TriggerSet | löscht die 4-Stunden Energie Triggerpunkte |
inverterStringSet | löscht die Stringkonfiguration der Anlage |
powerTriggerSet | löscht die Triggerpunkte für PV Erzeugungswerte |
@@ -22632,12 +22623,11 @@ die ordnungsgemäße Anlagenkonfiguration geprüft werden.
Beispiel:
- attr <name> setupMeterDev Meter gcon=Wirkleistung:W contotal=BezWirkZaehler:kWh gfeedin=-gcon feedtotal=EinWirkZaehler:kWh conprice=powerCost:€ feedprice=0.1269:€
-
- # Device Meter liefert den aktuellen Netzbezug im Reading "Wirkleistung" (W),
- die Summe des Netzbezugs im Reading "BezWirkZaehler" (kWh), die aktuelle Einspeisung in "Wirkleistung" wenn "Wirkleistung" negativ ist,
- die Summe der Einspeisung im Reading "EinWirkZaehler" (kWh)
+ attr <name> setupMeterDev Meter gcon=Wirkleistung:W contotal=BezWirkZaehler:kWh gfeedin=-gcon feedtotal=EinWirkZaehler:kWh conprice=powerCost:€ feedprice=0.1269:€
+
+
+ Hinweis: Durch Löschen des Attributes werden ebenfalls die intern korrespondierenden Daten entfernt.
diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm
index 226d604af..0380ac7a6 100644
--- a/fhem/contrib/DS_Starter/76_SolarForecast.pm
+++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm
@@ -157,7 +157,8 @@ BEGIN {
# Versions History intern
my %vNotesIntern = (
- "1.22.0" => "01.06.2024 change setter currentMeterDev to attr setupMeterDev, plantConfiguration: setModel after restore ",
+ "1.22.0" => "01.06.2024 change setter currentMeterDev to attr setupMeterDev, plantConfiguration: setModel after restore ".
+ "delete reset currentMeterSet ",
"1.21.5" => "30.05.2024 listDataPool: list current can operate three hash levels, first preparation for remote objects ",
"1.21.4" => "28.05.2024 __getCyclesAndRuntime: rename numberDayStarts to cycleDayNum ".
"currentRunMtsConsumer_XX: edit commandref, Consumers: replace avgruntime by runtimeAvgDay ".
@@ -1412,7 +1413,6 @@ sub Set {
consumption
currentBatterySet
currentInverterSet
- currentMeterSet
energyH4TriggerSet
inverterStringSet
moduleRoofTopSet
@@ -2400,29 +2400,6 @@ sub _setreset { ## no critic "not used"
return;
}
- if ($prop eq 'currentMeterSet') {
- readingsDelete ($hash, "Current_GridConsumption");
- readingsDelete ($hash, "Current_GridFeedIn");
- delete $data{$type}{$name}{circular}{'99'}{initdayfeedin};
- delete $data{$type}{$name}{circular}{'99'}{gridcontotal};
- delete $data{$type}{$name}{circular}{'99'}{initdaygcon};
- delete $data{$type}{$name}{circular}{'99'}{feedintotal};
- delete $data{$type}{$name}{current}{gridconsumption};
- delete $data{$type}{$name}{current}{tomorrowconsumption};
- delete $data{$type}{$name}{current}{gridfeedin};
- delete $data{$type}{$name}{current}{consumption};
- delete $data{$type}{$name}{current}{autarkyrate};
- delete $data{$type}{$name}{current}{selfconsumption};
- delete $data{$type}{$name}{current}{selfconsumptionrate};
- delete $data{$type}{$name}{current}{eFeedInTariff};
- delete $data{$type}{$name}{current}{eFeedInTariffCcy};
- delete $data{$type}{$name}{current}{ePurchasePrice};
- delete $data{$type}{$name}{current}{ePurchasePriceCcy};
- delete $data{$type}{$name}{current}{x_remote};
-
- writeCacheToFile ($hash, "plantconfig", $plantcfg.$name); # Anlagenkonfiguration File schreiben
- }
-
if ($prop eq 'currentBatterySet') {
readingsDelete ($hash, 'Current_PowerBatIn');
readingsDelete ($hash, 'Current_PowerBatOut');
@@ -5671,7 +5648,24 @@ sub _attrMeterDev { ## no critic "not used"
}
}
- if ($paref->{cmd} eq 'del' ) {
+ if ($paref->{cmd} eq 'del' ) {
+ readingsDelete ($hash, "Current_GridConsumption");
+ readingsDelete ($hash, "Current_GridFeedIn");
+ delete $data{$type}{$name}{circular}{'99'}{initdayfeedin};
+ delete $data{$type}{$name}{circular}{'99'}{gridcontotal};
+ delete $data{$type}{$name}{circular}{'99'}{initdaygcon};
+ delete $data{$type}{$name}{circular}{'99'}{feedintotal};
+ delete $data{$type}{$name}{current}{gridconsumption};
+ delete $data{$type}{$name}{current}{tomorrowconsumption};
+ delete $data{$type}{$name}{current}{gridfeedin};
+ delete $data{$type}{$name}{current}{consumption};
+ delete $data{$type}{$name}{current}{autarkyrate};
+ delete $data{$type}{$name}{current}{selfconsumption};
+ delete $data{$type}{$name}{current}{selfconsumptionrate};
+ delete $data{$type}{$name}{current}{eFeedInTariff};
+ delete $data{$type}{$name}{current}{eFeedInTariffCcy};
+ delete $data{$type}{$name}{current}{ePurchasePrice};
+ delete $data{$type}{$name}{current}{ePurchasePriceCcy};
delete $data{$type}{$name}{current}{x_remote};
}
@@ -18800,7 +18794,6 @@ to ensure that the system configuration is correct.
| set <name> reset consumption <Day> <Hour> (e.g. set <name> reset consumption 08 10) |
currentBatterySet | deletes the set battery device and corresponding data. |
currentInverterSet | deletes the set inverter device and corresponding data. |
- currentMeterSet | deletes the set meter device and corresponding data. |
energyH4TriggerSet | deletes the 4-hour energy trigger points |
inverterStringSet | deletes the string configuration of the installation |
powerTriggerSet | deletes the trigger points for PV generation values |
@@ -20350,12 +20343,11 @@ to ensure that the system configuration is correct.
Example:
- attr <name> setupMeterDev Meter gcon=Wirkleistung:W contotal=BezWirkZaehler:kWh gfeedin=-gcon feedtotal=EinWirkZaehler:kWh conprice=powerCost:€ feedprice=0.1269:€
-
- # Device Meter provides the current grid reference in the reading "Wirkleistung" (W),
- the sum of the grid reference in the reading "BezWirkZaehler" (kWh), the current feed in "Wirkleistung" if "Wirkleistung" is negative,
- the sum of the feed in the reading "EinWirkZaehler". (kWh)
+ attr <name> setupMeterDev Meter gcon=Wirkleistung:W contotal=BezWirkZaehler:kWh gfeedin=-gcon feedtotal=EinWirkZaehler:kWh conprice=powerCost:€ feedprice=0.1269:€
+
+
+ Note: Deleting the attribute also removes the internally corresponding data.
@@ -21082,7 +21074,6 @@ die ordnungsgemäße Anlagenkonfiguration geprüft werden.
| set <name> reset consumption <Tag> <Stunde> (z.B. set <name> reset consumption 08 10) |
currentBatterySet | löscht das eingestellte Batteriedevice und korrespondierende Daten |
currentInverterSet | löscht das eingestellte Inverterdevice und korrespondierende Daten |
- currentMeterSet | löscht das eingestellte Meterdevice und korrespondierende Daten |
energyH4TriggerSet | löscht die 4-Stunden Energie Triggerpunkte |
inverterStringSet | löscht die Stringkonfiguration der Anlage |
powerTriggerSet | löscht die Triggerpunkte für PV Erzeugungswerte |
@@ -22632,12 +22623,11 @@ die ordnungsgemäße Anlagenkonfiguration geprüft werden.
Beispiel:
- attr <name> setupMeterDev Meter gcon=Wirkleistung:W contotal=BezWirkZaehler:kWh gfeedin=-gcon feedtotal=EinWirkZaehler:kWh conprice=powerCost:€ feedprice=0.1269:€
-
- # Device Meter liefert den aktuellen Netzbezug im Reading "Wirkleistung" (W),
- die Summe des Netzbezugs im Reading "BezWirkZaehler" (kWh), die aktuelle Einspeisung in "Wirkleistung" wenn "Wirkleistung" negativ ist,
- die Summe der Einspeisung im Reading "EinWirkZaehler" (kWh)
+ attr <name> setupMeterDev Meter gcon=Wirkleistung:W contotal=BezWirkZaehler:kWh gfeedin=-gcon feedtotal=EinWirkZaehler:kWh conprice=powerCost:€ feedprice=0.1269:€
+
+
+ Hinweis: Durch Löschen des Attributes werden ebenfalls die intern korrespondierenden Daten entfernt.