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][WIP] V2.5-2 (fixes & enhancements for the 2.5 release version) #6592

Closed
wants to merge 19 commits into from
Closed

[shelly][WIP] V2.5-2 (fixes & enhancements for the 2.5 release version) #6592

wants to merge 19 commits into from

Conversation

markus7017
Copy link
Contributor

Dimmer and RGBW2 in color mode where missing the input and button channel

@markus7017
Fix: input channel for relay; deregister from onEvent on dispose(); post
0bdaaa7 
LOW_BATTERY alarm for sensors
@markus7017
New channel button for relay; event channel removed except for roller;
67c3099 
device event mapping adapted; moved device definition to device.xml;
README updated


Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
call listenerManager.unregister() from Thing dispose()
f4c3f1d 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
event decoding fixed; avoid NPE on event and uninitialized thing
8814b55 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
button channel added for Dimmer
84a64f3 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
Renamed channel signal to wifiSignal (prevent old JSONDB data) and
c635467 
changed channel type to system.signal-strength

Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
deregister disposed thing handler from deviceListeners from Handler
8c74fde 
Factory (ShellyListenerManager removed); README updated


Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
Reflect review comments, README updated
31a5ba7 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
Missing channels input and button added for Dimmer and RGBW2 in color
12b0c3d 
mode



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
Fix: update input for dimmer; meter added to Plug; Fix LOW_BATTERY alarm
ea92ad7 
check; German translation (WIP); Typos in README fixed


Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
German translation added (WIP)
c2fa475 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
Merge conflict resolved
1e3e796 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017 markus7017 changed the title [shelly] Add missing input and button channels for Dimmer and RGBW2 in color mode [shelly][WIP] V2.5-2 (fixes & enhancements for the 2.5 release version) Dec 22, 2019
This was referenced Dec 22, 2019
Closed
Closed
Closed
Closed
Closed
Closed
Closed
@markus7017
Remove NonNullByDefault warnings for Gson mapper: ShellyApiJson renamed
6b35193 
to ShellyApiJsonDTO, ShellyCoapJson renamed to ShellyCoapJsoDTO, added
|NullAnnotationsCheck to suspression.xml; new channel timeoutErrors and
timeoutsRecovered + retry handling on API calls

Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017 markus7017 mentioned this pull request Dec 23, 2019
Closed
@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.

1st Build

Expand here 
Single addon pull request: Building org.openhab.binding.shelly
[WARNING] Could not find file feature file features/karaf/openhab-addons/src/main/feature/feature.xml
[INFO] Empty report will not be appended to the summary report.
[ERROR] COMPILATION ERROR : 
[ERROR] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyRelayHandler.java:[445,21260] Cannot reduce the visibility of the inherited method from ShellyBaseHandler
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.0:compile (default-compile) on project org.openhab.binding.shelly: Compilation failure
[ERROR] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyRelayHandler.java:[445,21260] Cannot reduce the visibility of the inherited method from ShellyBaseHandler
[ERROR] -> [Help 1]
[ERROR] 
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR] 
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR] 
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR]   mvn <args> -rf :org.openhab.binding.shelly

