Skip to content

Commit

Permalink
Add support for EM Gen3 (#530)
Browse files Browse the repository at this point in the history
* Add support for EM Gen3

* Fix entities
  • Loading branch information
bieniu authored Nov 25, 2024
1 parent 2f129f9 commit f997d9c
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Shellies Discovery Gen2 will automatically install/update the script on your She
- Shelly BLU TRV (via Shelly BLU Gateway Gen3)
- Shelly DALI Dimmer Gen3
- Shelly Dimmer 0/1-10V PM Gen3
- Shelly EM Gen3
- Shelly H&T Gen3
- Shelly i4 Gen3
- Shelly Plug S Gen3
Expand Down
1 change: 1 addition & 0 deletions info.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Shellies Discovery Gen2 will automatically install/update the script on your She
- Shelly BLU TRV (via Shelly BLU Gateway Gen3)
- Shelly DALI Dimmer Gen3
- Shelly Dimmer 0/1-10V PM Gen3
- Shelly EM Gen3
- Shelly H&T Gen3
- Shelly i4 Gen3
- Shelly Plug S Gen3
Expand Down
37 changes: 36 additions & 1 deletion python_scripts/shellies_discovery_gen2.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""This script adds MQTT discovery support for Shellies Gen2 devices."""

VERSION = "3.5.4"
VERSION = "3.6.0"

ATTR_BATTERY_POWERED = "battery_powered"
ATTR_BINARY_SENSORS = "binary_sensors"
Expand Down Expand Up @@ -238,6 +238,7 @@
MODEL_1PM_MINI_G3 = "shelly1pmminig3"
MODEL_2PM_G3 = "shelly2pmg3"
MODEL_BLU_GATEWAY_G3 = "shellyblugwg3"
MODEL_EM_G3 = "shellyemg3"
MODEL_HT_G3 = "shellyhtg3"
MODEL_I4_G3 = "shellyi4g3"
MODEL_PLUG_S_G3 = "shellyplugsg3"
Expand Down Expand Up @@ -1583,6 +1584,40 @@ def get_component_ids(component: str, config):
SENSOR_MOTION: DESCRIPTION_SENSOR_BTH_MOTION,
},
},
MODEL_EM_G3: {
ATTR_NAME: "Shelly EM Gen3",
ATTR_MODEL_ID: "S3EM-002CXCEU",
ATTR_GEN: 3,
ATTR_EMETERS: 2,
ATTR_BINARY_SENSORS: {SENSOR_CLOUD: DESCRIPTION_SENSOR_CLOUD},
ATTR_BUTTONS: {BUTTON_RESTART: DESCRIPTION_BUTTON_RESTART},
ATTR_RELAYS: 1,
ATTR_RELAY_SENSORS: {
SENSOR_TEMPERATURE: DESCRIPTION_SENSOR_RELAY_TEMPERATURE_STATUS
},
ATTR_SENSORS: {
SENSOR_ETH_IP: DESCRIPTION_SENSOR_ETH_IP,
SENSOR_LAST_RESTART: DESCRIPTION_SENSOR_LAST_RESTART,
SENSOR_SSID: DESCRIPTION_SENSOR_SSID,
SENSOR_WIFI_IP: DESCRIPTION_SENSOR_WIFI_IP,
SENSOR_WIFI_SIGNAL: DESCRIPTION_SENSOR_WIFI_SIGNAL,
},
ATTR_EMETER_SENSORS: {
SENSOR_ACTIVE_POWER: DESCRIPTION_SENSOR_EMETER_ACTIVE_POWER,
SENSOR_APPARENT_POWER: DESCRIPTION_SENSOR_EMETER_APPARENT_POWER,
SENSOR_CURRENT: DESCRIPTION_SENSOR_EMETER_CURRENT,
SENSOR_POWER_FACTOR: DESCRIPTION_SENSOR_EMETER_POWER_FACTOR,
SENSOR_TOTAL_ACTIVE_ENERGY: DESCRIPTION_SENSOR_EMETER_TOTAL_ACTIVE_ENERGY,
SENSOR_TOTAT_ACTIVE_RETURNED_ENERGY: DESCRIPTION_SENSOR_EMETER_TOTAL_ACTIVE_RETURNED_ENERGY,
SENSOR_VOLTAGE: DESCRIPTION_SENSOR_EMETER_VOLTAGE,
SENSOR_FREQUENCY: DESCRIPTION_SENSOR_EMETER_FREQUENCY,
},
ATTR_UPDATES: {
UPDATE_FIRMWARE: DESCRIPTION_UPDATE_FIRMWARE,
UPDATE_FIRMWARE_BETA: DESCRIPTION_UPDATE_FIRMWARE_BETA,
},
ATTR_MIN_FIRMWARE_DATE: 20241029,
},
MODEL_1_G3: {
ATTR_NAME: "Shelly 1 Gen3",
ATTR_MODEL_ID: "S3SW-001X16EU",
Expand Down

0 comments on commit f997d9c

Please sign in to comment.