Skip to content

Commit b37d0f0

Browse files
jlaurjlaur
authored
Fix thing type descriptions for Plus Mini series (openhab#17015)
Signed-off-by: Jacob Laursen <[email protected]>
1 parent 405f402 commit b37d0f0

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎bundles/org.openhab.binding.shelly/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ The binding provides the same feature set across all devices as good as possible
100100

101101
| thing-type | Model | Vendor ID |
102102
| -------------------- | -------------------------------------------------------- | ------------------------------ |
103-
| shellymini1 | Shelly Plus 1 Mini with 1x relay | SNSW-001X8EU, S3SW-001X8EU |
104-
| shellymini1pm | Shelly Plus 1PM Mini with 1x relay + power meter | SNSW-001P8EU, S3SW-001P8EU |
105-
| shellyminipm | Shelly Plus PM Mini with 1x power meter | SNPM-001PCEU16, S3PM-001PCEU16 |
103+
| shelly1mini | Shelly Plus 1 Mini with 1x relay | SNSW-001X8EU, S3SW-001X8EU |
104+
| shelly1pmmini | Shelly Plus 1PM Mini with 1x relay + power meter | SNSW-001P8EU, S3SW-001P8EU |
105+
| shellypmmini | Shelly Plus PM Mini with 1x power meter | SNPM-001PCEU16, S3PM-001PCEU16 |
106106

107107
### Generation 2 Pro series
108108

@@ -1297,7 +1297,7 @@ Channels lastEvent and eventCount are only available if input type is set to mom
12971297

12981298
## Shelly Plus Mini Series
12991299

1300-
### Shelly Plus 1 Mini (thing-type: shellymini1)
1300+
### Shelly Plus 1 Mini (thing-type: shelly1mini)
13011301

13021302
| Group | Channel | Type | read-only | Description |
13031303
| ----- | ----------- | ------- | --------- | --------------------------------------------------------------------------------- |
@@ -1309,7 +1309,7 @@ Channels lastEvent and eventCount are only available if input type is set to mom
13091309
| | timerActive | Switch | yes | Relay #1: ON: An auto-on/off timer is active |
13101310
| | button | Trigger | yes | Event trigger, see section Button Events |
13111311

1312-
### Shelly Plus 1PM Mini (thing-type: shellymini1pm)
1312+
### Shelly Plus 1PM Mini (thing-type: shelly1pmmini)
13131313

13141314
| Group | Channel | Type | read-only | Description |
13151315
| ----- | ------------ | -------- | --------- | --------------------------------------------------------------------------------- |
@@ -1326,7 +1326,7 @@ Channels lastEvent and eventCount are only available if input type is set to mom
13261326
| | lastUpdate | DateTime | yes | Timestamp of the last measurement |
13271327

13281328

1329-
### Shelly Plus PM Mini (thing-type: shellyminipm)
1329+
### Shelly Plus PM Mini (thing-type: shellypmmini)
13301330

13311331
| Group | Channel | Type | read-only | Description |
13321332
| ----- | ------------ | -------- | --------- | --------------------------------------------------------------------------------- |

‎bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyBindingConstants.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ public class ShellyBindingConstants {
8787
THING_TYPE_SHELLYPLUSWALLDISPLAY, //
8888

8989
// Shelly Plus Mini
90-
THING_TYPE_SHELLYMINI1, //
91-
THING_TYPE_SHELLYMINIPM, //
92-
THING_TYPE_SHELLYMINI1PM, //
90+
THING_TYPE_SHELLY1MINI, //
91+
THING_TYPE_SHELLYPMMINI, //
92+
THING_TYPE_SHELLY1PMMINI, //
9393

9494
// Shelly Pro
9595
THING_TYPE_SHELLYPRO1, //

‎bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreator.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ public class ShellyThingCreator {
186186
public static final String THING_TYPE_SHELLYPLUSWALLDISPLAY_STR = "shellywalldisplay";
187187

188188
// Shelly Plus Mini Series
189-
public static final String THING_TYPE_SHELLYMINI1_STR = "shelly1mini";
190-
public static final String THING_TYPE_SHELLYMINIPM_STR = "shellypmmini";
191-
public static final String THING_TYPE_SHELLYMINI1PM_STR = "shelly1pmmini";
189+
public static final String THING_TYPE_SHELLY1MINI_STR = "shelly1mini";
190+
public static final String THING_TYPE_SHELLYPMMINI_STR = "shellypmmini";
191+
public static final String THING_TYPE_SHELLY1PMMINI_STR = "shelly1pmmini";
192192

193193
// Shelly Pro Series
194194
public static final String THING_TYPE_SHELLYPRO1_STR = "shellypro1";
@@ -301,11 +301,11 @@ public class ShellyThingCreator {
301301
THING_TYPE_SHELLYPLUSWALLDISPLAY_STR);
302302

303303
// Shelly Plus Mini Series
304-
public static final ThingTypeUID THING_TYPE_SHELLYMINI1 = new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYMINI1_STR);
305-
public static final ThingTypeUID THING_TYPE_SHELLYMINIPM = new ThingTypeUID(BINDING_ID,
306-
THING_TYPE_SHELLYMINIPM_STR);
307-
public static final ThingTypeUID THING_TYPE_SHELLYMINI1PM = new ThingTypeUID(BINDING_ID,
308-
THING_TYPE_SHELLYMINI1PM_STR);
304+
public static final ThingTypeUID THING_TYPE_SHELLY1MINI = new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLY1MINI_STR);
305+
public static final ThingTypeUID THING_TYPE_SHELLYPMMINI = new ThingTypeUID(BINDING_ID,
306+
THING_TYPE_SHELLYPMMINI_STR);
307+
public static final ThingTypeUID THING_TYPE_SHELLY1PMMINI = new ThingTypeUID(BINDING_ID,
308+
THING_TYPE_SHELLY1PMMINI_STR);
309309

310310
// Shelly Pro
311311
public static final ThingTypeUID THING_TYPE_SHELLYPRO1 = new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYPRO1_STR);
@@ -386,12 +386,12 @@ public class ShellyThingCreator {
386386
THING_TYPE_MAPPING.put(SHELLYDT_PLUSDIMMER10V, THING_TYPE_SHELLYPLUSDIMMER10V_STR);
387387

388388
// Plus Mini Series
389-
THING_TYPE_MAPPING.put(SHELLYDT_MINI1, THING_TYPE_SHELLYMINI1_STR);
390-
THING_TYPE_MAPPING.put(SHELLYDT_MINIPM, THING_TYPE_SHELLYMINIPM_STR);
391-
THING_TYPE_MAPPING.put(SHELLYDT_MINI1PM, THING_TYPE_SHELLYMINI1PM_STR);
392-
THING_TYPE_MAPPING.put(SHELLYDT_MINI1G3_1, THING_TYPE_SHELLYMINI1_STR);
393-
THING_TYPE_MAPPING.put(SHELLYDT_MINIG3_PM, THING_TYPE_SHELLYMINIPM_STR);
394-
THING_TYPE_MAPPING.put(SHELLYDT_MINIG3_1PM, THING_TYPE_SHELLYMINI1PM_STR);
389+
THING_TYPE_MAPPING.put(SHELLYDT_MINI1, THING_TYPE_SHELLY1MINI_STR);
390+
THING_TYPE_MAPPING.put(SHELLYDT_MINIPM, THING_TYPE_SHELLYPMMINI_STR);
391+
THING_TYPE_MAPPING.put(SHELLYDT_MINI1PM, THING_TYPE_SHELLY1PMMINI_STR);
392+
THING_TYPE_MAPPING.put(SHELLYDT_MINI1G3_1, THING_TYPE_SHELLY1MINI_STR);
393+
THING_TYPE_MAPPING.put(SHELLYDT_MINIG3_PM, THING_TYPE_SHELLYPMMINI_STR);
394+
THING_TYPE_MAPPING.put(SHELLYDT_MINIG3_1PM, THING_TYPE_SHELLY1PMMINI_STR);
395395

396396
// Pro Series
397397
THING_TYPE_MAPPING.put(SHELLYDT_PRO1, THING_TYPE_SHELLYPRO1_STR);
@@ -473,9 +473,9 @@ public class ShellyThingCreator {
473473

474474
THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPLUSWALLDISPLAY_STR, THING_TYPE_SHELLYPLUSWALLDISPLAY_STR);
475475

476-
THING_TYPE_MAPPING.put(THING_TYPE_SHELLYMINI1_STR, THING_TYPE_SHELLYMINI1_STR);
477-
THING_TYPE_MAPPING.put(THING_TYPE_SHELLYMINIPM_STR, THING_TYPE_SHELLYMINIPM_STR);
478-
THING_TYPE_MAPPING.put(THING_TYPE_SHELLYMINI1PM_STR, THING_TYPE_SHELLYMINI1PM_STR);
476+
THING_TYPE_MAPPING.put(THING_TYPE_SHELLY1MINI_STR, THING_TYPE_SHELLY1MINI_STR);
477+
THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPMMINI_STR, THING_TYPE_SHELLYPMMINI_STR);
478+
THING_TYPE_MAPPING.put(THING_TYPE_SHELLY1PMMINI_STR, THING_TYPE_SHELLY1PMMINI_STR);
479479

