@@ -4248,37 +4248,22 @@ async def test_connect_adam_onoff_cooling_fake_firmware(self):
42484248 async def test_connect_anna_elga_2 (self ):
42494249 """Test a 2nd Anna with Elga setup, cooling off, in idle mode (with missing outdoor temperature - solved)."""
42504250 testdata = {
4251- "ebd90df1ab334565b5895f37590ccff4" : {
4252- "dev_class" : "thermostat" ,
4253- "firmware" : "2018-02-08T11:15:53+01:00" ,
4254- "hardware" : "6539-1301-5002" ,
4255- "location" : "d3ce834534114348be628b61b26d9220" ,
4256- "model" : "ThermoTouch" ,
4257- "name" : "Anna" ,
4251+ "fb49af122f6e4b0f91267e1cf7666d6f" : {
4252+ "dev_class" : "gateway" ,
4253+ "firmware" : "4.2.1" ,
4254+ "hardware" : "AME Smile 2.0 board" ,
4255+ "location" : "d34dfe6ab90b410c98068e75de3eb631" ,
4256+ "mac_address" : "C4930002FE76" ,
4257+ "model" : "Gateway" ,
4258+ "name" : "Smile Anna" ,
42584259 "vendor" : "Plugwise" ,
4259- "thermostat" : {
4260- "setpoint" : 19.5 ,
4261- "lower_bound" : 4.0 ,
4262- "upper_bound" : 30.0 ,
4263- "resolution" : 0.1 ,
4264- },
4265- "preset_modes" : ["away" , "no_frost" , "vacation" , "home" , "asleep" ],
4266- "active_preset" : "home" ,
4267- "available_schedules" : ["Thermostat schedule" ],
4268- "select_schedule" : "Thermostat schedule" ,
4269- "mode" : "auto" ,
4270- "sensors" : {
4271- "temperature" : 20.9 ,
4272- "setpoint" : 19.5 ,
4273- "illuminance" : 0.5 ,
4274- "cooling_activation_outdoor_temperature" : 26.0 ,
4275- "cooling_deactivation_threshold" : 3.0 ,
4276- },
4260+ "binary_sensors" : {"plugwise_notification" : False },
4261+ "sensors" : {"outdoor_temperature" : 13.0 },
42774262 },
42784263 "573c152e7d4f4720878222bd75638f5b" : {
42794264 "dev_class" : "heater_central" ,
42804265 "location" : "d34dfe6ab90b410c98068e75de3eb631" ,
4281- "model" : "Generic heater" ,
4266+ "model" : "Generic heater/cooler " ,
42824267 "name" : "OpenTherm" ,
42834268 "vendor" : "Techneco" ,
42844269 "maximum_boiler_temperature" : {
@@ -4292,6 +4277,7 @@ async def test_connect_anna_elga_2(self):
42924277 "dhw_state" : False ,
42934278 "heating_state" : False ,
42944279 "compressor_state" : False ,
4280+ "cooling_state" : False ,
42954281 "cooling_enabled" : False ,
42964282 "slave_boiler_state" : False ,
42974283 "flame_state" : False ,
@@ -4307,17 +4293,34 @@ async def test_connect_anna_elga_2(self):
43074293 },
43084294 "switches" : {"dhw_cm_switch" : True },
43094295 },
4310- "fb49af122f6e4b0f91267e1cf7666d6f" : {
4311- "dev_class" : "gateway" ,
4312- "firmware" : "4.2.1" ,
4313- "hardware" : "AME Smile 2.0 board" ,
4314- "location" : "d34dfe6ab90b410c98068e75de3eb631" ,
4315- "mac_address" : "C4930002FE76" ,
4316- "model" : "Gateway" ,
4317- "name" : "Smile Anna" ,
4296+ "ebd90df1ab334565b5895f37590ccff4" : {
4297+ "dev_class" : "thermostat" ,
4298+ "firmware" : "2018-02-08T11:15:53+01:00" ,
4299+ "hardware" : "6539-1301-5002" ,
4300+ "location" : "d3ce834534114348be628b61b26d9220" ,
4301+ "model" : "ThermoTouch" ,
4302+ "name" : "Anna" ,
43184303 "vendor" : "Plugwise" ,
4319- "binary_sensors" : {"plugwise_notification" : False },
4320- "sensors" : {"outdoor_temperature" : 13.0 },
4304+ "thermostat" : {
4305+ "setpoint_low" : 19.5 ,
4306+ "setpoint_high" : 30.0 ,
4307+ "lower_bound" : 4.0 ,
4308+ "upper_bound" : 30.0 ,
4309+ "resolution" : 0.1 ,
4310+ },
4311+ "preset_modes" : ["away" , "no_frost" , "vacation" , "home" , "asleep" ],
4312+ "active_preset" : "home" ,
4313+ "available_schedules" : ["Thermostat schedule" ],
4314+ "select_schedule" : "Thermostat schedule" ,
4315+ "mode" : "auto" ,
4316+ "sensors" : {
4317+ "temperature" : 20.9 ,
4318+ "illuminance" : 0.5 ,
4319+ "cooling_activation_outdoor_temperature" : 26.0 ,
4320+ "cooling_deactivation_threshold" : 3.0 ,
4321+ "setpoint_low" : 19.5 ,
4322+ "setpoint_high" : 30.0 ,
4323+ },
43214324 },
43224325 }
43234326
@@ -4338,9 +4341,10 @@ async def test_connect_anna_elga_2(self):
43384341 smile ._last_active ["d3ce834534114348be628b61b26d9220" ]
43394342 == "Thermostat schedule"
43404343 )
4341- assert smile .device_items == 59
4344+ assert smile .device_items == 62
43424345 assert smile .gateway_id == "fb49af122f6e4b0f91267e1cf7666d6f"
4343- assert not self .cooling_present
4346+ assert self .cooling_present
4347+ assert not smile ._cooling_enabled
43444348 assert not self .notifications
43454349
43464350 await smile .close_connection ()
@@ -4359,7 +4363,8 @@ async def test_connect_anna_elga_2_schedule_off(self):
43594363 "name" : "Anna" ,
43604364 "vendor" : "Plugwise" ,
43614365 "thermostat" : {
4362- "setpoint" : 19.5 ,
4366+ "setpoint_low" : 19.5 ,
4367+ "setpoint_high" : 30.0 ,
43634368 "lower_bound" : 4.0 ,
43644369 "upper_bound" : 30.0 ,
43654370 "resolution" : 0.1 ,
@@ -4368,13 +4373,14 @@ async def test_connect_anna_elga_2_schedule_off(self):
43684373 "active_preset" : "home" ,
43694374 "available_schedules" : ["Thermostat schedule" ],
43704375 "select_schedule" : "None" ,
4371- "mode" : "heat " ,
4376+ "mode" : "heat_cool " ,
43724377 "sensors" : {
43734378 "temperature" : 20.9 ,
4374- "setpoint" : 19.5 ,
43754379 "illuminance" : 0.5 ,
43764380 "cooling_activation_outdoor_temperature" : 26.0 ,
43774381 "cooling_deactivation_threshold" : 3.0 ,
4382+ "setpoint_low" : 19.5 ,
4383+ "setpoint_high" : 30.0 ,
43784384 },
43794385 }
43804386 }
@@ -4388,8 +4394,9 @@ async def test_connect_anna_elga_2_schedule_off(self):
43884394 smile ._last_active ["d3ce834534114348be628b61b26d9220" ]
43894395 == "Thermostat schedule"
43904396 )
4391- assert not smile ._cooling_present
4392- assert smile .device_items == 59
4397+ assert smile ._cooling_present
4398+ assert not smile ._cooling_enabled
4399+ assert smile .device_items == 62
43934400
43944401 await smile .close_connection ()
43954402 await self .disconnect (server , client )
@@ -4496,9 +4503,9 @@ async def test_connect_anna_elga_2_cooling(self):
44964503 == "Thermostat schedule"
44974504 )
44984505 assert smile .device_items == 62
4499- assert self .cooling_present
45004506 assert not self .notifications
45014507
4508+ assert self .cooling_present
45024509 assert smile ._cooling_enabled
45034510 assert smile ._cooling_active
45044511
0 commit comments