Remove property declarations

Author: fucm

pystiebeleltron/pystiebeleltron.py

@@ -117,15 +117,7 @@
     0: 'EMERGENCY OPERATION'
 }
 
-B2_OPERATING_MODE_WRITE = {
-    'AUTOMATIC': 11,
-    'STANDBY': 1,
-    'DAY MODE': 3,
-    'SETBACK MODE': 4,
-    'DHW': 5,
-    'MANUAL MODE': 14,
-    'EMERGENCY OPERATION': 0
-}
+B2_OPERATING_MODE_WRITE = {value: key for key, value in B2_OPERATING_MODE_READ.items()}
 
 B2_RESET = {
     'OFF': 0,
@@ -274,19 +266,16 @@ def get_conv_val(self, name):
 
     # Handle room temperature & humidity
 
-    @property
     def get_current_temp(self):
         """Get the current room temperature."""
         if self._update_on_read:
             self.update()
         return self.get_conv_val('ACTUAL_ROOM_TEMPERATURE_HC1')
 
-    @property
     def get_target_temp(self):
         """Get the target room temperature."""
         if self._update_on_read:
             self.update()
-        # return self.get_conv_val('SET_ROOM_TEMPERATURE_HC1')
         return self.get_conv_val('ROOM_TEMP_HEAT_DAY_HC1')
 
     def set_target_temp(self, temp):
@@ -297,7 +286,6 @@ def set_target_temp(self, temp):
                 self._block_2_holding_regs['ROOM_TEMP_HEAT_DAY_HC1']['addr']),
             value=round(temp * 10.0))
 
-    @property
     def get_current_humidity(self):
         """Get the current room humidity."""
         if self._update_on_read:
@@ -306,7 +294,6 @@ def get_current_humidity(self):
 
     # Handle operation mode
 
-    @property
     def get_operation(self):
         """Return the current mode of operation."""
         if self._update_on_read:
@@ -324,23 +311,20 @@ def set_operation(self, mode):
 
     # Handle device status
 
-    @property
     def get_heating_status(self):
         """Return heater status."""
         if self._update_on_read:
             self.update()
         return bool(self.get_conv_val('OPERATING_STATUS') &
                     B3_OPERATING_STATUS['HEATING'])
 
-    @property
     def get_cooling_status(self):
         """Cooling status."""
         if self._update_on_read:
             self.update()
         return bool(self.get_conv_val('OPERATING_STATUS') &
                     B3_OPERATING_STATUS['COOLING'])
 
-    @property
     def get_filter_alarm_status(self):
         """Return filter alarm."""
         if self._update_on_read:

setup.py

@@ -18,7 +18,7 @@
     sys.exit()
 
 if sys.argv[-1] == 'publish':
-    os.system('python3 setup.py sdist upload')
+    os.system('twine upload dist/*')
     sys.exit()
 
 
@@ -37,7 +37,7 @@ def run_tests(self):
 
 setup(
     name='pystiebeleltron',
-    version='0.0.1.dev1',
+    version='0.0.1.dev2',
     description='Python API for interacting with the Stiebel Eltron ISG web gateway via Modbus for controlling integral ventilation units and heat pumps.',
     long_description=long_description,
     long_description_content_type='text/markdown',

test/test_pystiebeleltron.py

@@ -25,7 +25,7 @@ def pyse_api(self, request):
 
         mb_s = ModbusServer()
         mb_c = ModbusClient(host=host_ip, port=host_port, timeout=2)
-        api = pyse.StiebelEltronAPI(mb_c, slave)
+        api = pyse.StiebelEltronAPI(mb_c, slave, update_on_read=False)
 
         # Cleanup after last test did run (will run as well, if something fails in setup).
         def fin():
@@ -58,24 +58,24 @@ def fin():
         return api
 
     def test_temperature_read(self, pyse_api):
-        temp = pyse_api.get_current_temp
+        temp = pyse_api.get_current_temp()
         assert temp >= 20.0 and temp < 25.0
 
-        temp = pyse_api.get_target_temp
+        temp = pyse_api.get_target_temp()
         assert temp >= 20.0 and temp < 25.0
 
     #@pytest.mark.skip
     def test_temperature_write(self, pyse_api):
         # Get old target temperature
-        old_temp = pyse_api.get_target_temp
+        old_temp = pyse_api.get_target_temp()
         new_temp = 22.5
 
         # Set new target temperature
         pyse_api.set_target_temp(new_temp)
         time.sleep(3)
         pyse_api.update()
 
-        mod_temp = pyse_api.get_target_temp
+        mod_temp = pyse_api.get_target_temp()
         assert mod_temp == new_temp
 
         # Restore old target temperature
@@ -84,6 +84,12 @@ def test_temperature_write(self, pyse_api):
             time.sleep(3)
             pyse_api.update()
 
+    def test_operation(self, pyse_api):
+        pyse_api.set_operation('DHW')
+        time.sleep(3)
+        pyse_api.update()
+        oper = pyse_api.get_operation()
+        assert oper == 'DHW'
 
     @pytest.mark.skip
     def test_fail(self):