diff --git a/packages/helpermodules/measurement_logging/process_log.py b/packages/helpermodules/measurement_logging/process_log.py index 5f1dcd2c9e..64af2e36c1 100644 --- a/packages/helpermodules/measurement_logging/process_log.py +++ b/packages/helpermodules/measurement_logging/process_log.py @@ -434,7 +434,7 @@ def calc_energy_imported_by_source(energy_imported, energy_source): entry["cp"][key][f"energy_imported_{source}"] = calc_energy_imported_by_source( entry["cp"][key]["energy_imported"], entry["energy_source"][source]) for counter in entry["counter"].values(): - if counter["exported"] == 0: + if counter["grid"] is False: counter[f"energy_imported_{source}"] = calc_energy_imported_by_source( counter["energy_imported"], entry["energy_source"][source]) diff --git a/packages/helpermodules/measurement_logging/write_log.py b/packages/helpermodules/measurement_logging/write_log.py index fc0b3455a8..28c9248726 100644 --- a/packages/helpermodules/measurement_logging/write_log.py +++ b/packages/helpermodules/measurement_logging/write_log.py @@ -24,6 +24,11 @@ # { # "timestamp": int, # "date": str, +# "prices": { +# "grid": Preis für Netzbezug, +# "pv": Preis für PV-Strom, +# "bat": Preis für Speicherstrom +# } # "cp": { # "cp1": { # "imported": Zählerstand in Wh, @@ -190,6 +195,16 @@ def create_entry(log_type: LogType, sh_log_data: LegacySmartHomeLogData, previou else: date = timecheck.create_timestamp_YYYYMMDD() current_timestamp = int(timecheck.create_timestamp()) + + prices = data.data.general_data.data.prices + if data.data.optional_data.et_module is not None: + grid_price = data.data.optional_data.et_get_current_price() + else: + grid_price = prices.grid + prices_dict = {"grid": grid_price, + "pv": prices.pv, + "bat": prices.bat} + cp_dict = {} for cp in data.data.cp_data: try: @@ -252,6 +267,7 @@ def create_entry(log_type: LogType, sh_log_data: LegacySmartHomeLogData, previou new_entry = { "timestamp": current_timestamp, "date": date, + "prices": prices_dict, "cp": cp_dict, "ev": ev_dict, "counter": counter_dict,