[shelly] Various channel types changed to system-defined ones, WD fix, BLU support optimized #15980
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -131,11 +131,12 @@ public ShellyChannelDefinitions(@Reference ShellyTranslationProvider translation | |
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_DEVST_GATEWAY, "gatewayDevice", ITEMT_STRING)) | ||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_DEVST_ITEMP, "system:indoor-temperature", ITEMT_TEMP)) | ||
|
There was a problem hiding this comment. All these changes you do to use system channel types concerns only channels created dynamically ? What about the old channel types ? If they are no more used, you should remove them. There was a problem hiding this comment. There are only a very few channels, which are created statically on the device level (see device.xml), all others are created dynamically. I tried to remove the old channel definitions, but that leads to the situation that the framework blocks starting the binding for 60sec trying to find the definitions somewhere. So, it's the hen and the egg. Old definitions are still required when starting the new binding version doing the channel upgrades and then they are no longer required on next startup. Again, including upgrade information for all channels for all groups and devices would create a mess with a ton of duplicate overhead. There was a problem hiding this comment. @lolodomo could we mark this one as resolved? There was a problem hiding this comment. @J-N-K could you advice how such a Thing upgrade case should be handled? There was a problem hiding this comment. @J-N-K Any idea how to best deal with Thing upgrades in the case of dynamically created channels? There was a problem hiding this comment. Except for this and the other upgrade comment htis PR is ready to merge. Woudl be nice if someone with more experience could comment if this is ok or not, hint: @J-N-K :-) |
||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_DEVST_WAKEUP, "sensorWakeup", ITEMT_STRING)) | ||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_DEVST_ACCUWATTS, "system:electric-power", ITEMT_POWER)) | ||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_DEVST_ACCUTOTAL, "system:electric-current", ITEMT_ENERGY)) | ||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_DEVST_ACCURETURNED, "system:electric-current", | ||
| ITEMT_ENERGY)) | ||
lsiepel marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_DEVST_RESETTOTAL, "meterResetTotals", ITEMT_SWITCH)) | ||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_DEVST_VOLTAGE, "system:electric-voltage", ITEMT_VOLT)) | ||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_DEVST_CHARGER, "charger", ITEMT_SWITCH)) | ||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_LED_STATUS_DISABLE, "ledStatusDisable", ITEMT_SWITCH)) | ||
| .add(new ShellyChannel(m, CHGR_DEVST, CHANNEL_LED_POWER_DISABLE, "ledPowerDisable", ITEMT_SWITCH)) | ||
|
|
@@ -157,7 +158,7 @@ public ShellyChannelDefinitions(@Reference ShellyTranslationProvider translation | |
| .add(new ShellyChannel(m, CHGR_RELAY, CHANNEL_TIMER_ACTIVE, "timerActive", ITEMT_SWITCH)) | ||
|
|
||
| // Dimmer | ||
| .add(new ShellyChannel(m, CHANNEL_GROUP_DIMMER_CONTROL, CHANNEL_BRIGHTNESS, "system:brightness", | ||
| ITEMT_DIMMER)) | ||
|
|
||
| // Roller | ||
|
|
@@ -193,16 +194,16 @@ public ShellyChannelDefinitions(@Reference ShellyTranslationProvider translation | |
| .add(new ShellyChannel(m, CHGR_LIGHTCH, CHANNEL_TIMER_ACTIVE, "timerActive", ITEMT_SWITCH)) | ||
|
|
||
| // Power Meter | ||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_METER_CURRENTWATTS, "system:electric-power", ITEMT_POWER)) | ||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_METER_TOTALKWH, "system:electric-current", ITEMT_ENERGY)) | ||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_METER_LASTMIN1, "system:electric-power", ITEMT_POWER)) | ||
lsiepel marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_LAST_UPDATE, "lastUpdate", ITEMT_DATETIME)) | ||
|
|
||
| // EMeter | ||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_EMETER_TOTALRET, "system:electric-current", ITEMT_ENERGY)) | ||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_EMETER_REACTWATTS, "system:electric-power", ITEMT_POWER)) | ||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_EMETER_VOLTAGE, "system:electric-voltage", ITEMT_VOLT)) | ||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_EMETER_CURRENT, "system:electric-current", ITEMT_AMP)) | ||
kaikreuzer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_EMETER_PFACTOR, "meterPowerFactor", ITEMT_NUMBER)) | ||
| .add(new ShellyChannel(m, CHGR_METER, CHANNEL_EMETER_RESETTOTAL, "meterResetTotals", ITEMT_SWITCH)) | ||
|
|
||
|
|
@@ -218,11 +219,11 @@ public ShellyChannelDefinitions(@Reference ShellyTranslationProvider translation | |
| ITEMT_PERCENT)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_LUX, "sensorLux", ITEMT_LUX)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_ILLUM, "sensorIllumination", ITEMT_STRING)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_VOLTAGE, "system:electric-voltage", ITEMT_VOLT)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_STATE, "sensorContact", ITEMT_CONTACT)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_SSTATE, "sensorState", ITEMT_STRING)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_TILT, "sensorTilt", ITEMT_ANGLE)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_MOTION, "system:motion", ITEMT_SWITCH)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_MOTION_TS, "motionTimestamp", ITEMT_DATETIME)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_MOTION_ACT, "motionActive", ITEMT_SWITCH)) | ||
| .add(new ShellyChannel(m, CHGR_SENSOR, CHANNEL_SENSOR_VIBRATION, "sensorVibration", ITEMT_SWITCH)) | ||
|
|
@@ -274,8 +275,21 @@ public ShellyChannelDefinitions(@Reference ShellyTranslationProvider translation | |
| } | ||
|
|
||
| public static @Nullable ShellyChannel getDefinition(String channelName) throws IllegalArgumentException { | ||
| return CHANNEL_DEFINITIONS.get(getDefinitionKey(channelName)); | ||
| } | ||
|
|
||
| public static boolean hasDefinition(String channelName) { | ||
| try { | ||
| CHANNEL_DEFINITIONS.get(getDefinitionKey(channelName)); // may throws exception | ||
| return true; | ||
| } catch (IllegalArgumentException e) { | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private static String getDefinitionKey(String channelName) { | ||
| String group = substringBefore(channelName, "#"); | ||
| String channel = channelName.contains("#") ? substringAfter(channelName, "#") : channelName; | ||
|
|
||
| if (group.startsWith(CHANNEL_GROUP_METER)) { | ||
| group = CHANNEL_GROUP_METER; // map meter1..n to meter | ||
|
|
@@ -297,8 +311,7 @@ public ShellyChannelDefinitions(@Reference ShellyTranslationProvider translation | |
| channel = CHANNEL_STATUS_EVENTCOUNT; | ||
| } | ||
|
|
||
| return group.isEmpty() ? channel : group + "#" + channel; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -680,6 +693,7 @@ public ShellyChannel(ShellyTranslationProvider messages, String group, String ch | |
| this.itemType = itemType; | ||
| this.typeId = typeId; | ||
|
|
||
| // Auto-Naming if there are multiple instances of the same group, e.g. relay, meter... | ||
| groupLabel = getText(PREFIX_GROUP + group + ".label"); | ||
| if (groupLabel.startsWith(PREFIX_GROUP)) { | ||
| groupLabel = ""; | ||
|
|
@@ -688,11 +702,21 @@ public ShellyChannel(ShellyTranslationProvider messages, String group, String ch | |
| if (groupDescription.startsWith(PREFIX_GROUP)) { | ||
| groupDescription = ""; | ||
| } | ||
|
|
||
| boolean isSystem = typeId.startsWith("system:"); | ||
| label = PREFIX_CHANNEL + (isSystem ? channel : typeId) + ".label"; | ||
| label = getText(label); | ||
| if (isSystem && label.startsWith(PREFIX_CHANNEL)) { | ||
| label = getText(PREFIX_CHANNEL + typeId.replace(":", ".") + ".label"); | ||
| } | ||
| if (label.startsWith(PREFIX_CHANNEL)) { | ||
| label = ""; // no resource found | ||
| } | ||
| description = PREFIX_CHANNEL + (isSystem ? channel : typeId) + ".description"; | ||
| description = getText(description); | ||
| if (isSystem && description.startsWith(PREFIX_CHANNEL)) { | ||
| description = getText(PREFIX_CHANNEL + typeId.replace(":", ".") + ".description"); | ||
| } | ||
| if (description.startsWith(PREFIX_CHANNEL)) { | ||
| description = ""; // no resource found | ||
| } | ||
|
|
@@ -763,6 +787,13 @@ public String getChannelAttribute(String attribute) { | |
| private String getText(String key) { | ||
| return messages.get(key); | ||
| } | ||
|
|
||
| public ChannelTypeUID getChannelTypeUID() { | ||
| if (typeId.contains("system:")) { | ||
| return new ChannelTypeUID("system", substringAfter(typeId, ":")); | ||
| } | ||
| return new ChannelTypeUID(BINDING_ID, typeId); | ||
| } | ||
| } | ||
|
|
||
| public static class ChannelMap { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is unexpected. Why remove the annotation ? Should be better to handle the warnings, if any.