diff --git a/bundles/org.openhab.binding.shelly/README.md b/bundles/org.openhab.binding.shelly/README.md index e9f5b8da25b..2b646d9a5cf 100644 --- a/bundles/org.openhab.binding.shelly/README.md +++ b/bundles/org.openhab.binding.shelly/README.md @@ -82,16 +82,17 @@ See section [Discovery](#discovery) for details. | thing-type | Model | Vendor ID | | -------------------- | -------------------------------------------------------- | ---------------------------- | -| shellyplus1 | Shelly Plus 1 with 1x relay | SNSW-001X16EU | -| shellyplus1pm | Shelly Plus 1PM with 1x relay + power meter | SNSW-001P16EU | +| shellyplus1 | Shelly Plus 1 with 1x relay | SNSW-001X16EU, S3SW-001X16EU | +| 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 Plug-S | SNPL-00112EU | | shellyplusplug | Shelly Plug-IT | SNPL-00110IT | | shellyplusplug | Shelly Plug-UK | SNPL-00112UK | | shellyplusplugus | Shelly Plug-US | SNPL-00116US | -| shellyplusi4 | Shelly Plus i4 with 4x AC input | SNSN-0024X | +| 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 | | shellyplusht | Shelly Plus HT with temperature + humidity sensor | SNSN-0013A | | shellyhtg3 | Shelly Plus HT Gen 3 with temperature + humidity sensor | S3SN-0U12A | | shellyplussmoke | Shelly Plus Smoke sensor | SNSN-0031Z | @@ -99,7 +100,7 @@ See section [Discovery](#discovery) for details. | shellywalldisplay | Shelly Plus Wall Display | SAWD-0A1XX10EU1 | | shellyblugw | SHelly BLU Gateway | SNGW-BT01 | -### Generation 2 Plus Mini series (incl. Gen 3) +### Shelly Plus Mini series (Generation 2+3) | thing-type | Model | Vendor ID | | -------------------- | -------------------------------------------------------- | ------------------------------ | @@ -107,7 +108,7 @@ See section [Discovery](#discovery) for details. | 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 | -### Generation 2 Pro series +### Shelly Pro Series (Generation 2+3) | thing-type | Model | Vendor ID | | ------------------- | -------------------------------------------------------- | ---------------------------------------------- | diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyDeviceProfile.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyDeviceProfile.java index fb0ac38c19d..c43565ee395 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyDeviceProfile.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyDeviceProfile.java @@ -198,12 +198,13 @@ public class ShellyDeviceProfile { } isBlu = isBluSeries(thingType); // e.g. SBBT for BLU Button - isGen2 = isGeneration2(thingType) || isBlu; + isGen2 = isGeneration2(thingType); String type = getString(device.type); isDimmer = type.equalsIgnoreCase(SHELLYDT_DIMMER) || type.equalsIgnoreCase(SHELLYDT_DIMMER2) || type.equalsIgnoreCase(SHELLYDT_PLUSDIMMERUS) - || thingType.equalsIgnoreCase(THING_TYPE_SHELLYPLUSDIMMERUS_STR); + || thingType.equalsIgnoreCase(THING_TYPE_SHELLYPLUSDIMMERUS_STR) + || thingType.equalsIgnoreCase(THING_TYPE_SHELLYPLUSDIMMER10V_STR); isBulb = thingType.equals(THING_TYPE_SHELLYBULB_STR); isDuo = thingType.equals(THING_TYPE_SHELLYDUO_STR) || thingType.equals(THING_TYPE_SHELLYVINTAGE_STR) || thingType.equals(THING_TYPE_SHELLYDUORGBW_STR); 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 f5cd02120c6..339661b30d3 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 @@ -65,7 +65,9 @@ public class ShellyThingCreator { // Shelly Plus Series public static final String SHELLYDT_PLUS1 = "SNSW-001X16EU"; + public static final String SHELLYDT_PLUS1G3 = "S3SW-001X16EU"; public static final String SHELLYDT_PLUS1PM = "SNSW-001P16EU"; + public static final String SHELLYDT_PLUS1PMG3 = "S3SW-001P16EU"; public static final String SHELLYDT_PLUS1UL = "SNSW-001X15UL"; public static final String SHELLYDT_PLUS1PMUL = "SNSW-001P15UL"; public static final String SHELLYDT_PLUS2PM_RELAY = "SNSW-002P16EU-relay"; @@ -77,6 +79,7 @@ public class ShellyThingCreator { public static final String SHELLYDT_PLUSPLUGUK = "SNPL-00112UK"; public static final String SHELLYDT_PLUSPLUGUS = "SNPL-00116US"; public static final String SHELLYDT_PLUSI4 = "SNSN-0024X"; + public static final String SHELLYDT_PLUSI4G3 = "S3SN-0024X"; public static final String SHELLYDT_PLUSI4DC = "SNSN-0D24X"; public static final String SHELLYDT_PLUSHT = "SNSN-0013A"; public static final String SHELLYDT_PLUSHTG3 = "S3SN-0U12A"; @@ -84,6 +87,7 @@ public class ShellyThingCreator { public static final String SHELLYDT_PLUSUNI = "SNSN-0043X"; public static final String SHELLYDT_PLUSDIMMERUS = "SNDM-0013US"; public static final String SHELLYDT_PLUSDIMMER10V = "SNDM-00100WW"; + public static final String SHELLYDT_PLUSDIMMER0110VG3 = "S3DM-0010WW"; public static final String SHELLYDT_PLUSWALLDISPLAY = "SAWD-0A1XX10EU1"; // Shelly Pro Series @@ -114,7 +118,7 @@ public class ShellyThingCreator { public static final String SHELLYDT_MINIPM = "SNPM-001PCEU16"; public static final String SHELLYDT_MINI1PM = "SNSW-001P8EU"; // Mini Generation 3 - public static final String SHELLYDT_MINI1G3_1 = "S3SW-001X8EU"; + public static final String SHELLYDT_MINIG3_1 = "S3SW-001X8EU"; public static final String SHELLYDT_MINIG3_PM = "S3PM-001PCEU16"; public static final String SHELLYDT_MINIG3_1PM = "S3SW-001P8EU"; @@ -168,10 +172,13 @@ public class ShellyThingCreator { // Shelly Plus Seriens public static final String THING_TYPE_SHELLYPLUS1_STR = "shellyplus1"; + public static final String THING_TYPE_SHELLYPLUS1G3_STR = "shelly1g3"; public static final String THING_TYPE_SHELLYPLUS1PM_STR = "shellyplus1pm"; + public static final String THING_TYPE_SHELLYPLUS1PMG3_STR = "shelly1pmg3"; public static final String THING_TYPE_SHELLYPLUS2PM_RELAY_STR = "shellyplus2pm-relay"; public static final String THING_TYPE_SHELLYPLUS2PM_ROLLER_STR = "shellyplus2pm-roller"; public static final String THING_TYPE_SHELLYPLUSI4_STR = "shellyplusi4"; + public static final String THING_TYPE_SHELLYPLUSI4G3_STR = "shellyi4g3"; public static final String THING_TYPE_SHELLYPLUSI4DC_STR = "shellyplusi4dc"; public static final String THING_TYPE_SHELLYPLUSHT_STR = "shellyplusht"; public static final String THING_TYPE_SHELLYPLUSHTG3_STR = "shellyhtg3"; @@ -181,15 +188,18 @@ public class ShellyThingCreator { public static final String THING_TYPE_SHELLYPLUSPLUGUS_STR = "shellyplusplugus"; public static final String THING_TYPE_SHELLYPLUSDIMMERUS_STR = "shellypluswdus"; public static final String THING_TYPE_SHELLYPLUSDIMMER10V_STR = "shellyplus10v"; + public static final String THING_TYPE_SHELLYPLUSDIMMER0110VG3_STR = "shelly0110dimg3"; // Shelly Wall Display public static final String THING_TYPE_SHELLYPLUSWALLDISPLAY_STR = "shellywalldisplay"; // Shelly Plus Mini Series public static final String THING_TYPE_SHELLY1MINI_STR = "shelly1mini"; + public static final String THING_TYPE_SHELLYMINI1G3_STR = "shelly1minig3"; public static final String THING_TYPE_SHELLYPMMINI_STR = "shellypmmini"; + public static final String THING_TYPE_SHELLYPMMINIG3_STR = "shellypmminig3"; public static final String THING_TYPE_SHELLY1PMMINI_STR = "shelly1pmmini"; - + public static final String THING_TYPE_SHELLY1PMMINIG3_STR = "shelly1pmminig3"; // Shelly Pro Series public static final String THING_TYPE_SHELLYPRO1_STR = "shellypro1"; public static final String THING_TYPE_SHELLYPRO1PM_STR = "shellypro1pm"; @@ -365,8 +375,10 @@ public class ShellyThingCreator { // Plus Series THING_TYPE_MAPPING.put(SHELLYDT_PLUS1, THING_TYPE_SHELLYPLUS1_STR); - THING_TYPE_MAPPING.put(SHELLYDT_PLUS1PM, THING_TYPE_SHELLYPLUS1PM_STR); + THING_TYPE_MAPPING.put(SHELLYDT_PLUS1G3, THING_TYPE_SHELLYPLUS1_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUS1UL, THING_TYPE_SHELLYPLUS1_STR); + THING_TYPE_MAPPING.put(SHELLYDT_PLUS1PM, THING_TYPE_SHELLYPLUS1PM_STR); + THING_TYPE_MAPPING.put(SHELLYDT_PLUS1PMG3, THING_TYPE_SHELLYPLUS1PM_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUS1PMUL, THING_TYPE_SHELLYPLUS1PM_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUS2PM_RELAY, THING_TYPE_SHELLYPLUS2PM_RELAY_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUS2PM_ROLLER, THING_TYPE_SHELLYPLUS2PM_ROLLER_STR); @@ -376,21 +388,23 @@ public class ShellyThingCreator { 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_PLUSI4DC, THING_TYPE_SHELLYPLUSI4DC_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); THING_TYPE_MAPPING.put(SHELLYDT_PLUSHT, THING_TYPE_SHELLYPLUSHT_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSHTG3, THING_TYPE_SHELLYPLUSHTG3_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSSMOKE, THING_TYPE_SHELLYPLUSSMOKE_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSUNI, THING_TYPE_SHELLYUNI_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSDIMMERUS, THING_TYPE_SHELLYPLUSDIMMERUS_STR); THING_TYPE_MAPPING.put(SHELLYDT_PLUSDIMMER10V, THING_TYPE_SHELLYPLUSDIMMER10V_STR); + THING_TYPE_MAPPING.put(SHELLYDT_PLUSDIMMER0110VG3, THING_TYPE_SHELLYPLUSDIMMER10V_STR); // Plus Mini Series THING_TYPE_MAPPING.put(SHELLYDT_MINI1, THING_TYPE_SHELLY1MINI_STR); + THING_TYPE_MAPPING.put(SHELLYDT_MINIG3_1, THING_TYPE_SHELLY1MINI_STR); THING_TYPE_MAPPING.put(SHELLYDT_MINIPM, THING_TYPE_SHELLYPMMINI_STR); - THING_TYPE_MAPPING.put(SHELLYDT_MINI1PM, THING_TYPE_SHELLY1PMMINI_STR); - THING_TYPE_MAPPING.put(SHELLYDT_MINI1G3_1, THING_TYPE_SHELLY1MINI_STR); THING_TYPE_MAPPING.put(SHELLYDT_MINIG3_PM, THING_TYPE_SHELLYPMMINI_STR); + THING_TYPE_MAPPING.put(SHELLYDT_MINI1PM, THING_TYPE_SHELLY1PMMINI_STR); THING_TYPE_MAPPING.put(SHELLYDT_MINIG3_1PM, THING_TYPE_SHELLY1PMMINI_STR); // Pro Series @@ -454,28 +468,34 @@ public class ShellyThingCreator { THING_TYPE_MAPPING.put(THING_TYPE_SHELLYUNI_STR, THING_TYPE_SHELLYUNI_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYMOTION2_STR, THING_TYPE_SHELLYMOTION_STR); - THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUS1PM_STR, THING_TYPE_SHELLYPLUS1PM_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUS1_STR, THING_TYPE_SHELLYPLUS1_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUS1G3_STR, THING_TYPE_SHELLYPLUS1_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUS1PM_STR, THING_TYPE_SHELLYPLUS1PM_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUS1PMG3_STR, THING_TYPE_SHELLYPLUS1PM_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUS2PM_RELAY_STR, THING_TYPE_SHELLYPLUS2PM_RELAY_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUS2PM_ROLLER_STR, THING_TYPE_SHELLYPLUS2PM_ROLLER_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUS2PM_RELAY_STR, THING_TYPE_SHELLYPLUS2PM_RELAY_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUS2PM_ROLLER_STR, THING_TYPE_SHELLYPLUS2PM_ROLLER_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSPLUGS_STR, THING_TYPE_SHELLYPLUSPLUGS_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSPLUGUS_STR, THING_TYPE_SHELLYPLUSPLUGUS_STR); - THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSI4DC_STR, THING_TYPE_SHELLYPLUSI4DC_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSI4_STR, THING_TYPE_SHELLYPLUSI4_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSI4G3_STR, THING_TYPE_SHELLYPLUSI4_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSI4DC_STR, THING_TYPE_SHELLYPLUSI4DC_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSHT_STR, THING_TYPE_SHELLYPLUSHT_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSSMOKE_STR, THING_TYPE_SHELLYPLUSSMOKE_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSUNI_STR, THING_TYPE_SHELLYUNI_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSDIMMERUS_STR, THING_TYPE_SHELLYPLUSDIMMERUS_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSDIMMER10V_STR, THING_TYPE_SHELLYPLUSDIMMER10V_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSDIMMER0110VG3_STR, THING_TYPE_SHELLYPLUSDIMMER10V_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSWALLDISPLAY_STR, THING_TYPE_SHELLYPLUSWALLDISPLAY_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLY1MINI_STR, THING_TYPE_SHELLY1MINI_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLYMINI1G3_STR, THING_TYPE_SHELLY1MINI_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPMMINI_STR, THING_TYPE_SHELLYPMMINI_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPMMINIG3_STR, THING_TYPE_SHELLYPMMINI_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLY1PMMINI_STR, THING_TYPE_SHELLY1PMMINI_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLY1PMMINIG3_STR, THING_TYPE_SHELLY1PMMINIG3_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPRO1_STR, THING_TYPE_SHELLYPRO1_STR); THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPRO1PM_STR, THING_TYPE_SHELLYPRO1PM_STR); diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java index a45f1194927..52f9a53917b 100755 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java @@ -332,6 +332,7 @@ public abstract class ShellyBaseHandler extends BaseThingHandler api.setConfig(thingName, config); ShellyDeviceProfile tmpPrf = api.getDeviceProfile(thingType, profile.device); + tmpPrf.initFromThingType(thingType); String mode = getString(tmpPrf.device.mode); if (this.getThing().getThingTypeUID().equals(THING_TYPE_SHELLYPROTECTED)) { changeThingType(thingName, mode); diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyComponents.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyComponents.java index 95f00e65397..979ecf7e875 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyComponents.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyComponents.java @@ -594,14 +594,16 @@ public class ShellyComponents { // On a status update we map a dimmer.ison = false to brightness 0 rather than the device's brightness // and send an OFF status to the same channel. // When the device's brightness is > 0 we send the new value to the channel and an ON command - if (dimmer.ison) { - updated |= thingHandler.updateChannel(groupName, CHANNEL_BRIGHTNESS + "$Switch", OnOffType.ON); - updated |= thingHandler.updateChannel(groupName, CHANNEL_BRIGHTNESS + "$Value", - toQuantityType((double) getInteger(dimmer.brightness), DIGITS_NONE, Units.PERCENT)); - } else { - updated |= thingHandler.updateChannel(groupName, CHANNEL_BRIGHTNESS + "$Switch", OnOffType.OFF); - updated |= thingHandler.updateChannel(groupName, CHANNEL_BRIGHTNESS + "$Value", - toQuantityType(0.0, DIGITS_NONE, Units.PERCENT)); + if (dimmer.ison != null) { + if (dimmer.ison) { + updated |= thingHandler.updateChannel(groupName, CHANNEL_BRIGHTNESS + "$Switch", OnOffType.ON); + updated |= thingHandler.updateChannel(groupName, CHANNEL_BRIGHTNESS + "$Value", + toQuantityType((double) getInteger(dimmer.brightness), DIGITS_NONE, Units.PERCENT)); + } else { + updated |= thingHandler.updateChannel(groupName, CHANNEL_BRIGHTNESS + "$Switch", OnOffType.OFF); + updated |= thingHandler.updateChannel(groupName, CHANNEL_BRIGHTNESS + "$Value", + toQuantityType(0.0, DIGITS_NONE, Units.PERCENT)); + } } if (profile.settings.dimmers != null) { diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/config/config2.xml b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/config/config2.xml index e24c68d7c50..d04c6eb6787 100644 --- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/config/config2.xml +++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/config/config2.xml @@ -117,5 +117,10 @@ seconds true + + + @text/thing-type.config.shelly.enableBluGateway.description + false + diff --git a/bundles/org.openhab.binding.shelly/src/test/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreatorTest.java b/bundles/org.openhab.binding.shelly/src/test/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreatorTest.java index 610467084c2..b0fa2871b92 100644 --- a/bundles/org.openhab.binding.shelly/src/test/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreatorTest.java +++ b/bundles/org.openhab.binding.shelly/src/test/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreatorTest.java @@ -31,7 +31,7 @@ import org.openhab.core.thing.ThingUID; /** * Tests for {@link ShellyThingCreator}. - * + * * @author Jacob Laursen - Initial contribution */ @NonNullByDefault @@ -136,7 +136,9 @@ public class ShellyThingCreatorTest { Arguments.of(SHELLYDT_MOTION, "", THING_TYPE_SHELLYMOTION_STR), // // Plus Series Arguments.of(SHELLYDT_PLUS1, "", THING_TYPE_SHELLYPLUS1_STR), // + Arguments.of(SHELLYDT_PLUS1G3, "", THING_TYPE_SHELLYPLUS1_STR), // Arguments.of(SHELLYDT_PLUS1PM, "", THING_TYPE_SHELLYPLUS1PM_STR), // + Arguments.of(SHELLYDT_PLUS1PMG3, "", THING_TYPE_SHELLYPLUS1PM_STR), // Arguments.of(SHELLYDT_PLUS1UL, "", THING_TYPE_SHELLYPLUS1_STR), // Arguments.of(SHELLYDT_PLUS1PMUL, "", THING_TYPE_SHELLYPLUS1PM_STR), // Arguments.of("SNSW-002P16EU", "relay", THING_TYPE_SHELLYPLUS2PM_RELAY_STR), // @@ -149,17 +151,20 @@ public class ShellyThingCreatorTest { Arguments.of(SHELLYDT_PLUSPLUGUS, "", THING_TYPE_SHELLYPLUSPLUGUS_STR), // Arguments.of(SHELLYDT_PLUSI4DC, "", THING_TYPE_SHELLYPLUSI4DC_STR), // Arguments.of(SHELLYDT_PLUSI4, "", THING_TYPE_SHELLYPLUSI4_STR), // + Arguments.of(SHELLYDT_PLUSI4G3, "", THING_TYPE_SHELLYPLUSI4_STR), // Arguments.of(SHELLYDT_PLUSHT, "", THING_TYPE_SHELLYPLUSHT_STR), // Arguments.of(SHELLYDT_PLUSHTG3, "", THING_TYPE_SHELLYPLUSHTG3_STR), // Arguments.of(SHELLYDT_PLUSSMOKE, "", THING_TYPE_SHELLYPLUSSMOKE_STR), // Arguments.of(SHELLYDT_PLUSUNI, "", THING_TYPE_SHELLYUNI_STR), // Arguments.of(SHELLYDT_PLUSDIMMERUS, "", THING_TYPE_SHELLYPLUSDIMMERUS_STR), // Arguments.of(SHELLYDT_PLUSDIMMER10V, "", THING_TYPE_SHELLYPLUSDIMMER10V_STR), // + Arguments.of(SHELLYDT_PLUSDIMMER0110VG3, "", THING_TYPE_SHELLYPLUSDIMMER10V_STR), // + // Plus Mini Series Arguments.of(SHELLYDT_MINI1, "", THING_TYPE_SHELLY1MINI_STR), // Arguments.of(SHELLYDT_MINIPM, "", THING_TYPE_SHELLYPMMINI_STR), // Arguments.of(SHELLYDT_MINI1PM, "", THING_TYPE_SHELLY1PMMINI_STR), // - Arguments.of(SHELLYDT_MINI1G3_1, "", THING_TYPE_SHELLY1MINI_STR), // + Arguments.of(SHELLYDT_MINIG3_1, "", THING_TYPE_SHELLY1MINI_STR), // Arguments.of(SHELLYDT_MINIG3_PM, "", THING_TYPE_SHELLYPMMINI_STR), // Arguments.of(SHELLYDT_MINIG3_1PM, "", THING_TYPE_SHELLY1PMMINI_STR), // // Pro Series