Skip to content

Commit e2ede3e

Browse files
joostlekfrenck
joostlek
authored and
frenck
committed
Map SmartThings auto mode correctly (home-assistant#145061)
1 parent b76ac68 commit e2ede3e

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎homeassistant/components/smartthings/climate.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
ATTR_OPERATION_STATE = "operation_state"
3333
MODE_TO_STATE = {
34-
"auto": HVACMode.HEAT_COOL,
34+
"auto": HVACMode.AUTO,
3535
"cool": HVACMode.COOL,
3636
"eco": HVACMode.AUTO,
3737
"rush hour": HVACMode.AUTO,
@@ -40,7 +40,7 @@
4040
"off": HVACMode.OFF,
4141
}
4242
STATE_TO_MODE = {
43-
HVACMode.HEAT_COOL: "auto",
43+
HVACMode.AUTO: "auto",
4444
HVACMode.COOL: "cool",
4545
HVACMode.HEAT: "heat",
4646
HVACMode.OFF: "off",
@@ -58,7 +58,7 @@
5858
}
5959

6060
AC_MODE_TO_STATE = {
61-
"auto": HVACMode.HEAT_COOL,
61+
"auto": HVACMode.AUTO,
6262
"cool": HVACMode.COOL,
6363
"dry": HVACMode.DRY,
6464
"coolClean": HVACMode.COOL,
@@ -69,7 +69,7 @@
6969
"wind": HVACMode.FAN_ONLY,
7070
}
7171
STATE_TO_AC_MODE = {
72-
HVACMode.HEAT_COOL: "auto",
72+
HVACMode.AUTO: "auto",
7373
HVACMode.COOL: "cool",
7474
HVACMode.DRY: "dry",
7575
HVACMode.HEAT: "heat",

‎tests/components/smartthings/snapshots/test_climate.ambr‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<HVACMode.COOL: 'cool'>,
147147
<HVACMode.DRY: 'dry'>,
148148
<HVACMode.FAN_ONLY: 'fan_only'>,
149-
<HVACMode.HEAT_COOL: 'heat_cool'>,
149+
<HVACMode.AUTO: 'auto'>,
150150
<HVACMode.HEAT: 'heat'>,
151151
]),
152152
'max_temp': 35,
@@ -206,7 +206,7 @@
206206
<HVACMode.COOL: 'cool'>,
207207
<HVACMode.DRY: 'dry'>,
208208
<HVACMode.FAN_ONLY: 'fan_only'>,
209-
<HVACMode.HEAT_COOL: 'heat_cool'>,
209+
<HVACMode.AUTO: 'auto'>,
210210
<HVACMode.HEAT: 'heat'>,
211211
]),
212212
'max_temp': 35,
@@ -246,7 +246,7 @@
246246
<HVACMode.COOL: 'cool'>,
247247
<HVACMode.DRY: 'dry'>,
248248
<HVACMode.FAN_ONLY: 'fan_only'>,
249-
<HVACMode.HEAT_COOL: 'heat_cool'>,
249+
<HVACMode.AUTO: 'auto'>,
250250
]),
251251
'max_temp': 35,
252252
'min_temp': 7,
@@ -308,7 +308,7 @@
308308
<HVACMode.COOL: 'cool'>,
309309
<HVACMode.DRY: 'dry'>,
310310
<HVACMode.FAN_ONLY: 'fan_only'>,
311-
<HVACMode.HEAT_COOL: 'heat_cool'>,
311+
<HVACMode.AUTO: 'auto'>,
312312
]),
313313
'max_temp': 35,
314314
'min_temp': 7,
@@ -349,7 +349,7 @@
349349
]),
350350
'hvac_modes': list([
351351
<HVACMode.OFF: 'off'>,
352-
<HVACMode.HEAT_COOL: 'heat_cool'>,
352+
<HVACMode.AUTO: 'auto'>,
353353
<HVACMode.COOL: 'cool'>,
354354
<HVACMode.DRY: 'dry'>,
355355
<HVACMode.FAN_ONLY: 'fan_only'>,
@@ -414,7 +414,7 @@
414414
'friendly_name': 'Aire Dormitorio Principal',
415415
'hvac_modes': list([
416416
<HVACMode.OFF: 'off'>,
417-
<HVACMode.HEAT_COOL: 'heat_cool'>,
417+
<HVACMode.AUTO: 'auto'>,
418418
<HVACMode.COOL: 'cool'>,
419419
<HVACMode.DRY: 'dry'>,
420420
<HVACMode.FAN_ONLY: 'fan_only'>,
@@ -462,7 +462,7 @@
462462
<HVACMode.COOL: 'cool'>,
463463
<HVACMode.DRY: 'dry'>,
464464
<HVACMode.FAN_ONLY: 'fan_only'>,
465-
<HVACMode.HEAT_COOL: 'heat_cool'>,
465+
<HVACMode.AUTO: 'auto'>,
466466
]),
467467
'max_temp': 35,
468468
'min_temp': 7,
@@ -513,7 +513,7 @@
513513
<HVACMode.COOL: 'cool'>,
514514
<HVACMode.DRY: 'dry'>,
515515
<HVACMode.FAN_ONLY: 'fan_only'>,
516-
<HVACMode.HEAT_COOL: 'heat_cool'>,
516+
<HVACMode.AUTO: 'auto'>,
517517
]),
518518
'max_temp': 35,
519519
'min_temp': 7,
@@ -541,7 +541,7 @@
541541
'hvac_modes': list([
542542
<HVACMode.OFF: 'off'>,
543543
<HVACMode.COOL: 'cool'>,
544-
<HVACMode.HEAT_COOL: 'heat_cool'>,
544+
<HVACMode.AUTO: 'auto'>,
545545
]),
546546
'max_temp': 35.0,
547547
'min_temp': 7.0,
@@ -589,7 +589,7 @@
589589
'hvac_modes': list([
590590
<HVACMode.OFF: 'off'>,
591591
<HVACMode.COOL: 'cool'>,
592-
<HVACMode.HEAT_COOL: 'heat_cool'>,
592+
<HVACMode.AUTO: 'auto'>,
593593
]),
594594
'max_temp': 35.0,
595595
'min_temp': 7.0,

