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
2 changes: 2 additions & 0 deletions packages/modules/devices/shelly/shelly/bat.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ def update(self) -> None:
elif "em:0" in status:
meters = status['em:0']
for i in range(0, 3):
if meters.get(f'{alphabetical_index[i]}_current') is None:
continue
currents[(i+self.phase-1) % 3] = (float(meters[f'{alphabetical_index[i]}_current']) * self.factor
if meters.get(f'{alphabetical_index[i]}_current') else 0)
power = float(meters['total_act_power']) * self.factor
Expand Down
2 changes: 2 additions & 0 deletions packages/modules/devices/shelly/shelly/counter.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ def update(self) -> None:
power_factors = [0.0, 0.0, 0.0]
meters = status['em:0']
for i in range(0, 3):
if meters.get(f'{alphabetical_index[i]}_act_power') is None:
continue
powers[(i+self.phase-1) % 3] = (float(meters[f'{alphabetical_index[i]}_act_power']) * self.factor
if meters.get(f'{alphabetical_index[i]}_act_power') else 0)
voltages[(i+self.phase-1) % 3] = (float(meters[f'{alphabetical_index[i]}_voltage'])
Expand Down
4 changes: 2 additions & 2 deletions packages/modules/devices/shelly/shelly/inverter.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ def update(self) -> None:
elif "emeters" in status:
meters = status['emeters'] # shellyEM & shelly3EM
# shellyEM has one meter, shelly3EM has three meters
for i in range(0, 3):
for i in range(len(meters)):
currents[(i+self.phase-1) % 3] = (float(meters[i]['current']) * self.factor
if meters[i].get('current') else 0)
power = power + (float(meters[i]['power'] * self.factor))
# GEN 2+
# shelly Pro3EM
elif "em:0" in status:
meters = status['em:0']
for i in range(0, 3):
for i in range(len(meters)):
currents[(i+self.phase-1) % 3] = (float(meters[f'{alphabetical_index[i]}_current']) * self.factor
if meters.get(f'{alphabetical_index[i]}_current') else 0)
power = float(meters['total_act_power']) * self.factor
Expand Down