Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[shelly] Add channels device#deviceName, relay#outputName + refactoring #8396

Merged
merged 9 commits into from
Sep 12, 2020
Merged

[shelly] Add channels device#deviceName, relay#outputName + refactoring #8396

merged 9 commits into from
Sep 12, 2020

Conversation

markus7017
Copy link
Contributor

This PR adds 2 new channels

  • deviceName and
  • channelName per relay channel

Those reflect the settings in the Shelly App and provide logical names for the device (all) and relay channels.

In addition Apache Comments (StringUtil+IOUtIOUtilsiul) was replaced by native code.

@markus7017
New channels device#deviceName and relay#channelName; skip button
67d9864 
trigger when binding was started; StringUtils replaced by native Java
string operations

Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
Apache Commons IOUtils removed
c62e334 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017 markus7017 added enhancement An enhancement or new feature for an existing add-on work in progress A PR that is not yet ready to be merged labels Sep 4, 2020
@markus7017 markus7017 added this to the 2.5.9 milestone Sep 4, 2020
@markus7017 markus7017 self-assigned this Sep 4, 2020
@TravisBuddy
Copy link

Travis tests were successful

Hey @markus7017,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

@markus7017
README updated
c0f8ebb 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@TravisBuddy
Copy link

Travis tests were successful

Hey @markus7017,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

fwolter
fwolter requested changes Sep 5, 2020
View reviewed changes
Copy link
Member

@fwolter fwolter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As spotless is enabled in the 2.5.x branch now, you need to fix those formatting errors with mvn spotless:apply.

bundles/org.openhab.binding.shelly/README.md Show resolved Hide resolved
bundles/org.openhab.binding.shelly/README.md Outdated Show resolved Hide resolved
...inding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyDeviceProfile.java Outdated Show resolved Hide resolved
@markus7017
review comments applied
9d54a6b 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
fix for substringBetween()
e10f409 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017 markus7017 linked an issue Sep 8, 2020 that may be closed by this pull request
[shelly] relay#autoOn and relay#autoOff don't accept UBM #8431
Closed
@markus7017
Fix for openhab#8431: Handling of UBM for channels autoOn and autoOff
1f5ef34 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
Copy link
Contributor Author

@fwolter How do we proceed?

@markus7017 markus7017 closed this Sep 8, 2020
@markus7017 markus7017 reopened this Sep 8, 2020
@TravisBuddy
Copy link

Travis tests have failed

Hey @markus7017,
please read the following log in order to understand the failure reason. There might also be some helpful tips along the way.
It will be awesome if you fix what is wrong and commit the changes.

1 similar comment
@TravisBuddy
Copy link

Travis tests have failed

Hey @markus7017,
please read the following log in order to understand the failure reason. There might also be some helpful tips along the way.
It will be awesome if you fix what is wrong and commit the changes.

@markus7017
Need to run "mvn spotless:apply" again - strange, those files were not
7d72309 
modified with last commit

Signed-off-by: Markus Michels <markus7017@gmail.com>
@TravisBuddy
Copy link

Travis tests were successful

Hey @markus7017,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

@markus7017
Channel relay#channelName renamed to relay#outputName; channel
2fde74e 
definition for Dimmer/Dimmer2 corrected (the is no group status anymore)

Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017 markus7017 changed the title [shelly][WIP] Add channels device#deviceName, relay#channelName + refactoring [shelly][WIP] Add channels device#deviceName, relay#outputName + refactoring Sep 11, 2020
@markus7017
Copy link
Contributor Author

@fwolter I changed channel channelName to outputName as dicussed

From my side we are ready to merge

@markus7017
Typo fixed
1f753dc 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
Copy link
Contributor Author

@fwolter change is done

@fwolter fwolter changed the title [shelly][WIP] Add channels device#deviceName, relay#outputName + refactoring [shelly] Add channels device#deviceName, relay#outputName + refactoring Sep 12, 2020
@fwolter fwolter removed the work in progress A PR that is not yet ready to be merged label Sep 12, 2020
fwolter
fwolter approved these changes Sep 12, 2020
View reviewed changes
Copy link
Member

@fwolter fwolter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fwolter fwolter merged commit 58e9eb9 into openhab:2.5.x Sep 12, 2020
@markus7017 markus7017 deleted the shelly_snapshot branch September 12, 2020 14:49
CSchlipp pushed a commit to CSchlipp/openhab-addons that referenced this pull request Sep 12, 2020
@markus7017 @CSchlipp
[shelly] Add channels device#deviceName, relay#outputName + refactori…
1889f90 
…ng (openhab#8396)

Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017 markus7017 linked an issue Sep 19, 2020 that may be closed by this pull request
[shelly] New setting for device/channel name #8263
Closed
@markus7017 markus7017 modified the milestone: 2.5.9 Sep 19, 2020
markus7017 added a commit to markus7017/openhab-addons that referenced this pull request Sep 19, 2020
@markus7017
[shelly] Add channels device#deviceName, relay#outputName + refactori…
a43803b 
…ng (openhab#8396)

Signed-off-by: Markus Michels <markus7017@gmail.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Oct 8, 2020
@markus7017 @andrewfg
[shelly] Add channels device#deviceName, relay#outputName + refactori…
168647e 
…ng (openhab#8396)

Signed-off-by: Markus Michels <markus7017@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fwolter fwolter fwolter approved these changes

Assignees

@markus7017 markus7017

Labels
enhancement An enhancement or new feature for an existing add-on
Projects
None yet
Milestone
2.5.9
Development

Successfully merging this pull request may close these issues.

[shelly] relay#autoOn and relay#autoOff don't accept UBM [shelly] New setting for device/channel name
3 participants
@markus7017 @TravisBuddy @fwolter