‎tests/components/smartthings/test_climate.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ async def test_ac_set_hvac_mode_off(
119119
@pytest.mark.parametrize(
120120
("hvac_mode", "argument"),
121121
[
122-
(HVACMode.HEAT_COOL, "auto"),
122+
(HVACMode.AUTO, "auto"),
123123
(HVACMode.COOL, "cool"),
124124
(HVACMode.DRY, "dry"),
125125
(HVACMode.HEAT, "heat"),
@@ -174,7 +174,7 @@ async def test_ac_set_hvac_mode_turns_on(
174174
SERVICE_SET_HVAC_MODE,
175175
{
176176
ATTR_ENTITY_ID: "climate.ac_office_granit",
177-
ATTR_HVAC_MODE: HVACMode.HEAT_COOL,
177+
ATTR_HVAC_MODE: HVACMode.AUTO,
178178
},
179179
blocking=True,
180180
)
@@ -266,7 +266,7 @@ async def test_ac_set_temperature_and_hvac_mode_while_off(
266266
{
267267
ATTR_ENTITY_ID: "climate.ac_office_granit",
268268
ATTR_TEMPERATURE: 23,
269-
ATTR_HVAC_MODE: HVACMode.HEAT_COOL,
269+
ATTR_HVAC_MODE: HVACMode.AUTO,
270270
},
271271
blocking=True,
272272
)
@@ -316,7 +316,7 @@ async def test_ac_set_temperature_and_hvac_mode(
316316
{
317317
ATTR_ENTITY_ID: "climate.ac_office_granit",
318318
ATTR_TEMPERATURE: 23,
319-
ATTR_HVAC_MODE: HVACMode.HEAT_COOL,
319+
ATTR_HVAC_MODE: HVACMode.AUTO,
320320
},
321321
blocking=True,
322322
)
@@ -623,7 +623,7 @@ async def test_thermostat_set_hvac_mode(
623623
await hass.services.async_call(
624624
CLIMATE_DOMAIN,
625625
SERVICE_SET_HVAC_MODE,
626-
{ATTR_ENTITY_ID: "climate.asd", ATTR_HVAC_MODE: HVACMode.HEAT_COOL},
626+
{ATTR_ENTITY_ID: "climate.asd", ATTR_HVAC_MODE: HVACMode.AUTO},
627627
blocking=True,
628628
)
629629
devices.execute_device_command.assert_called_once_with(

0 commit comments

Comments
 (0)