Merge pull request #18 from SmokingDevices/master

Update to Firmware 7.25

Author: kaklakariada

CHANGELOG.md

@@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.4.0] - unreleased
 
 ### Added
-
+* [#18] Added new fields to be compatible with Fritz!OS 7.25
+  * Device (Fritz!Dect440) serves now relative humidity
+  * ColorControl (Fritz!Dect500) got some more fields
+  * Added some getter for fields that did miss them
 * [#19](https://github.com/kaklakariada/fritzbox-java-api/pull/19) Support for device groups
 
 ## [1.3.1] - 2021-02-26

build.gradle

@@ -13,7 +13,7 @@ repositories {
 }
 
 group 'com.github.kaklakariada'
-version = '1.3.1'
+version = '1.4.0'
 
 java {
     toolchain {

src/main/java/com/github/kaklakariada/fritzbox/model/SessionInfo.java

@@ -38,6 +38,9 @@ public class SessionInfo {
     @ElementList(name = "Rights", inline = false, required = false)
     private List<UserRight> rights;
 
+    @ElementList(name = "Users", inline = false, required = false)
+    private List<User> users;
+
     public String getSid() {
         return sid;
     }
@@ -54,6 +57,10 @@ public List<UserRight> getRights() {
         return rights;
     }
 
+    public List<User> getUsers() {
+        return users;
+    }
+
     @Override
     public String toString() {
         return "SessionInfo [sid=" + sid + ", challenge=" + challenge + ", blockTime=" + blockTime + ", rights="

src/main/java/com/github/kaklakariada/fritzbox/model/User.java

@@ -0,0 +1,38 @@
+/**
+ * A Java API for managing FritzBox HomeAutomation
+ * Copyright (C) 2017 Christoph Pirkl <christoph at users.sourceforge.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.github.kaklakariada.fritzbox.model;
+
+import org.simpleframework.xml.Attribute;
+import org.simpleframework.xml.Text;
+
+public class User {
+
+    @Attribute(name = "last", required = false)
+    private int last;
+
+    @Text
+    private String name;
+
+    public boolean isLast() {
+        return (last == 1);
+    }
+
+    public String getName() {
+        return name;
+    }
+}

src/main/java/com/github/kaklakariada/fritzbox/model/homeautomation/ColorControl.java

@@ -36,7 +36,19 @@ public class ColorControl {
     private String supportedModes;
 
     @Attribute(name = "current_mode", required = false)
-    private String current_mode;
+    private String currentMode;
+
+    @Attribute(name = "fullcolorsupport", required = false)
+    private String fullColorSupport;
+
+    @Attribute(name = "mapped", required = false)
+    private String mapped;
+
+    @Element(name = "unmapped_hue", required = false)
+    private String unmappedHue;
+
+    @Element(name = "unmapped_saturation", required = false)
+    private String unmappedSaturation;
 
     public String getHue() {
         return hue;
@@ -54,7 +66,23 @@ public String getSupportedModes() {
         return supportedModes;
     }
 
-    public String getCurrent_mode() {
-        return current_mode;
+    public String getCurrentMode() {
+        return currentMode;
+    }
+
+    public String getFullColorSupport() {
+        return fullColorSupport;
+    }
+
+    public String getMapped() {
+        return mapped;
+    }
+
+    public String getUnmappedHue() {
+        return unmappedHue;
+    }
+
+    public String getUnmappedSaturation() {
+        return unmappedSaturation;
     }
 }

src/main/java/com/github/kaklakariada/fritzbox/model/homeautomation/Device.java

@@ -68,6 +68,8 @@ public class Device {
     private EtsiUnitInfo etsiUnitInfo;
     @ElementList(name = "buttons", required = false, inline = true)
     private List<Button> buttons;
+    @Element(name = "humidity", required = false)
+    private Humidity humidity;
 
     public String getIdentifier() {
         return identifier;
@@ -149,6 +151,22 @@ public List<Button> getButtons() {
         return buttons;
     }
 
+    public String getPresent() {
+        return present;
+    }
+
+    public String getTxbusy() {
+        return txbusy;
+    }
+
+    public Integer getBatterylow() {
+        return batterylow;
+    }
+
+    public Humidity getHumidity() {
+        return humidity;
+    }
+
     @Override
     public String toString() {
         return "Device [identifier=" + identifier + ", id=" + id + ", functionBitmask=" + functionBitmask

src/main/java/com/github/kaklakariada/fritzbox/model/homeautomation/Humidity.java

@@ -0,0 +1,32 @@
+/**
+ * A Java API for managing FritzBox HomeAutomation
+ * Copyright (C) 2017 Christoph Pirkl <christoph at users.sourceforge.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.github.kaklakariada.fritzbox.model.homeautomation;
+
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
+@Root(name = "humidity")
+public class Humidity {
+
+    @Element(name = "rel_humidity", required = false)
+    private int relHumidity;
+
+    public int getRelHumidity() {
+        return relHumidity;
+    }
+}

src/test/java/com/github/kaklakariada/fritzbox/mapping/DeserializerTest.java

@@ -24,9 +24,11 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+import junit.framework.TestCase;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.github.kaklakariada.fritzbox.model.SessionInfo;
 import com.github.kaklakariada.fritzbox.model.homeautomation.DeviceList;
 import com.github.kaklakariada.fritzbox.model.homeautomation.Group;
 import com.github.kaklakariada.fritzbox.model.homeautomation.GroupInfo;
@@ -94,6 +96,26 @@ public void parseDeviceListAllTogether() throws IOException {
     }
 
     @Test
+    public void parseDeviceList() throws IOException {
+        final String fileContent = Files.readAllLines(Paths.get("src/test/resources/deviceList.xml")).stream()
+                .collect(joining("\n"));
+        new Deserializer().parse(fileContent, DeviceList.class);
+    }
+
+    @Test
+    public void parseSessionInfo() throws IOException {
+        final String fileContent = Files.readAllLines(Paths.get("src/test/resources/sessionInfo.xml")).stream()
+                .collect(joining("\n"));
+        SessionInfo sessionInfo = new Deserializer().parse(fileContent, SessionInfo.class);
+        TestCase.assertNotNull(sessionInfo.getUsers());
+        TestCase.assertEquals(3, sessionInfo.getUsers().size());
+        TestCase.assertEquals("UserA", sessionInfo.getUsers().get(0).getName());
+        TestCase.assertFalse(sessionInfo.getUsers().get(0).isLast());
+        TestCase.assertEquals("UserB", sessionInfo.getUsers().get(1).getName());
+        TestCase.assertFalse(sessionInfo.getUsers().get(1).isLast());
+        TestCase.assertEquals("UserC", sessionInfo.getUsers().get(2).getName());
+        TestCase.assertTrue(sessionInfo.getUsers().get(2).isLast());
+    }
     public void parseDeviceGroup() {
         //given
         Group group = deviceList6840.getGroupById("900");