TISControlProtocol 1.0.68__tar.gz → 1.0.70__tar.gz

{tiscontrolprotocol-1.0.68 → tiscontrolprotocol-1.0.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TISControlProtocol
-Version: 1.0.68
+Version: 1.0.70
 Summary: A library for TIS Control Protocol
 Project-URL: Homepage, https://github.com/TISControlHass
 Project-URL: Issues, https://github.com/TISControlHass/issues

{tiscontrolprotocol-1.0.68 → tiscontrolprotocol-1.0.70}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "TISControlProtocol"
-version = "1.0.68"
+version = "1.0.70"
 description = "A library for TIS Control Protocol"
 readme = "README.md"
 requires-python = ">=3.11"

{tiscontrolprotocol-1.0.68 → tiscontrolprotocol-1.0.70}/src/TISControlProtocol/api.py

@@ -19,6 +19,7 @@ from TISControlProtocol.shared import get_real_mac
 from .apis import (
     BillConfigEndpoint,
     ChangeSecurityPassEndpoint,
+    ToggleConnectionEndpoint,
     GetBillConfigEndpoint,
     GetKeyEndpoint,
     PasswordsEndpoint,
@@ -47,8 +48,10 @@ class TISApi:
         """Initialize the API class."""
         self.host = host
         self.port = port
+        self.loop = None
         self.protocol = None
         self.transport = None
+        self.sock = None
         self.hass = hass
         self.config_entries = {}
         self.bill_configs = {}
@@ -60,20 +63,35 @@ class TISApi:
         self.cms_url = "https://cms-tis.com"
         self._cms_task_unsub = None
 
+    async def setup(self):
+        """Setup the TIS API."""
+        try:
+            await self.connect()
+            await self._initialize_hass_data()
+            await self._register_http_views()
+            self.hass.async_add_executor_job(self.run_display)
+        except Exception as e:
+            logging.error("Error during setup: %s", e)
+
     async def connect(self):
         """Connect to the TIS API."""
         self.loop = self.hass.loop
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+
         try:
             await self._setup_udp_protocol()
-            await self._initialize_hass_data()
-            await self._register_http_views()
-            self.hass.async_add_executor_job(self.run_display)
-            # self._register_services()
-            # self._schedule_cms_data_task()
-        except Exception as e:
-            logging.error("Error during connection setup: %s", e)
-            raise ConnectionError
+        except Exception:
+            self.sock.close()
+            raise
+
+    async def disconnect(self):
+        """Disconnect from the TIS API."""
+        if self.transport:
+            self.transport.close()
+            self.transport = None
+        if hasattr(self, "sock") and self.sock:
+            self.sock.close()
+            self.sock = None
 
     async def _setup_udp_protocol(self):
         """Setup the UDP protocol."""
@@ -107,6 +125,7 @@ class TISApi:
             self.hass.http.register_view(BillConfigEndpoint(self))
             self.hass.http.register_view(GetBillConfigEndpoint(self))
             self.hass.http.register_view(PasswordsEndpoint(self))
+            self.hass.http.register_view(ToggleConnectionEndpoint(self))
         except Exception as e:
             logging.error("Error registering views %s", e)
             raise ConnectionError
@@ -209,7 +228,7 @@ class TISApi:
 
         if self.display is None:
             self.display = TISDisplay(self.display_logo, self.version)
-            
+
         self.display.run_display()
 
     async def parse_device_manager_request(self, data: dict) -> None:

{tiscontrolprotocol-1.0.68 → tiscontrolprotocol-1.0.70}/src/TISControlProtocol/apis/__init__.py

@@ -16,6 +16,7 @@ from .password_form_endpoint import PasswordFormEndpoint
 from .submit_password import SubmitPasswordEndpoint
 from .password_dashboard import PasswordDashboardEndpoint
 from .passwords_endpoint import PasswordsEndpoint
+from .toggle_connection_endpoint import ToggleConnectionEndpoint
 
 
 __all__ = [
@@ -29,6 +30,7 @@ __all__ = [
     "GetBillConfigEndpoint",
     "SubmitPasswordEndpoint",
     "PasswordsEndpoint",
+    "ToggleConnectionEndpoint",
 ]
 
 

tiscontrolprotocol-1.0.70/src/TISControlProtocol/apis/toggle_connection_endpoint.py

@@ -0,0 +1,52 @@
+from homeassistant.components.http import HomeAssistantView
+from aiohttp import web
+from TISControlProtocol.shared import get_real_mac
+import logging
+
+
+class ToggleConnectionEndpoint(HomeAssistantView):
+    """Connect or Disconnect the TIS API"""
+
+    url = "/api/toggle-connection"
+    name = "api:toggle-connection"
+    requires_auth = False
+
+    def __init__(self, tis_api):
+        self.tis_api = tis_api
+
+    async def post(self, request):
+        mac_address = request.query.get("mac_address")
+
+        if mac_address is None:
+            logging.info("Required parameters not found in query, parsing request body")
+            try:
+                data = await request.json()
+                mac_address = data.get("mac_address")
+            except Exception:
+                pass
+
+        mac = await get_real_mac("end0")
+
+        if mac_address is None:
+            return web.json_response(
+                {"error": "required parameters are missing"}, status=400
+            )
+        elif mac_address != mac:
+            return web.json_response({"error": "Unauthorized"}, status=403)
+
+        if self.tis_api.transport:
+            logging.info("Disconnecting from TIS API")
+            try:
+                await self.tis_api.disconnect()
+                return web.json_response({"message": "Disconnected"}, status=200)
+            except Exception as e:
+                logging.error(f"Error disconnecting: {e}")
+                return web.json_response({"error": "Failed to disconnect"}, status=500)
+        else:
+            logging.info("Connecting to TIS API")
+            try:
+                await self.tis_api.connect()
+                return web.json_response({"message": "Connected"}, status=200)
+            except Exception as e:
+                logging.error(f"Error connecting: {e}")
+                return web.json_response({"error": "Failed to connect"}, status=500)

{tiscontrolprotocol-1.0.68 → tiscontrolprotocol-1.0.70}/src/TISControlProtocol/display.py

@@ -17,6 +17,7 @@ except (ImportError, RuntimeError) as e:
         "Failed to load display dependencies. Display will be disabled. Error: %s", e
     )
 
+
 class TISDisplay:
     def __init__(self, display_logo: str, version: str):
         self.display_logo = display_logo
@@ -39,11 +40,11 @@ class TISDisplay:
             logging.error(f"Error setting pin {pin} to {value}: {e}")
 
     def send_command(self, cmd):
-        self._set_pin(23, 0) # Command mode (0)
+        self._set_pin(23, 0)  # Command mode (0)
         os.write(self.spi_fd, bytes([cmd]))
 
     def send_data(self, data):
-        self._set_pin(23, 1) # Data mode (1)
+        self._set_pin(23, 1)  # Data mode (1)
         if isinstance(data, int):
             os.write(self.spi_fd, bytes([data]))
         else:
@@ -59,30 +60,30 @@ class TISDisplay:
         time.sleep(0.1)
 
         # ST7789 Initialization Sequence
-        self.send_command(0x01) # SWRESET
+        self.send_command(0x01)  # SWRESET
         time.sleep(0.15)
-        self.send_command(0x11) # Sleep out
+        self.send_command(0x11)  # Sleep out
         time.sleep(0.15)
 
-        self.send_command(0x3A) # Color mode 16-bit
-        self.send_data(0x55) # 0x55 for RGB565
+        self.send_command(0x3A)  # Color mode 16-bit
+        self.send_data(0x55)  # 0x55 for RGB565
 
-        self.send_command(0x36) # Memory Access Control (MADCTL)
-        self.send_data(0x00) # Normal rotation
+        self.send_command(0x36)  # Memory Access Control (MADCTL)
+        self.send_data(0x00)  # Normal rotation
 
-        self.send_command(0x21) # INVON
-        self.send_command(0x13) # NORON
+        self.send_command(0x21)  # INVON
+        self.send_command(0x13)  # NORON
         time.sleep(0.01)
-        self.send_command(0x29) # Display on
+        self.send_command(0x29)  # Display on
         time.sleep(0.1)
 
     def set_window(self, x1, y1, x2, y2):
-        self.send_command(0x2A) # Column Address Set
+        self.send_command(0x2A)  # Column Address Set
         self.send_data(bytearray([x1 >> 8, x1 & 0xFF, x2 >> 8, x2 & 0xFF]))
 
-        self.send_command(0x2B) # Row Address Set
+        self.send_command(0x2B)  # Row Address Set
         self.send_data(bytearray([y1 >> 8, y1 & 0xFF, y2 >> 8, y2 & 0xFF]))
-        self.send_command(0x2C) # RAMWR
+        self.send_command(0x2C)  # RAMWR
 
     def set_display_image(self):
         if self.display_logo:
@@ -94,27 +95,43 @@ class TISDisplay:
                 font = ImageFont.load_default(size=28)
             except TypeError:
                 font = ImageFont.load_default()
-            
+
             x, y = 78, 235
             draw.text((x, y), version_text, font=font, fill=(255, 255, 255))
-            img = img.rotate(-90, expand=True)
+            img = img.rotate(180, expand=True)
 
             if img.size != (240, 320):
                 img = img.resize((240, 320))
 
             r, g, b = img.split()
-            r_data = list(r.getdata()) if not hasattr(r, "get_flattened_data") else r.get_flattened_data()
-            g_data = list(g.getdata()) if not hasattr(g, "get_flattened_data") else g.get_flattened_data()
-            b_data = list(b.getdata()) if not hasattr(b, "get_flattened_data") else b.get_flattened_data()
+            r_data = (
+                list(r.getdata())
+                if not hasattr(r, "get_flattened_data")
+                else r.get_flattened_data()
+            )
+            g_data = (
+                list(g.getdata())
+                if not hasattr(g, "get_flattened_data")
+                else g.get_flattened_data()
+            )
+            b_data = (
+                list(b.getdata())
+                if not hasattr(b, "get_flattened_data")
+                else b.get_flattened_data()
+            )
 
             rgb565 = bytearray(img.width * img.height * 2)
             for i in range(len(r_data)):
-                pixel = (((r_data[i] & 0xF8) << 8) | ((g_data[i] & 0xFC) << 3) | (b_data[i] >> 3))
+                pixel = (
+                    ((r_data[i] & 0xF8) << 8)
+                    | ((g_data[i] & 0xFC) << 3)
+                    | (b_data[i] >> 3)
+                )
                 rgb565[i * 2] = pixel >> 8
                 rgb565[i * 2 + 1] = pixel & 0xFF
 
             self.set_window(0, 0, img.width - 1, img.height - 1)
-            self._set_pin(23, 1) # Data mode
+            self._set_pin(23, 1)  # Data mode
 
             mv = memoryview(rgb565)
             chunk_size = 4096
@@ -129,7 +146,9 @@ class TISDisplay:
                 SPI_IOC_WR_MODE = 0x40016B01
                 SPI_IOC_WR_MAX_SPEED_HZ = 0x40046B04
                 fcntl.ioctl(self.spi_fd, SPI_IOC_WR_MODE, struct.pack("B", 0))
-                fcntl.ioctl(self.spi_fd, SPI_IOC_WR_MAX_SPEED_HZ, struct.pack("I", 10000000))
+                fcntl.ioctl(
+                    self.spi_fd, SPI_IOC_WR_MAX_SPEED_HZ, struct.pack("I", 10000000)
+                )
 
                 # Initialize GPIOs via gpiod dynamically
                 self.chip_path = None
@@ -151,12 +170,20 @@ class TISDisplay:
                 self.req_dc = gpiod.request_lines(
                     self.chip_path,
                     consumer="display_dc",
-                    config={23: gpiod.LineSettings(direction=Direction.OUTPUT, output_value=Value.INACTIVE)}
+                    config={
+                        23: gpiod.LineSettings(
+                            direction=Direction.OUTPUT, output_value=Value.INACTIVE
+                        )
+                    },
                 )
                 self.req_rst = gpiod.request_lines(
                     self.chip_path,
                     consumer="display_rst",
-                    config={25: gpiod.LineSettings(direction=Direction.OUTPUT, output_value=Value.INACTIVE)}
+                    config={
+                        25: gpiod.LineSettings(
+                            direction=Direction.OUTPUT, output_value=Value.INACTIVE
+                        )
+                    },
                 )
 
                 try: