From 31fe65d7e033501a2f7b65c1e40185218c664216 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Tue, 9 Jul 2024 20:20:43 +0200 Subject: [PATCH] Fix thing type descriptions for Plus Mini series (#17015) Signed-off-by: Jacob Laursen --- bundles/org.openhab.binding.shelly/README.md | 12 +++---- .../internal/ShellyBindingConstants.java | 6 ++-- .../discovery/ShellyThingCreator.java | 34 +++++++++---------- .../resources/OH-INF/i18n/shelly.properties | 8 ++--- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/bundles/org.openhab.binding.shelly/README.md b/bundles/org.openhab.binding.shelly/README.md index 1be0b89c9abf5..fbeb7e47218d3 100644 --- a/bundles/org.openhab.binding.shelly/README.md +++ b/bundles/org.openhab.binding.shelly/README.md @@ -100,9 +100,9 @@ The binding provides the same feature set across all devices as good as possible | thing-type | Model | Vendor ID | | -------------------- | -------------------------------------------------------- | ------------------------------ | - | shellymini1 | Shelly Plus 1 Mini with 1x relay | SNSW-001X8EU, S3SW-001X8EU | - | shellymini1pm | Shelly Plus 1PM Mini with 1x relay + power meter | SNSW-001P8EU, S3SW-001P8EU | - | shellyminipm | Shelly Plus PM Mini with 1x power meter | SNPM-001PCEU16, S3PM-001PCEU16 | + | 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 | ### Generation 2 Pro series @@ -1297,7 +1297,7 @@ Channels lastEvent and eventCount are only available if input type is set to mom ## Shelly Plus Mini Series -### Shelly Plus 1 Mini (thing-type: shellymini1) +### Shelly Plus 1 Mini (thing-type: shelly1mini) | Group | Channel | Type | read-only | Description | | ----- | ----------- | ------- | --------- | --------------------------------------------------------------------------------- | @@ -1309,7 +1309,7 @@ Channels lastEvent and eventCount are only available if input type is set to mom | | timerActive | Switch | yes | Relay #1: ON: An auto-on/off timer is active | | | button | Trigger | yes | Event trigger, see section Button Events | -### Shelly Plus 1PM Mini (thing-type: shellymini1pm) +### Shelly Plus 1PM Mini (thing-type: shelly1pmmini) | Group | Channel | Type | read-only | Description | | ----- | ------------ | -------- | --------- | --------------------------------------------------------------------------------- | @@ -1326,7 +1326,7 @@ Channels lastEvent and eventCount are only available if input type is set to mom | | lastUpdate | DateTime | yes | Timestamp of the last measurement | -### Shelly Plus PM Mini (thing-type: shellyminipm) +### Shelly Plus PM Mini (thing-type: shellypmmini) | Group | Channel | Type | read-only | Description | | ----- | ------------ | -------- | --------- | --------------------------------------------------------------------------------- | diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyBindingConstants.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyBindingConstants.java index 2ba9949d3c5ec..b5c7a7238e291 100755 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyBindingConstants.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyBindingConstants.java @@ -87,9 +87,9 @@ public class ShellyBindingConstants { THING_TYPE_SHELLYPLUSWALLDISPLAY, // // Shelly Plus Mini - THING_TYPE_SHELLYMINI1, // - THING_TYPE_SHELLYMINIPM, // - THING_TYPE_SHELLYMINI1PM, // + THING_TYPE_SHELLY1MINI, // + THING_TYPE_SHELLYPMMINI, // + THING_TYPE_SHELLY1PMMINI, // // Shelly Pro THING_TYPE_SHELLYPRO1, // 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 e3e4e681b983a..f5cd02120c6d0 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 @@ -186,9 +186,9 @@ public class ShellyThingCreator { public static final String THING_TYPE_SHELLYPLUSWALLDISPLAY_STR = "shellywalldisplay"; // Shelly Plus Mini Series - public static final String THING_TYPE_SHELLYMINI1_STR = "shelly1mini"; - public static final String THING_TYPE_SHELLYMINIPM_STR = "shellypmmini"; - public static final String THING_TYPE_SHELLYMINI1PM_STR = "shelly1pmmini"; + public static final String THING_TYPE_SHELLY1MINI_STR = "shelly1mini"; + public static final String THING_TYPE_SHELLYPMMINI_STR = "shellypmmini"; + public static final String THING_TYPE_SHELLY1PMMINI_STR = "shelly1pmmini"; // Shelly Pro Series public static final String THING_TYPE_SHELLYPRO1_STR = "shellypro1"; @@ -301,11 +301,11 @@ public class ShellyThingCreator { THING_TYPE_SHELLYPLUSWALLDISPLAY_STR); // Shelly Plus Mini Series - public static final ThingTypeUID THING_TYPE_SHELLYMINI1 = new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYMINI1_STR); - public static final ThingTypeUID THING_TYPE_SHELLYMINIPM = new ThingTypeUID(BINDING_ID, - THING_TYPE_SHELLYMINIPM_STR); - public static final ThingTypeUID THING_TYPE_SHELLYMINI1PM = new ThingTypeUID(BINDING_ID, - THING_TYPE_SHELLYMINI1PM_STR); + public static final ThingTypeUID THING_TYPE_SHELLY1MINI = new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLY1MINI_STR); + public static final ThingTypeUID THING_TYPE_SHELLYPMMINI = new ThingTypeUID(BINDING_ID, + THING_TYPE_SHELLYPMMINI_STR); + public static final ThingTypeUID THING_TYPE_SHELLY1PMMINI = new ThingTypeUID(BINDING_ID, + THING_TYPE_SHELLY1PMMINI_STR); // Shelly Pro public static final ThingTypeUID THING_TYPE_SHELLYPRO1 = new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYPRO1_STR); @@ -386,12 +386,12 @@ public class ShellyThingCreator { THING_TYPE_MAPPING.put(SHELLYDT_PLUSDIMMER10V, THING_TYPE_SHELLYPLUSDIMMER10V_STR); // Plus Mini Series - THING_TYPE_MAPPING.put(SHELLYDT_MINI1, THING_TYPE_SHELLYMINI1_STR); - THING_TYPE_MAPPING.put(SHELLYDT_MINIPM, THING_TYPE_SHELLYMINIPM_STR); - THING_TYPE_MAPPING.put(SHELLYDT_MINI1PM, THING_TYPE_SHELLYMINI1PM_STR); - THING_TYPE_MAPPING.put(SHELLYDT_MINI1G3_1, THING_TYPE_SHELLYMINI1_STR); - THING_TYPE_MAPPING.put(SHELLYDT_MINIG3_PM, THING_TYPE_SHELLYMINIPM_STR); - THING_TYPE_MAPPING.put(SHELLYDT_MINIG3_1PM, THING_TYPE_SHELLYMINI1PM_STR); + THING_TYPE_MAPPING.put(SHELLYDT_MINI1, 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_MINIG3_1PM, THING_TYPE_SHELLY1PMMINI_STR); // Pro Series THING_TYPE_MAPPING.put(SHELLYDT_PRO1, THING_TYPE_SHELLYPRO1_STR); @@ -473,9 +473,9 @@ public class ShellyThingCreator { THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSWALLDISPLAY_STR, THING_TYPE_SHELLYPLUSWALLDISPLAY_STR); - THING_TYPE_MAPPING.put(THING_TYPE_SHELLYMINI1_STR, THING_TYPE_SHELLYMINI1_STR); - THING_TYPE_MAPPING.put(THING_TYPE_SHELLYMINIPM_STR, THING_TYPE_SHELLYMINIPM_STR); - THING_TYPE_MAPPING.put(THING_TYPE_SHELLYMINI1PM_STR, THING_TYPE_SHELLYMINI1PM_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLY1MINI_STR, THING_TYPE_SHELLY1MINI_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPMMINI_STR, THING_TYPE_SHELLYPMMINI_STR); + THING_TYPE_MAPPING.put(THING_TYPE_SHELLY1PMMINI_STR, THING_TYPE_SHELLY1PMMINI_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/resources/OH-INF/i18n/shelly.properties b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties index 5ca03276d9aae..66e676ee6362e 100644 --- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties +++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties @@ -104,9 +104,9 @@ thing-type.shelly.shellypluswdus.description = Shelly Wall Dimmer US Device thing-type.shelly.shellyplus10v.description = Shelly Plus Dimmer 10V # Plus Mini Devices -thing-type.shelly.shellymini1.description = Shelly Plus Mini 1 - Single Relay Switch -thing-type.shelly.shellyminipm.description = Shelly Plus Mini PM - Power Meter -thing-type.shelly.shellymini1pm.description = Shelly Plus Mini 1PM - Single Relay Switch with Power Meter +thing-type.shelly.shelly1mini.description = Shelly Plus Mini 1 - Single Relay Switch +thing-type.shelly.shellypmmini.description = Shelly Plus Mini PM - Power Meter +thing-type.shelly.shelly1pmmini.description = Shelly Plus Mini 1PM - Single Relay Switch with Power Meter # Pro Devices thing-type.shelly.shellypro1.description = Shelly Pro 1 - Single Relay Switch @@ -253,7 +253,7 @@ channel-type.shelly.temperature4.description = Temperature of external Sensor #4 channel-type.shelly.temperature5.label = Temperature 5 channel-type.shelly.temperature5.description = Temperature of external Sensor #5 channel-type.shelly.targetTemp.label = Target Temperature -channel-type.shelly.targetTemp.description = Target Temperature in °C to be reached in auto-temperature mode +channel-type.shelly.targetTemp.description = Target Temperature in °C to be reached in auto-temperature mode channel-type.shelly.humidity.label = Humidity channel-type.shelly.humidity.description = Relative humidity (0..100%) channel-type.shelly.rollerShutter.label = Roller Control (0=open, 100=closed)