evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate duplicated run state logic in RainMachine (#70009)

Browse source
This commit is contained in:
Aaron Bach 2022-04-13 16:26:30 -06:00 • committed by GitHub
parent 8e64ae8478
commit 6cf7973a49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
homeassistant/components/rainmachine/switch.py
View file

@ -30,6 +30,7 @@ from .const import (
DATA_ZONES,
DEFAULT_ZONE_RUN,
DOMAIN,
RUN_STATE_MAP,
)
from .model import RainMachineDescriptionMixinUid
@ -55,8 +56,6 @@ ATTR_ZONES = "zones"
DAYS = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
RUN_STATUS_MAP = {0: "Not Running", 1: "Running", 2: "Queued"}
SOIL_TYPE_MAP = {
0: "Not Set",
1: "Clay Loam",
@ -328,7 +327,7 @@ class RainMachineProgram(RainMachineActivitySwitch):
ATTR_ID: self.entity_description.uid,
ATTR_NEXT_RUN: next_run,
ATTR_SOAK: data.get("soak"),
ATTR_STATUS: RUN_STATUS_MAP[data["status"]],
ATTR_STATUS: RUN_STATE_MAP[data["status"]],
ATTR_ZONES: [z for z in data["wateringTimes"] if z["active"]],
}
)
@ -402,7 +401,7 @@ class RainMachineZone(RainMachineActivitySwitch):
ATTR_SLOPE: SLOPE_TYPE_MAP.get(data["slope"], 99),
ATTR_SOIL_TYPE: SOIL_TYPE_MAP.get(data["soil"], 99),
ATTR_SPRINKLER_TYPE: SPRINKLER_TYPE_MAP.get(data["group_id"], 99),
ATTR_STATUS: RUN_STATUS_MAP[data["state"]],
ATTR_STATUS: RUN_STATE_MAP[data["state"]],
ATTR_SUN_EXPOSURE: SUN_EXPOSURE_MAP.get(data.get("sun")),
ATTR_VEGETATION_TYPE: VEGETATION_MAP.get(data["type"], 99),
}