Skip to content

add support for shelly pro em #2591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 4 commits into from
Jul 29, 2025
Merged

add support for shelly pro em #2591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7e532c
add support for shelly pro em
ndrsnhs Jul 23, 2025
dab6e08
add single phase shellys as counter
ndrsnhs Jul 23, 2025
c19f730
add bat and inverter currents; add powers to test
ndrsnhs Jul 24, 2025
6ffdf0f
Merge branch 'openWB:master' into shelly-pro-em-gen2
ndrsnhs Jul 24, 2025
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
46 changes: 26 additions & 20 deletions packages/modules/devices/shelly/shelly/bat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ def initialize(self) -> None:
self.store = get_bat_value_store(self.component_config.id)
self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config))

def total_power_from_shelly(self) -> int:
total = 0
def update(self) -> None:
power = 0
if self.generation == 1:
status_url = "http://" + self.address + "/status"
else:
status_url = "http://" + self.address + "/rpc/Shelly.GetStatus"
status = req.get_http_session().get(status_url, timeout=3).json()

try:
if self.generation == 1:
if 'meters' in status:
Expand All @@ -49,28 +50,33 @@ def total_power_from_shelly(self) -> int:
meters = status['emeters'] # shellyEM & shelly3EM
# shellyEM has one meter, shelly3EM has three meters:
for meter in meters:
total = total + meter['power']
power = power + meter['power']
currents = [0, 0, 0]
else:
if 'switch:0' in status:
total = status['switch:0']['apower']
if 'switch:0' in status and 'apower' in status['switch:0']:
power = status['switch:0']['apower']
currents = [status['switch:0']['current'], 0, 0]
elif 'em1:0' in status:
power = status['em1:0']['act_power'] # shelly Pro EM Gen 2
currents = [status['em1:0']['current'], 0, 0]
elif 'pm1:0' in status:
total = status['pm1:0']['apower'] # shelly PM Mini Gen 3
power = status['pm1:0']['apower'] # shelly PM Mini Gen 3
currents = [status['pm1:0']['current'], 0, 0]
else:
total = status['em:0']['total_act_power'] # shelly Pro3EM
except KeyError:
log.exception("unsupported shelly device?")
finally:
return int(total)
power = status['em:0']['total_act_power'] # shelly Pro3EM
currents = [meter[f'{i}_current'] for i in 'abc']

def update(self) -> None:
bat = self.total_power_from_shelly() * self.factor
imported, exported = self.sim_counter.sim_count(bat)
bat_state = BatState(
power=bat,
imported=imported,
exported=exported
)
self.store.set(bat_state)
power = power * self.factor
imported, exported = self.sim_counter.sim_count(power)
bat_state = BatState(
power=power,
imported=imported,
exported=exported,
currents=currents
)
self.store.set(bat_state)
except KeyError:
log.exception("unsupported shelly device.")


component_descriptor = ComponentDescriptor(configuration_factory=ShellyBatSetup)
23 changes: 21 additions & 2 deletions packages/modules/devices/shelly/shelly/counter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,32 @@ def update(self) -> None:
power_factors = [meter[f'{i}_pf'] for i in 'abc']
power = meter['total_act_power'] * self.factor
# Shelly MiniPM G3
else:
meter = status['pm1:0']
elif "pm1:0" in status:
log.debug("single phase shelly")
meter = status['pm1:0']
voltages = [meter['voltage'], 0, 0]
currents = [meter['current'], 0, 0]
power = meter['apower']
frequency = meter['freq']
powers = [meter['apower'], 0, 0]
elif 'switch:0' in status and 'apower' in status['switch:0']:
log.debug("single phase shelly")
meter = status['switch:0']
power = meter['apower']
voltages = [meter['voltage'], 0, 0]
currents = [meter['current'], 0, 0]
frequency = meter['freq']
power_factors = [meter['pf'], 0, 0]
powers = [meter['apower'], 0, 0]
else:
log.debug("single phase shelly")
meter = status['em1:0']
power = meter['act_power'] # shelly Pro EM Gen 2
voltages = [meter['voltage'], 0, 0]
currents = [meter['current'], 0, 0]
frequency = meter['freq']
power_factors = [meter['pf'], 0, 0]
powers = [meter['act_power'], 0, 0]

imported, exported = self.sim_counter.sim_count(power)

Expand Down
42 changes: 23 additions & 19 deletions packages/modules/devices/shelly/shelly/inverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ def initialize(self) -> None:
self.store = get_inverter_value_store(self.component_config.id)
self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config))

def total_power_from_shelly(self) -> int:
total = 0
def update(self) -> None:
power = 0
if self.generation == 1:
status_url = "http://" + self.address + "/status"
else:
Expand All @@ -49,27 +49,31 @@ def total_power_from_shelly(self) -> int:
meters = status['emeters'] # shellyEM & shelly3EM
# shellyEM has one meter, shelly3EM has three meters:
for meter in meters:
total = total + meter['power']
power = power + meter['power']
else:
if 'switch:0' in status:
total = status['switch:0']['apower']
if 'switch:0' in status and 'apower' in status['switch:0']:
power = status['switch:0']['apower']
currents = [status['switch:0']['current'], 0, 0]
elif 'em1:0' in status:
power = status['em1:0']['act_power'] # shelly Pro EM Gen 2
currents = [status['em1:0']['current'], 0, 0]
elif 'pm1:0' in status:
total = status['pm1:0']['apower'] # shelly PM Mini Gen 3
power = status['pm1:0']['apower'] # shelly PM Mini Gen 3
currents = [status['pm1:0']['current'], 0, 0]
else:
total = status['em:0']['total_act_power'] # shelly Pro3EM
except KeyError:
log.exception("unsupported shelly device?")
finally:
return int(total)
power = status['em:0']['total_act_power'] # shelly Pro3EM
currents = [meter[f'{i}_current'] for i in 'abc']

def update(self) -> None:
pv = self.total_power_from_shelly() * self.factor
_, pv_exported = self.sim_counter.sim_count(pv)
inverter_state = InverterState(
power=pv,
exported=pv_exported
)
self.store.set(inverter_state)
pv = self.total_power_from_shelly() * self.factor
_, exported = self.sim_counter.sim_count(pv)
inverter_state = InverterState(
power=pv,
exported=exported,
currents=currents
Copy link
Contributor

@fawick fawick Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ndrsnhs currents gets not defined in the if self.generation == 1 block, so this causes an exception for gen1 devices.

)
self.store.set(inverter_state)
except KeyError:
log.exception("unsupported shelly device.")


component_descriptor = ComponentDescriptor(configuration_factory=ShellyInverterSetup)
2 changes: 1 addition & 1 deletion packages/modules/devices/shelly/shelly/shelly_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ def test_counter_shelly_minipm_g3(monkeypatch, requests_mock: requests_mock.mock


SAMPLE_COUNTER_STATE = CounterState(voltages=[230.9, 0, 0], power=230, currents=[
1, 0, 0], frequency=51, imported=100, exported=200)
1, 0, 0], frequency=51, imported=100, exported=200, powers=[230, 0, 0])