refactor: rename internal property target_temp to heater_temp

We use heater_temp outside, so it is comfortable to use same name for internal property.

Author: IATkachenko

tests/lite.py

@@ -23,13 +23,13 @@
 
 _LOGGER.debug("Result is %s " % result)
 
-_LOGGER.info("Initial state: device is %s, light is %s, sound is %s, heater is %s, fan_speed is %d, target_temp is %d",
+_LOGGER.info("Initial state: device is %s, light is %s, sound is %s, heater is %s, fan_speed is %d, heater_temp is %d",
               device.state,
               device.light,
               device.sound,
               device.heater,
               device.fan_speed,
-              device.target_temp
+              device.heater_temp
               )
 
 

tests/s4.py

@@ -15,7 +15,7 @@ def read_state(tion: S4):
                  tion.sound,
                  tion.heater,
                  tion.fan_speed,
-                 tion.target_temp)
+                 tion.heater_temp)
 
 
 def pause(interval: int = 10):

tests/unit/tion.py

@@ -25,11 +25,11 @@ def test___detect_heating_state(self):
             ["off", 15, 21, 20, "off"],
         ]
 
-        for expect, in_temp, out_temp, target_temp, heater in _variants:
+        for expect, in_temp, out_temp, heater_temp, heater in _variants:
             with self.subTest(expect=expect,
-                              in_temp=in_temp, out_temp=out_temp, target_temp=target_temp, heater=heater):
+                              in_temp=in_temp, out_temp=out_temp, heater_temp=heater_temp, heater=heater):
                 # call private __detect_heating_state from tion class
-                self._tion._tion__detect_heating_state(in_temp, out_temp, target_temp, heater)
+                self._tion._tion__detect_heating_state(in_temp, out_temp, heater_temp, heater)
                 self.assertEqual(self._tion.heating, expect)
 
 

tion_btle/lite.py

@@ -78,7 +78,7 @@ def _decode_response(self, response: bytearray):
             self._have_heater = response[0] >> 7 & 1
 
             self._mode = response[2]
-            self._target_temp = response[3]
+            self._heater_temp = response[3]
             self._fan_speed = response[4]
             self._in_temp = self.decode_temperature(response[5])
             self._out_temp = self.decode_temperature(response[6])
@@ -122,7 +122,7 @@ def encode_state():
             return result
 
         sb = 0x00  # ??
-        tb = 0x02 if (self.target_temp > 0 or self.fan_speed > 0) else 0x01
+        tb = 0x02 if (self.heater_temp > 0 or self.fan_speed > 0) else 0x01
         lb = [0x60, 0x00] if sb == 0 else [0x00, 0x00]
 
         return bytearray(

tion_btle/s3.py

@@ -97,7 +97,7 @@ def _decode_response(self, response: bytearray):
             self._mode = int(list("{:02x}".format(response[2]))[0])
             self._heater = response[4] & 1
             self._state = response[4] >> 1 & 1
-            self._target_temp = response[3]
+            self._heater_temp = response[3]
             self._sound = response[4] >> 3 & 1
             self._out_temp = self.decode_temperature(response[7])
             self._in_temp = self.decode_temperature(response[8])

tion_btle/s4.py

@@ -37,7 +37,7 @@ def _decode_response(self, response: bytearray):
         _LOGGER.debug("Data is %s", bytes(response).hex())
         try:
             self._mode = response[2]
-            self._target_temp = response[3]
+            self._heater_temp = response[3]
             self._fan_speed = response[4]
             self._in_temp = self.decode_temperature(response[5])
             self._out_temp = self.decode_temperature(response[6])

tion_btle/tion.py

@@ -108,7 +108,7 @@ def __init__(self, mac: str):
         # states
         self._in_temp: int = 0
         self._out_temp: int = 0
-        self._target_temp: int = 0
+        self._heater_temp: int = 0
         self._fan_speed: int = 0
         self._mode: int = 0
         self._state: bool = False
@@ -184,7 +184,7 @@ def __generate_common_json(self) -> dict:
             "mode": self.mode,
             "out_temp": self.out_temp,
             "in_temp": self.in_temp,
-            "heater_temp": self.target_temp,
+            "heater_temp": self._heater_temp,
             "fan_speed": self.fan_speed,
             "filter_remain": self.filter_remain,
             "time": strftime("%H:%M", localtime()),
@@ -195,29 +195,29 @@ def __generate_common_json(self) -> dict:
     def __detect_heating_state(self,
                                in_temp: int = None,
                                out_temp: int = None,
-                               target_temp: int = None,
+                               heater_temp: int = None,
                                heater: str = None) -> None:
         """
         Tries to guess is heater working right now
         :param in_temp: air intake temperature
         :param out_temp: ait outtake temperature
-        :param target_temp: target temperature for heater
+        :param heater_temp: target temperature for heater
         :param heater: heater state
         :return: None
         """
         if in_temp is None:
             in_temp = self.in_temp
         if out_temp is None:
             out_temp = self.out_temp
-        if target_temp is None:
-            target_temp = self.target_temp
+        if heater_temp is None:
+            heater_temp = self.heater_temp
         if heater is None:
             heater = self.heater
 
         if heater == "off":
             self.heating = "off"
         else:
-            if target_temp - in_temp > 3 and out_temp > in_temp:
+            if heater_temp - in_temp > 3 and out_temp > in_temp:
                 self.heating = "on"
             else:
                 self.heating = "off"
@@ -266,7 +266,7 @@ def _set_internal_state_from_request(self, request: dict) -> None:
         :param request: changed breezer parameter from set request
         :return: None
         """
-        for p in ['fan_speed', 'target_temp', 'heater', 'sound', 'mode', 'state']:
+        for p in ['fan_speed', 'heater_temp', 'heater', 'sound', 'mode', 'state']:
             # ToDo: lite have additional parameters to set: "light" and "co2_auto_control", so we should get this
             #  list from class
             try:
@@ -459,13 +459,21 @@ def heater(self) -> str:
     def heater(self, new_state: str):
         self._heater = self._encode_state(new_state)
 
+    @property
+    def heater_temp(self) -> int:
+        return self._heater_temp
+
+    @heater_temp.setter
+    def heater_temp(self, new_temp: int):
+        self._heater_temp = new_temp
+
     @property
     def target_temp(self) -> int:
-        return self._target_temp
+        return self.heater_temp
 
     @target_temp.setter
     def target_temp(self, new_temp: int):
-        self._target_temp = new_temp
+        self.heater_temp = new_temp
 
     @property
     def in_temp(self):