Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/modules/devices/fronius/fronius_http_api/counter.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,12 @@ def update(self, powerflow_response: Dict, meter_system_response: Optional[Dict]
if meter.location in (MeterLocation.external, MeterLocation.subload):
power *= -1

currents = [powers[i] / meter.voltages[i] for i in range(0, 3)]

currents = [
powers[i] / meter.voltages[i]
if powers[i] is not None and meter.voltages[i] not in (None, 0)
else 0
for i in range(3)
]
counter_state = CounterState(
voltages=meter.voltages,
currents=currents,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ def update(self, meter_system_response: Optional[Dict] = None) -> None:
# Dokumentation (4.8.6/4.8.7) positive Werte für Erzeugung -- openWBs Konvention ist umgekehrt
# (negativ = Erzeugung, siehe inverter.py), daher wird hier immer invertiert.
power = meter.power_sum * -1
currents = [meter.powers[i] / meter.voltages[i] for i in range(0, 3)]
currents = [
meter.powers[i] / meter.voltages[i]
if meter.powers[i] is not None and meter.voltages[i] not in (None, 0)
else 0
for i in range(3)
]

self.peak_filter.check_values(power)
_, exported = self.sim_counter.sim_count(power)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@ def read_meter(session: Session,
data = _fetch_device_scope(session, ip_address, meter_id, variant)
location_key = "Meter_Location_Current"
power_sum_key = "PowerReal_P_Sum"
powers = [data["PowerReal_P_Phase_"+str(num)] for num in range(1, 4)]
voltages = [data["Voltage_AC_Phase_"+str(num)] for num in range(1, 4)]
power_factors = [data["PowerFactor_Phase_"+str(num)] for num in range(1, 4)]
frequency = data["Frequency_Phase_Average"]
powers = [data.get(f"PowerReal_P_Phase_{num}", 0) for num in range(1, 4)]
voltages = [data.get(f"Voltage_AC_Phase_{num}", 0) for num in range(1, 4)]
power_factors = [data.get(f"PowerFactor_Phase_{num}", 0) for num in range(1, 4)]
frequency = data.get("Frequency_Phase_Average", 50)
elif variant == 2:
if meter_system_response is None:
raise ValueError("meter_system_response wird für Variante 2 benötigt")
data = dict(meter_system_response["Body"]["Data"]).get(str(meter_id))
location_key = "SMARTMETER_VALUE_LOCATION_U16"
power_sum_key = "SMARTMETER_POWERACTIVE_MEAN_SUM_F64"
powers = [data["SMARTMETER_POWERACTIVE_MEAN_0"+str(num)+"_F64"] for num in range(1, 4)]
voltages = [data["SMARTMETER_VOLTAGE_0"+str(num)+"_F64"] for num in range(1, 4)]
power_factors = [data["SMARTMETER_FACTOR_POWER_0"+str(num)+"_F64"] for num in range(1, 4)]
frequency = data["GRID_FREQUENCY_MEAN_F32"]
powers = [data.get(f"SMARTMETER_POWERACTIVE_MEAN_0{num}_F64", 0) for num in range(1, 4)]
voltages = [data.get(f"SMARTMETER_VOLTAGE_0{num}_F64", 0) for num in range(1, 4)]
power_factors = [data.get(f"SMARTMETER_FACTOR_POWER_0{num}_F64", 0) for num in range(1, 4)]
frequency = data.get("GRID_FREQUENCY_MEAN_F32", 50)
else:
raise ValueError("Unbekannte Variante: "+str(variant))

Expand Down
Loading