Support new device "Blind" and suppy device statistics #34
Conversation
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
added 4 commits
November 22, 2021 10:33
added missing element "Alert" to "Device" Fixed NPE when "switchstate" is null in "Device"
…FritzOS29 to the test resources
…ow can get the normalized values, does not need to calculate by itself
kaklakariada
requested changes
Nov 29, 2021
src/main/java/com/github/kaklakariada/fritzbox/HomeAutomation.java
Outdated
Show resolved
Hide resolved
...ain/java/com/github/kaklakariada/fritzbox/model/homeautomation/AbstractDeviceStatistics.java
Outdated
Show resolved
Hide resolved
...ain/java/com/github/kaklakariada/fritzbox/model/homeautomation/AbstractDeviceStatistics.java
Outdated
Show resolved
Hide resolved
src/main/java/com/github/kaklakariada/fritzbox/model/homeautomation/Alert.java
Outdated
Show resolved
Hide resolved
src/main/java/com/github/kaklakariada/fritzbox/model/homeautomation/Blind.java
Outdated
Show resolved
Hide resolved
src/main/java/com/github/kaklakariada/fritzbox/model/homeautomation/Statistics.java
Outdated
Show resolved
Hide resolved
src/main/java/com/github/kaklakariada/fritzbox/model/homeautomation/Statistics.java
Outdated
Show resolved
Hide resolved
build.gradle
Outdated
| @@ -44,6 +44,7 @@ dependencies { | |||
| implementation 'com.squareup.okhttp3:okhttp:4.9.1' | |||
| implementation 'com.subshell.simpleframework:simple-xml:2.9.0' | |||
| implementation 'org.slf4j:slf4j-api:1.7.32' | |||
| implementation 'org.apache.commons:commons-lang3:3.12.0' | |||
There was a problem hiding this comment.
Please avoid adding dependencies. If necessary implement the necessary methods here.
Additional dependencies increase the attack surface in case they contain vulnerabilities. We are responsible to fix/upgrade when we use them.
src/test/java/com/github/kaklakariada/fritzbox/mapping/DeserializerTest.java
Show resolved
Hide resolved
| @@ -0,0 +1,15 @@ | |||
| <devicestats> | |||
| <temperature> | |||
| <stats count="96" grid="900">185,185,185,185,180,175,175,180,180,185,180,180,180,175,180,180,175,175,175,175,175,175,175,175,175,175,175,175,180,180,180,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195</stats> | |||
There was a problem hiding this comment.
Please add tests for parsing a devicestats file
kaklakariada
requested changes
Dec 2, 2021
… from a dto-class to a helper-class
|
There are still some issues with the PR. I will merge it and fix the issues myself. |
Merged
|
I created release 1.5.0 and published it to Maven Central. It should be available soon at https://repo1.maven.org/maven2/com/github/kaklakariada/fritzbox-java-api/1.5.0/ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
AVM supports a new device "Blind". The companies "Becker" (BoxCTRL) and "Rademacher" (Rollotron DECT 1213) supply the hardware for this. The "getdevicelist" fails because the xml provided by the fritzbox cannot be marshalled to a DeviceList-object. There is no class "Blind", so the tag cannot become instantiated.
The statistic retrieval in TestDriver ist commented out. When I tried, I found it failing due to unsupported commands. I added retrieval of statistics by adding (or updating) the classes "DeviceStats", "Statistics", "Energy", "Power", "Humidity" and "Voltage" (and some helping classes). I also added a JUnit-Test for marshalling the statistics.
The code has been developed by the samples I got when retrieving the data. I'm not sure, whether to docu provided with "AVM Home Automation HTTP Interface" contains really all what is to be known about this. I fear, that, under some cirumstances there might come up another xml-tag which again will fail the marshalling. It looks more like a draft document.
I have added displaying of energy-statistics and power statistics to the sample "TestDriver"