Merge pull request #402 from coreGreenberet/new_devices

added new devices
hahn-th · Apr 5, 2021 · c754d37 · c754d37
2 parents 935665b + c772eda
commit c754d37
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.0.0] 2021-04-05
 
 ### ADDED
-- API
 - Devices
     - [HmIP-STE2-PCB] (Temperature Difference Sensors - 2x sensors) 
 
+### FIXED
+- API
+ - [BUG: 387] Groups were missing in the functional channels of devices
+ - [BUG: 398] 'ACCESS_CONTROL' isn't a valid option for class 'FunctionalHomeType'
+ - [BUG: 391] There is no class for device 'PUSH_BUTTON_FLAT' yet
+
 ## [0.13.1] 2021-01-23
 
 ### ADDED
@@ -368,7 +373,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - API
 -- Support for the new HMIP Cloud Update
 
-[Unreleased]: https://github.com/coreGreenberet/homematicip-rest-api/compare/0.13.1...HEAD
+[1.0.0]: https://github.com/coreGreenberet/homematicip-rest-api/compare/0.13.1...1.0.0
 [0.13.1]: https://github.com/coreGreenberet/homematicip-rest-api/compare/0.13.0...0.13.1
 [0.13.0]: https://github.com/coreGreenberet/homematicip-rest-api/compare/0.12.1...0.13.0
 [0.12.1]: https://github.com/coreGreenberet/homematicip-rest-api/compare/0.12.0...0.12.1
@@ -410,6 +415,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [PR: 320]: https://github.com/coreGreenberet/homematicip-rest-api/pull/320
 [BUG: 325]: https://github.com/coreGreenberet/homematicip-rest-api/issues/325
 [BUG: 342]: https://github.com/coreGreenberet/homematicip-rest-api/issues/342
+[BUG: 387]: https://github.com/coreGreenberet/homematicip-rest-api/issues/387
+[BUG: 391]: https://github.com/coreGreenberet/homematicip-rest-api/issues/391
+[BUG: 398]: https://github.com/coreGreenberet/homematicip-rest-api/issues/398
 
 [HMIP-FALMOT-C12]: https://github.com/coreGreenberet/homematicip-rest-api/issues/281
 [HMIP-WHS2]: https://github.com/coreGreenberet/homematicip-rest-api/issues/280

diff --git a/homematicip/aio/class_maps.py b/homematicip/aio/class_maps.py
@@ -53,6 +53,7 @@
     DeviceType.PRINTED_CIRCUIT_BOARD_SWITCH_BATTERY: AsyncPrintedCircuitBoardSwitchBattery,
     DeviceType.PUSH_BUTTON: AsyncPushButton,
     DeviceType.PUSH_BUTTON_6: AsyncPushButton6,
+    DeviceType.PUSH_BUTTON_FLAT: AsyncPushButtonFlat,
     DeviceType.REMOTE_CONTROL_8: AsyncRemoteControl8,
     DeviceType.REMOTE_CONTROL_8_MODULE: AsyncRemoteControl8Module,
     DeviceType.ROOM_CONTROL_DEVICE: AsyncRoomControlDevice,

diff --git a/homematicip/base/enums.py b/homematicip/base/enums.py
@@ -329,11 +329,11 @@ class AutomationRuleType(AutoNameEnum):
 
 
 class FunctionalHomeType(AutoNameEnum):
+    ACCESS_CONTROL = auto()
     INDOOR_CLIMATE = auto()
     LIGHT_AND_SHADOW = auto()
     SECURITY_AND_ALARM = auto()
     WEATHER_AND_ENVIRONMENT = auto()
-    ACCESS_CONTROL = auto()
 
 
 class EventType(AutoNameEnum):

diff --git a/homematicip/functionalHomes.py b/homematicip/functionalHomes.py
@@ -141,9 +141,7 @@ def from_json(self, js, groups: List[Group]):
         self.accessAuthorizationProfileGroups = self.assignGroups(
             js["accessAuthorizationProfileGroups"], groups
         )
-        self.lockProfileGroups = self.assignGroups(
-            js["lockProfileGroups"], groups
-        )
+        self.lockProfileGroups = self.assignGroups(js["lockProfileGroups"], groups)
         self.autoRelockProfileGroups = self.assignGroups(
             js["autoRelockProfileGroups"], groups
         )

diff --git a/homematicip_demo/json_data/home.json b/homematicip_demo/json_data/home.json
@@ -8484,8 +8484,13 @@
                 "solution": "WEATHER_AND_ENVIRONMENT"
             },
             "ACCESS_CONTROL": {
-                "active": true,
+                "accessAuthorizationProfileGroups": [],
+                "active": false,
+                "autoRelockProfileGroups": [],
+                "extendedLinkedGarageDoorGroups": [],
+                "extendedLinkedNotificationGroups": [],
                 "functionalGroups": [],
+                "lockProfileGroups": [],
                 "solution": "ACCESS_CONTROL"
             }
         },

diff --git a/tests/test_devices.py b/tests/test_devices.py
@@ -986,8 +986,9 @@ def test_push_button_6(fake_home: Home):
 
 
 def test_push_button_flat(fake_home: Home):
-    d = PushButton6(fake_home._connection)
+    d = PushButtonFlat(fake_home._connection)
     d = fake_home.search_device_by_id("3014F711PUSH_BUTTON_FLAT")
+    assert isinstance(d, PushButtonFlat)
     assert d.modelId == 431
     assert d.label == "Wandtaster"