From 0a4550202d3dd3d45d99c8acb6cc3c45085ede73 Mon Sep 17 00:00:00 2001 From: matmai Date: Thu, 23 Jan 2025 18:37:20 +0100 Subject: [PATCH] [shelly] Add Shelly Plug S Gen3 (#17869) Signed-off-by: Matthias Maier --- bundles/org.openhab.binding.shelly/README.md | 19 ++++++++++--------- .../discovery/ShellyThingCreator.java | 4 ++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/bundles/org.openhab.binding.shelly/README.md b/bundles/org.openhab.binding.shelly/README.md index ea81bf071f6..77fa8f44b0f 100644 --- a/bundles/org.openhab.binding.shelly/README.md +++ b/bundles/org.openhab.binding.shelly/README.md @@ -86,10 +86,11 @@ See section [Discovery](#discovery) for details. | shellyplus1pm | Shelly Plus 1PM with 1x relay + power meter | SNSW-001P16EU, S3SW-001P16EU | | shellyplus2pm-relay | Shelly Plus 2PM with 2x relay + power meter, relay mode | SNSW-002P16EU, SNSW-102P16EU | | shellyplus2pm-roller | Shelly Plus 2PM with 2x relay + power meter, roller mode | SNSW-002P16EU, SNSW-102P16EU | -| shellyplusplug | Shelly Plus Plug | SNPL-00112EU | -| shellyplusplug | Shelly Plus Plug-IT | SNPL-00110IT | -| shellyplusplug | Shelly Plus Plug-UK | SNPL-00112UK | -| shellyplusplugus | Shelly Plus Plug-US | SNPL-00116US | +| shellyplusplug | Shelly Plug-S | SNPL-00112EU, SNPL-10112EU | +| shellyplusplug | Shelly Plug-IT | SNPL-00110IT | +| shellyplusplug | Shelly Plug-UK | SNPL-00112UK | +| shellyplusplugus | Shelly Plug-US | SNPL-00116US | +| shellyplusplug | Shelly Plug S Gen 3 | S3PL-00112EU | | shellyplusi4 | Shelly Plus i4 with 4x AC input | SNSN-0024X, S3SN-0024X | | shellyplusi4dc | Shelly Plus i4 with 4x DC input | SNSN-0D24X | | shellyplus10v | Shelly Plus Dimmer 0/10V (Gen 2) or 0/1/10V (Gen 3) | SNDM-00100WW, S3DM-0010WW | @@ -104,11 +105,11 @@ See section [Discovery](#discovery) for details. ### Shelly Plus Mini series (Generation 2+3) - | thing-type | Model | Vendor ID | - | -------------------- | -------------------------------------------------------- | ------------------------------ | - | shelly1mini | Shelly Plus 1 Mini with 1x relay | SNSW-001X8EU, S3SW-001X8EU | - | shelly1pmmini | Shelly Plus 1PM Mini with 1x relay + power meter | SNSW-001P8EU, S3SW-001P8EU | - | shellypmmini | Shelly Plus PM Mini with 1x power meter | SNPM-001PCEU16, S3PM-001PCEU16 | +| thing-type | Model | Vendor ID | +| -------------------- | -------------------------------------------------------- | ------------------------------ | +| shelly1mini | Shelly Plus 1 Mini with 1x relay | SNSW-001X8EU, S3SW-001X8EU | +| shelly1pmmini | Shelly Plus 1PM Mini with 1x relay + power meter | SNSW-001P8EU, S3SW-001P8EU | +| shellypmmini | Shelly Plus PM Mini with 1x power meter | SNPM-001PCEU16, S3PM-001PCEU16 | ### Shelly Pro Series (Generation 2+3) diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreator.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreator.java index 9686cadd81e..851733eef58 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreator.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreator.java @@ -75,9 +75,11 @@ public class ShellyThingCreator { public static final String SHELLYDT_PLUS2PM_RELAY_2 = "SNSW-102P16EU-relay"; public static final String SHELLYDT_PLUS2PM_ROLLER_2 = "SNSW-102P16EU-roller"; public static final String SHELLYDT_PLUSPLUGS = "SNPL-00112EU"; + public static final String SHELLYDT_PLUSPLUGS_2 = "SNPL-10112EU"; public static final String SHELLYDT_PLUSPLUGIT = "SNPL-00110IT"; public static final String SHELLYDT_PLUSPLUGUK = "SNPL-00112UK"; public static final String SHELLYDT_PLUSPLUGUS = "SNPL-00116US"; + public static final String SHELLYDT_PLUSPLUGSG3 = "S3PL-00112EU"; public static final String SHELLYDT_PLUSI4 = "SNSN-0024X"; public static final String SHELLYDT_PLUSI4G3 = "S3SN-0024X"; public static final String SHELLYDT_PLUSI4DC = "SNSN-0D24X"; @@ -391,9 +393,11 @@ public class ShellyThingCreator { THING_TYPE_MAPPING.put(SHELLYDT_PLUS2PM_RELAY_2, THING_TYPE_SHELLYPLUS2PM_RELAY_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUS2PM_ROLLER_2, THING_TYPE_SHELLYPLUS2PM_ROLLER_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSPLUGS, THING_TYPE_SHELLYPLUSPLUGS_STR); + THING_TYPE_MAPPING.put(SHELLYDT_PLUSPLUGS_2, THING_TYPE_SHELLYPLUSPLUGS_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSPLUGIT, THING_TYPE_SHELLYPLUSPLUGS_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSPLUGUK, THING_TYPE_SHELLYPLUSPLUGS_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSPLUGUS, THING_TYPE_SHELLYPLUSPLUGUS_STR); + THING_TYPE_MAPPING.put(SHELLYDT_PLUSPLUGSG3, THING_TYPE_SHELLYPLUSPLUGS_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSI4, THING_TYPE_SHELLYPLUSI4_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSI4G3, THING_TYPE_SHELLYPLUSI4_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSI4DC, THING_TYPE_SHELLYPLUSI4DC_STR);