Skip to content

Commit

Permalink
Limits sometimes apply to values after formula calculation (#168)
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentwolsink authored Oct 30, 2024
1 parent e38f8b5 commit 9a05165
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
21 changes: 15 additions & 6 deletions custom_components/aguaiot/aguaiot.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,11 @@ async def __update_device_information(self):

self.__information_dict = information_dict

def __prepare_value_for_writing(self, item, value):
def __prepare_value_for_writing(self, item, value, limit_value_raw=False):
set_min = self.__register_map_dict[item]["set_min"]
set_max = self.__register_map_dict[item]["set_max"]

if float(value) < set_min or float(value) > set_max:
if not limit_value_raw and (float(value) < set_min or float(value) > set_max):
raise ValueError(f"Value must be between {set_min} and {set_max}: {value}")

formula = self.__register_map_dict[item]["formula_inverse"]
Expand All @@ -423,6 +423,11 @@ def __prepare_value_for_writing(self, item, value):
eval_formula = simple_eval(formula)
value = int(eval_formula)

if limit_value_raw and (float(value) < set_min or float(value) > set_max):
raise ValueError(
f"Raw value must be between {set_min} and {set_max}: {value}"
)

if self.__register_map_dict[item]["is_hex"]:
value = int(f"0x{value}", 16)

Expand Down Expand Up @@ -549,18 +554,22 @@ def get_register_enabled(self, key):
else:
return self.get_register_value(enable_key) == 1

async def set_register_value(self, key, value):
value = self.__prepare_value_for_writing(key, value)
async def set_register_value(self, key, value, limit_value_raw=False):
value = self.__prepare_value_for_writing(
key, value, limit_value_raw=limit_value_raw
)
items = {key: value}

try:
await self.__request_writing(items)
except AguaIOTError:
raise AguaIOTError(f"Error while trying to set: key={key} value={value}")

async def set_register_values(self, items):
async def set_register_values(self, items, limit_value_raw=False):
for key in items:
items[key] = self.__prepare_value_for_writing(key, items[key])
items[key] = self.__prepare_value_for_writing(
key, items[key], limit_value_raw=limit_value_raw
)

try:
await self.__request_writing(items)
Expand Down
3 changes: 2 additions & 1 deletion custom_components/aguaiot/climate.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ async def sync_clock(self):
"calendar_day_set": dt_now.day,
"calendar_month_set": dt_now.month,
"calendar_year_set": dt_now.year,
}
},
limit_value_raw=True,
)
except (ValueError, AguaIOTError) as err:
_LOGGER.error("Failed to set value, error: %s", err)
Expand Down

0 comments on commit 9a05165

Please sign in to comment.