Skip to content

Commit 3f489bf

Browse files
committed
Add various updates
1 parent 943827d commit 3f489bf

File tree

4 files changed

+68
-7
lines changed

4 files changed

+68
-7
lines changed

tests/test_smile.py

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,6 +1887,55 @@ async def test_connect_adam_plus_anna_new(self):
18871887
"switches": {"relay": True},
18881888
},
18891889
}
1890+
testdata_updated = {
1891+
"67d73d0bd469422db25a618a5fb8eeb0": {
1892+
"dev_class": "zz_misc",
1893+
"switches": {"lock": True}, !!!
1894+
},
1895+
"2568cc4b9c1e401495d4741a5f89bee1": {
1896+
"dev_class": "computer_desktop",
1897+
"firmware": "2020-11-10T01:00:00+01:00",
1898+
"sensors": {
1899+
"electricity_consumed": 0.0,
1900+
"electricity_consumed_interval": 0.0,
1901+
"electricity_produced": 0.0,
1902+
"electricity_produced_interval": 0.0,
1903+
},
1904+
"switches": {"relay": False, "lock": False}, !!!!
1905+
},
1906+
"1772a4ea304041adb83f357b751341ff": {
1907+
"dev_class": "thermo_sensor",
1908+
"firmware": "2020-11-04T01:00:00+01:00",
1909+
"hardware": "1",
1910+
"location": "f871b8c4d63549319221e294e4f88074",
1911+
"model": "Tom/Floor",
1912+
"name": "Tom Badkamer",
1913+
"zigbee_mac_address": "ABCD012345670A01",
1914+
"vendor": "Plugwise",
1915+
"available": False, !!!!
1916+
"sensors": {
1917+
"temperature": 21.6,
1918+
"setpoint": 15.0,
1919+
"battery": 99,
1920+
"temperature_difference": 2.3,
1921+
"valve_position": 0.0,
1922+
},
1923+
},
1924+
"da224107914542988a88561b4452b0f6": {
1925+
"dev_class": "gateway",
1926+
"binary_sensors": {"plugwise_notification": True}, !!!!
1927+
},
1928+
"e8ef2a01ed3b4139a53bf749204fe6b4": {
1929+
"dev_class": "switching",
1930+
"model": "Switchgroup",
1931+
"name": "Test",
1932+
"members": [
1933+
"2568cc4b9c1e401495d4741a5f89bee1",
1934+
"29542b2b6a6a4169acecc15c72a599b8",
1935+
],
1936+
"switches": {"relay": False},
1937+
},
1938+
}
18901939

18911940
self.smile_setup = "adam_plus_anna_new"
18921941
server, smile, client = await self.connect_wrapper()

userdata/updated/adam_plus_anna_new/core.appliances.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<actuator_functionalities>
4545
<relay_functionality id='76c3a214120b42e790641aff891a5f82'>
4646
<updated_date>2022-06-13T15:15:12.918+02:00</updated_date>
47-
<lock>false</lock>
47+
<lock>true</lock>
4848
<state>on</state>
4949
<relay id='36368e4365e248f2a3afc21d5afb1693'/>
5050
</relay_functionality>
@@ -262,7 +262,7 @@
262262
<interval/>
263263
<electricity_point_meter id='10284652151d45e1b6ee81ca620dec5b'/>
264264
<period start_date="2022-01-11T08:04:49.716+01:00" end_date="2022-01-11T08:04:49.716+01:00">
265-
<measurement log_date="2022-01-11T08:04:49.716+01:00">98.00</measurement>
265+
<measurement log_date="2022-01-11T08:04:49.716+01:00">0.00</measurement>
266266
</period>
267267
</point_log>
268268
<point_log id='66e87f88c0dc4b1d99cb678030c445b5'>
@@ -284,7 +284,7 @@
284284
<interval>PT15M</interval>
285285
<electricity_interval_meter id='65677100dd34484c91a38fa9f151eed6'/>
286286
<period start_date="2022-01-11T08:00:00+01:00" end_date="2022-01-11T08:00:00+01:00" interval="PT15M">
287-
<measurement log_date="2022-01-11T08:00:00+01:00">24.00</measurement>
287+
<measurement log_date="2022-01-11T08:00:00+01:00">0.00</measurement>
288288
</period>
289289
</interval_log>
290290
<point_log id='b3f0c9aff0a84a5991ff0bfd11280b8c'>
@@ -295,7 +295,7 @@
295295
<interval/>
296296
<relay id='35e7673305014654a4575f591ca6a01a'/>
297297
<period start_date="2022-01-11T08:02:24.183+01:00" end_date="2022-01-11T08:02:24.183+01:00">
298-
<measurement log_date="2022-01-11T08:02:24.183+01:00">on</measurement>
298+
<measurement log_date="2022-01-11T08:02:24.183+01:00">off</measurement>
299299
</period>
300300
</point_log>
301301
<interval_log id='eed6f2db80fe4c12aaca560a84dd2ae0'>
@@ -313,8 +313,8 @@
313313
<actuator_functionalities>
314314
<relay_functionality id='45cfd0a5759e45699ec6e653cb867981'>
315315
<updated_date>2022-01-11T08:02:24.183+01:00</updated_date>
316-
<lock>true</lock>
317-
<state>on</state>
316+
<lock>false</lock>
317+
<state>off</state>
318318
<relay id='35e7673305014654a4575f591ca6a01a'/>
319319
</relay_functionality>
320320
</actuator_functionalities>

userdata/updated/adam_plus_anna_new/core.domain_objects.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,18 @@
4949
</zig_bee_node>
5050
</protocols>
5151
</module>
52+
<notification id='af82e4ccf9c548528166d38e560662a4'>
53+
<type>warning</type>
54+
<origin>local</origin>
55+
<title>Plug has been unreachable since 23:03 2020-01-18.</title>
56+
<message>Node Plug (with MAC address 000D6F000D13CB01, in room &apos;n.a.&apos;) has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device.</message>
57+
<valid_from></valid_from>
58+
<valid_to></valid_to>
59+
<read_date>2020-01-23T10:54:59.710+01:00</read_date>
60+
<created_date>2020-01-18T23:03:43.689+01:00</created_date>
61+
<modified_date>2020-01-18T23:03:43.749+01:00</modified_date>
62+
<deleted_date></deleted_date>
63+
</notification>
5264
<appliance id='2568cc4b9c1e401495d4741a5f89bee1'>
5365
<name>Plug Werkplek</name>
5466
<description>A smart plug that can be switched on/off and measure power usage.</description>

userdata/updated/adam_plus_anna_new/core.modules.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<zig_bee_node id='877114bc3e864b0fa40f22a1f4c6f55f'>
107107
<mac_address>ABCD012345670A01</mac_address>
108108
<type>end_device</type>
109-
<reachable>true</reachable>
109+
<reachable>false</reachable>
110110
<power_source>battery</power_source>
111111
<intended_override_antenna_power>false</intended_override_antenna_power>
112112
<override_antenna_power>false</override_antenna_power>

0 commit comments

Comments
 (0)