Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for temperature precision 2.0 #59

Merged
merged 1 commit into from
Jul 6, 2024
Merged

add support for temperature precision 2.0 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 40 additions & 80 deletions custom_components/smartir/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,30 +234,44 @@ def check_file_climate(file_name, device_data, device_class, check_data):

if not (
"precision" in device_data
and isinstance(device_data["precision"], int)
or isinstance(device_data["precision"], float)
and (
isinstance(device_data["precision"], int)
or isinstance(device_data["precision"], float)
)
and device_data["precision"] in [0.1, 0.5, 1, 2]
):
_LOGGER.error(
"Invalid %s device JSON file '%s': missing or invalid attribute 'precison'.",
device_class,
file_name,
)
return False
check_data["precision"] = device_data["precision"]

if not (
"minTemperature" in device_data
and isinstance(device_data["minTemperature"], int)
or isinstance(device_data["minTemperature"], float)
and (
isinstance(device_data["minTemperature"], int)
or isinstance(device_data["minTemperature"], float)
)
and precision_round(device_data["minTemperature"], device_data["precision"])
== float(device_data["minTemperature"])
):
_LOGGER.error(
"Invalid %s device JSON file '%s': missing or invalid attribute 'minTemperature'.",
device_class,
file_name,
)
return False

if not (
"maxTemperature" in device_data
and isinstance(device_data["maxTemperature"], int)
or isinstance(device_data["maxTemperature"], float)
and (
isinstance(device_data["maxTemperature"], int)
or isinstance(device_data["maxTemperature"], float)
)
and precision_round(device_data["maxTemperature"], device_data["precision"])
== float(device_data["maxTemperature"])
):
_LOGGER.error(
"Invalid %s device JSON file '%s': missing or invalid attribute 'maxTemperature'.",
Expand All @@ -266,75 +280,6 @@ def check_file_climate(file_name, device_data, device_class, check_data):
)
return False

modes_list.append("temperature")
modes_used["temperature"] = {}
if device_data["precision"] == 1:
if round(float(device_data["minTemperature"])) != float(
device_data["minTemperature"]
):
_LOGGER.error(
"Invalid %s device JSON file '%s': invalid attribute 'minTemperature'.",
device_class,
file_name,
)
return False
if round(float(device_data["maxTemperature"])) != float(
device_data["maxTemperature"]
):
_LOGGER.error(
"Invalid %s device JSON file '%s': invalid attribute 'maxTemperature'.",
device_class,
file_name,
)
return False
elif device_data["precision"] == 0.5:
if round((float(device_data["minTemperature"]) * 2) / 2.0, 1) != float(
device_data["minTemperature"]
):
_LOGGER.error(
"Invalid %s device JSON file '%s': invalid attribute 'minTemperature'.",
device_class,
file_name,
)
return False
if round((float(device_data["maxTemperature"]) * 2) / 2.0, 1) != float(
device_data["maxTemperature"]
):
_LOGGER.error(
"Invalid %s device JSON file '%s': invalid attribute 'maxTemperature'.",
device_class,
file_name,
)
return False
elif device_data["precision"] == 0.1:
if round(float(device_data["minTemperature"]), 1) != float(
device_data["minTemperature"]
):
_LOGGER.error(
"Invalid %s device JSON file '%s': invalid attribute 'minTemperature'.",
device_class,
file_name,
)
return False
if round(float(device_data["maxTemperature"]), 1) != float(
device_data["maxTemperature"]
):
_LOGGER.error(
"Invalid %s device JSON file '%s': invalid attribute 'maxTemperature'.",
device_class,
file_name,
)
return False
else:
_LOGGER.error(
"Invalid %s device JSON file '%s': invalid attribute 'precison'.",
device_class,
file_name,
)
return False

check_data["precision"] = device_data["precision"]

modes_list.append("temperature")
modes_used["temperature"] = {}
temp_list = [device_data["minTemperature"]]
Expand Down Expand Up @@ -372,14 +317,24 @@ def check_file_climate_commands(

if not (isinstance(commands, dict) and len(commands)):
_LOGGER.error(
"Invalid %s device JSON file '%s': invalid attribute 'commands'.",
"Invalid %s device JSON file '%s': invalid format at %s level.",
device_class,
file_name,
level,
)
return False
elif level == "operation":
check = []
# operation modes level
if "on" in commands:
if not (isinstance(commands["on"], str) and commands["on"]):
_LOGGER.error(
"Invalid %s device JSON file '%s': missing or invalid 'on' operation mode command.",
device_class,
file_name,
)
return False
check.append("on")
if "off" in commands:
if not (isinstance(commands["off"], str) and commands["off"]):
_LOGGER.error(
Expand Down Expand Up @@ -408,10 +363,11 @@ def check_file_climate_commands(
for mode in modes_used[level]:
if not mode in commands:
_LOGGER.error(
"Invalid %s device JSON file '%s': not defined 'operation' mode '%s' command key used.",
"Invalid %s device JSON file '%s': not defined operation mode '%s' command key used. %s",
device_class,
file_name,
mode,
commands.keys(),
)
return False
elif not DeviceData.check_file_climate_commands(
Expand Down Expand Up @@ -533,9 +489,13 @@ def check_file_media_player(file_name, device_data, device_class, check_data):

@staticmethod
def precision_round(number, precision):
if precision == 0.1:
return round(float(number), 1)
if precision == 0.5:
return round((float(number) * 2) / 2.0, 1)
elif precision == 0.1:
return round(float(number), 1)
else:
elif precision == 1:
return round(float(number))
elif precision == 2:
return int(number) if ((int(number) % 2) == 0) else int(number) + 1
else:
return None
1 change: 1 addition & 0 deletions test_device_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ async def main():
for device_class in docs.keys():
with open("docs/" + device_class + ".json", "w") as outfile:
json.dump(docs[device_class], outfile)
sys.exit(0)

sys.exit(exit)

Expand Down
Loading