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

Fix set temperature and set zone mode for BSB devices #168

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Fix set temperature and set zone mode for BSB devices #168

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
26 changes: 18 additions & 8 deletions ariston/ariston_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,13 @@ def set_bsb_mode(self, gw_id: str, value: BsbOperativeMode) -> None:
},
)

def set_bsb_zone_mode(self, gw_id: str, zone: int, value: BsbZoneMode) -> None:
def set_bsb_zone_mode(self, gw_id: str, zone: int, value: BsbZoneMode, old_value: BsbZoneMode, is_cooling: bool) -> None:
"""Set Bsb zone mode"""
self._post(
f"{self.__api_url}{ARISTON_REMOTE}/{ARISTON_BSB_ZONES}/{gw_id}/{zone}/mode",
f"{self.__api_url}{ARISTON_REMOTE}/{ARISTON_BSB_ZONES}/{gw_id}/{zone}/mode?isCooling={is_cooling}",
{
"new": value.value,
"old": old_value.value
},
)

Expand Down Expand Up @@ -349,15 +350,19 @@ def set_bsb_temperature(self, gw_id: str, comfort: float, reduced: float, old_co
)

def set_bsb_zone_temperature(
self, gw_id: str, zone: int, comfort: float, reduced: float
self, gw_id: str, zone: int, comfort: float, reduced: float, old_comfort: Optional[float], old_reduced: Optional[float], is_cooling: bool
) -> None:
"""Set Bsb zone temperature"""
self._post(
f"{self.__api_url}{ARISTON_REMOTE}/{ARISTON_BSB_ZONES}/{gw_id}/{zone}/temperatures",
f"{self.__api_url}{ARISTON_REMOTE}/{ARISTON_BSB_ZONES}/{gw_id}/{zone}/temperatures?isCooling={is_cooling}",
{
"new": {
"comf": comfort,
"econ": reduced,
},
"old": {
"comf": old_comfort,
"econ": old_reduced,
}
},
)
Expand Down Expand Up @@ -717,13 +722,14 @@ async def async_set_bsb_mode(self, gw_id: str, value: BsbOperativeMode) -> None:
)

async def async_set_bsb_zone_mode(
self, gw_id: str, zone: int, value: BsbZoneMode
self, gw_id: str, zone: int, value: BsbZoneMode, old_value: BsbZoneMode, is_cooling: bool
) -> None:
"""Async set Bsb zone mode"""
await self._async_post(
f"{self.__api_url}{ARISTON_REMOTE}/{ARISTON_BSB_ZONES}/{gw_id}/{zone}/mode",
f"{self.__api_url}{ARISTON_REMOTE}/{ARISTON_BSB_ZONES}/{gw_id}/{zone}/mode?isCooling={is_cooling}",
{
"new": value.value,
"old": old_value.value
},
)

Expand Down Expand Up @@ -782,15 +788,19 @@ async def async_set_bsb_temperature(
)

async def async_set_bsb_zone_temperature(
self, gw_id: str, zone: int, comfort: float, reduced: float
self, gw_id: str, zone: int, comfort: float, reduced: float, old_comfort: Optional[float], old_reduced: Optional[float], is_cooling: bool
) -> None:
"""Async set Bsb zone temperature"""
await self._async_post(
f"{self.__api_url}{ARISTON_REMOTE}/{ARISTON_BSB_ZONES}/{gw_id}/{zone}/temperatures",
f"{self.__api_url}{ARISTON_REMOTE}/{ARISTON_BSB_ZONES}/{gw_id}/{zone}/temperatures?isCooling={is_cooling}",
{
"new": {
"comf": comfort,
"econ": reduced,
},
"old": {
"comf": old_comfort,
"econ": old_reduced,
}
},
)
Expand Down
14 changes: 8 additions & 6 deletions ariston/bsb_device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,13 @@ async def _async_set_water_heater_temperature(

def set_zone_mode(self, zone_mode: BsbZoneMode, zone: int):
"""Set zone mode"""
self.api.set_bsb_zone_mode(self.gw, zone, zone_mode)
self.api.set_bsb_zone_mode(self.gw, zone, zone_mode, self.get_zone_mode(zone), self.is_plant_in_cool_mode)
self.get_zone(zone)[BsbZoneProperties.MODE][PropertyType.VALUE] = zone_mode

async def async_set_zone_mode(self, zone_mode: BsbZoneMode, zone: int):
"""Async set zone mode"""
await self.api.async_set_bsb_zone_mode(self.gw, zone, zone_mode)
await self.api.async_set_bsb_zone_mode(self.gw, zone, zone_mode, self.get_zone_mode(zone), self.is_plant_in_cool_mode)
self.get_zone(zone)[BsbZoneProperties.MODE][PropertyType.VALUE] = zone_mode

@property
def outside_temp_value(self) -> str:
Expand All @@ -360,29 +362,29 @@ def set_comfort_temp(self, temp: float, zone: int):
if len(self.data) == 0:
self.update_state()
reduced = self.get_reduced_temp_value(zone)
self.api.set_bsb_zone_temperature(self.gw, zone, temp, reduced)
self.api.set_bsb_zone_temperature(self.gw, zone, temp, reduced, self.get_comfort_temp_value(zone), self.get_reduced_temp_value(zone), self.is_plant_in_cool_mode)
self.get_zone_ch_comf_temp(zone)[PropertyType.VALUE] = temp

async def async_set_comfort_temp(self, temp: float, zone: int):
"""Async set central heating comfort temp"""
if len(self.data) == 0:
await self.async_update_state()
reduced = self.get_reduced_temp_value(zone)
await self.api.async_set_bsb_zone_temperature(self.gw, zone, temp, reduced)
await self.api.async_set_bsb_zone_temperature(self.gw, zone, temp, reduced, self.get_comfort_temp_value(zone), self.get_reduced_temp_value(zone), self.is_plant_in_cool_mode)
self.get_zone_ch_comf_temp(zone)[PropertyType.VALUE] = temp

def set_reduced_temp(self, temp: float, zone: int):
"""Set central heating reduced temp"""
if len(self.data) == 0:
self.update_state()
comfort = self.get_comfort_temp_value(zone)
self.api.set_bsb_zone_temperature(self.gw, zone, comfort, temp)
self.api.set_bsb_zone_temperature(self.gw, zone, comfort, temp, self.get_comfort_temp_value(zone), self.get_reduced_temp_value(zone), self.is_plant_in_cool_mode)
self.get_zone_ch_red_temp(zone)[PropertyType.VALUE] = temp

async def async_set_reduced_temp(self, temp: float, zone: int):
"""Async set central heating reduced temp"""
if len(self.data) == 0:
await self.async_update_state()
comfort = self.get_comfort_temp_value(zone)
await self.api.async_set_bsb_zone_temperature(self.gw, zone, comfort, temp)
await self.api.async_set_bsb_zone_temperature(self.gw, zone, comfort, temp, self.get_comfort_temp_value(zone), self.get_reduced_temp_value(zone), self.is_plant_in_cool_mode)
self.get_zone_ch_red_temp(zone)[PropertyType.VALUE] = temp
Loading