480480
THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPRO1_STR, THING_TYPE_SHELLYPRO1_STR);
481481
THING_TYPE_MAPPING.put(THING_TYPE_SHELLYPRO1PM_STR, THING_TYPE_SHELLYPRO1PM_STR);

‎bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ thing-type.shelly.shellypluswdus.description = Shelly Wall Dimmer US Device
104104
thing-type.shelly.shellyplus10v.description = Shelly Plus Dimmer 10V
105105

106106
# Plus Mini Devices
107-
thing-type.shelly.shellymini1.description = Shelly Plus Mini 1 - Single Relay Switch
108-
thing-type.shelly.shellyminipm.description = Shelly Plus Mini PM - Power Meter
109-
thing-type.shelly.shellymini1pm.description = Shelly Plus Mini 1PM - Single Relay Switch with Power Meter
107+
thing-type.shelly.shelly1mini.description = Shelly Plus Mini 1 - Single Relay Switch
108+
thing-type.shelly.shellypmmini.description = Shelly Plus Mini PM - Power Meter
109+
thing-type.shelly.shelly1pmmini.description = Shelly Plus Mini 1PM - Single Relay Switch with Power Meter
110110

111111
# Pro Devices
112112
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
253253
channel-type.shelly.temperature5.label = Temperature 5
254254
channel-type.shelly.temperature5.description = Temperature of external Sensor #5
255255
channel-type.shelly.targetTemp.label = Target Temperature
256-
channel-type.shelly.targetTemp.description = Target Temperature in °C to be reached in auto-temperature mode
256+
channel-type.shelly.targetTemp.description = Target Temperature in °C to be reached in auto-temperature mode
257257
channel-type.shelly.humidity.label = Humidity
258258
channel-type.shelly.humidity.description = Relative humidity (0..100%)
259259
channel-type.shelly.rollerShutter.label = Roller Control (0=open, 100=closed)

0 commit comments

Comments
 (0)