Merge branch 'master' into dhwMode

.github/workflows/format.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: 🚀 Sort test response data
         run: |
           find './tests/response' \

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: 🏗 Set up Poetry
         run: pipx install poetry
       - name: 🏗 Set up Python ${{ env.DEFAULT_PYTHON }}
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: 🏗 Set up Poetry
         run: pipx install poetry
       - name: 🏗 Set up Python ${{ env.DEFAULT_PYTHON }}
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: 🏗 Set up Poetry
         run: pipx install poetry
       - name: 🏗 Set up Python ${{ env.DEFAULT_PYTHON }}

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       id-token: write
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: 🏗 Set up Poetry
         run: pipx install poetry
       - name: 🏗 Set up Python ${{ env.DEFAULT_PYTHON }}

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
         python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: 🏗 Set up Poetry
         run: pipx install poetry
       - name: 🏗 Set up Python ${{ matrix.python }}
@@ -39,7 +39,7 @@ jobs:
       - name: 🚀 Run pytest
         run: poetry run pytest --cov PyViCare
       - name: ⬆️ Upload coverage artifact
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           name: coverage-${{ matrix.python }}
           path: .coverage

.github/workflows/type.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: 🏗 Set up Poetry
         run: pipx install poetry
       - name: 🏗 Set up Python ${{ env.DEFAULT_PYTHON }}

PyViCare/PyViCareDevice.py

@@ -15,3 +15,9 @@ def __init__(self, service: ViCareService) -> None:
     @handleNotSupported
     def getSerial(self):
         return self.service.getProperty("device.serial")["properties"]["value"]["value"]
+
+    def isLegacyDevice(self) -> bool:
+        return self.service.hasRoles(["type:legacy"])
+
+    def isE3Device(self) -> bool:
+        return self.service.hasRoles(["type:E3"])

tests/test_PyViCareDeviceConfig.py

@@ -62,7 +62,6 @@ def test_autoDetect_RoleVentilation_asVentilation(self):
         self.assertEqual("VentilationDevice", type(device_type).__name__)
 
     def test_autoDetect_Vitoair_FS_300E_asVentilation(self):
-        # self.service.hasRoles = has_roles(["type:ventilation"])
         c = PyViCareDeviceConfig(self.service, "0", "E3_ViAir_300F", "Online")
         device_type = c.asAutoDetectDevice()
         self.assertEqual("VentilationDevice", type(device_type).__name__)
@@ -121,3 +120,17 @@ def test_autoDetect_RoleGateway_asGateway_TCU300(self):
         c = PyViCareDeviceConfig(self.service, "0", "Unknown", "Online")
         device_type = c.asAutoDetectDevice()
         self.assertEqual("Gateway", type(device_type).__name__)
+
+    def test_legacy_device(self):
+        self.service.hasRoles = has_roles(["type:legacy"])
+        c = PyViCareDeviceConfig(self.service, "0", "Unknown", "Online")
+        device = c.asAutoDetectDevice()
+        self.assertEqual(device.isLegacyDevice(), True)
+        self.assertEqual(device.isE3Device(), False)
+
+    def test_e3_device(self):
+        self.service.hasRoles = has_roles(["type:E3"])
+        c = PyViCareDeviceConfig(self.service, "0", "Unknown", "Online")
+        device = c.asAutoDetectDevice()
+        self.assertEqual(device.isLegacyDevice(), False)
+        self.assertEqual(device.isE3Device(), True)