### 2nd Build
Expand here 
Single addon pull request: Building org.openhab.binding.shelly
[WARNING] The POM for com.sun.xml.bind:jaxb-core:jar:2.2.11 is invalid, transitive dependencies (if any) will not be available, enable debug logging for more details
[WARNING] The POM for com.sun.xml.bind:jaxb-impl:jar:2.2.11 is invalid, transitive dependencies (if any) will not be available, enable debug logging for more details
[WARNING] Could not find file feature file features/karaf/openhab-addons/src/main/feature/feature.xml
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by com.sun.xml.bind.v2.runtime.reflect.opt.Injector (file:/home/travis/.m2/repository/com/sun/xml/bind/jaxb-impl/2.2.11/jaxb-impl-2.2.11.jar) to method java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int)
WARNING: Please consider reporting this to the maintainers of com.sun.xml.bind.v2.runtime.reflect.opt.Injector
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release
[INFO] Empty report will not be appended to the summary report.
[WARNING] COMPILATION WARNING : 
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyUtils.java:[103,3483] The method setScale(int, int) from the type BigDecimal is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyUtils.java:[103,3511] The field BigDecimal.ROUND_HALF_DOWN is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyRelayHandler.java:[355,16946] The constructor Double(double) is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyRelayHandler.java:[357,17145] The constructor Double(double) is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyRelayHandler.java:[414,19968] The constructor Double(double) is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyRelayHandler.java:[418,20286] The constructor Double(double) is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyColorUtils.java:[182,5384] The constructor Double(double) is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java:[404,20648] The constructor Double(double) is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java:[501,26027] The constructor Double(double) is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java:[505,26168] The constructor Double(double) is deprecated
[WARNING] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/coap/ShellyCoapJSon.java:[119,3724] The constructor Integer(int) is deprecated
[ERROR] COMPILATION ERROR : 
[ERROR] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyRelayHandler.java:[445,21260] Cannot reduce the visibility of the inherited method from ShellyBaseHandler
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.0:compile (default-compile) on project org.openhab.binding.shelly: Compilation failure
[ERROR] /home/travis/build/openhab/openhab-addons/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyRelayHandler.java:[445,21260] Cannot reduce the visibility of the inherited method from ShellyBaseHandler
[ERROR] -> [Help 1]
[ERROR] 
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR] 
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR] 
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR]   mvn <args> -rf :org.openhab.binding.shelly

@markus7017 markus7017 mentioned this pull request Dec 27, 2019
Closed
@markus7017
New thing config option brightnessAutoOn, weakSignal; implements FTRs
01cbcfe 
openhab#6560, openhab#6608; update lastUpdated channel only when another value
changed; thing status messages translated to German
(COMM_ERROR/CONF_ERRORs)

Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
weakSignal and brightnessAutoOn added to thing config
0785983 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017
Add serviceName to properties when thing was added manually
1ce9179 
Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017 markus7017 mentioned this pull request Dec 29, 2019
Closed
@markus7017
openhab#6706: Post update on input and output channels directly from …
9d9001a 
…onEvent()

to speed up event processing by a rule; default for eventsPush is now
false; work around for wrong Coap Device descr for Shelly 2.5 and input
channels
openhab#6707: Fix for "sensor thing stays in status UNKNOWN after OH restart"

Signed-off-by: Markus Michels <markus7017@gmail.com>
@markus7017 markus7017 mentioned this pull request Dec 30, 2019
Closed
@markus7017
Copy link
Contributor Author

@kaikreuzer it seems that all updated files create a conflict. Could you help to get the PR in sync with my repo shelly2.5-final-2? Those are the latest updates and should overwrite the conflicting files

@markus7017
Shelly EM #18: Compensate missing timestamp/lastUpdate with system
31e7d61 
timestamp (like for sensors)

Signed-off-by: Markus Michels <markus7017@gmail.com>
@kaikreuzer kaikreuzer changed the base branch from master to 2.5.x December 30, 2019 21:54
@kaikreuzer
Copy link
Member

I have switched the PR to go against the 2.5.x branch now. You will probably have to rebase it to solve the conflicts. Alternatively, create a new PR against 2.5.x with a single commit.

@markus7017 markus7017 mentioned this pull request Dec 31, 2019
Closed
markus7017 added a commit to markus7017/openhab-addons that referenced this pull request Jan 5, 2020
@markus7017
This is derived from PR openhab#6592 - to get a clean status I open t…
2dc6151 
…hs new

PR

Signed-off-by: markus7017 <markus7017@gmail.com>
@markus7017 markus7017 mentioned this pull request Jan 5, 2020
Merged
@markus7017
Copy link
Contributor Author

This PR is deprecated. A new one was created to go into the 2.5.1 release: #6764

@markus7017 markus7017 closed this Jan 5, 2020
@markus7017 markus7017 deleted the shelly-25final-2 branch February 9, 2020 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@markus7017 @TravisBuddy @kaikreuzer