Rename events, return DeviceInfo after connection

Author: yozik04

nextion/client.py

@@ -72,7 +72,7 @@ def __init__(
         self._sleeping = True
         self._deferred_sets = {}
 
-    async def _on_startup(self) -> None:
+    async def _on_ready(self) -> None:
         await self.command("bkcmd=3")  # Let's ensure we receive expected responses
 
     async def _on_wakeup(self) -> None:
@@ -100,7 +100,7 @@ def _handle_event(self, message) -> None:
                 EventType(typ),
                 TouchCoordinateDataPayload._make(struct.unpack("HHB", message[1:])),
             )
-        elif typ == EventType.TOUCH_IN_SLEEP:  # Touch event in sleep mode
+        elif typ == EventType.TOUCH_COORDINATE_IN_SLEEP:  # Touch event in sleep mode
             self._schedule_event_message_handler(
                 EventType(typ),
                 TouchCoordinateDataPayload._make(struct.unpack("HHB", message[1:])),
@@ -112,7 +112,7 @@ def _handle_event(self, message) -> None:
             asyncio.create_task(self._on_wakeup())
             self._schedule_event_message_handler(EventType(typ), None)
         elif typ == EventType.STARTUP:  # System successful start up
-            asyncio.create_task(self._on_startup())
+            asyncio.create_task(self._on_ready())
             self._schedule_event_message_handler(EventType(typ), None)
         elif typ == EventType.SD_CARD_UPGRADE:  # Start SD card upgrade
             self._schedule_event_message_handler(EventType(typ), None)
@@ -127,7 +127,7 @@ async def _call_event_handler(self, type_, data) -> None:
         if asyncio.iscoroutine(result):
             await result
 
-    async def connect(self) -> None:
+    async def connect(self) -> DeviceInfo:
         """Connect to the device"""
         try:
             await self._try_connect_on_different_baudrates()
@@ -150,6 +150,8 @@ async def connect(self) -> None:
             await self._update_sleep_status()
 
             logger.info("Successfully connected to the device")
+
+            return self.device_info
         except ConnectionFailed:
             logger.exception("Connection failed")
             raise

nextion/protocol/nextion.py

@@ -9,13 +9,16 @@
 
 
 class EventType(IntEnum):
+    STARTUP = 0x00  # Nextion startup
     TOUCH = 0x65  # Touch event
     TOUCH_COORDINATE = 0x67  # Touch coordinate
-    TOUCH_IN_SLEEP = 0x68  # Touch event in sleep mode
+    TOUCH_COORDINATE_IN_SLEEP = 0x68  # Touch event in sleep mode
     AUTO_SLEEP = 0x86  # Device automatically enters into sleep mode
     AUTO_WAKE = 0x87  # Device automatically wake up
-    STARTUP = 0x88  # System successful start up
+    READY = 0x88  # System successful start up
     SD_CARD_UPGRADE = 0x89  # Start SD card upgrade
+    TRANSPARENT_DATA_FINISHED = 0xFD  # Transparent data finished
+    TRANSPARENT_DATA_READY = 0xFE  # Transparent data ready
 
 
 class ResponseType(IntEnum):
@@ -50,7 +53,13 @@ def __init__(self, event_message_handler: typing.Callable):
         self.event_message_handler = event_message_handler
 
     def is_event(self, message):
-        return len(message) > 0 and message[0] in EventType.__members__.values()
+        if message == b"\x00\x00\x00":
+            return True
+        return (
+            len(message) > 0
+            and message[0] in EventType.__members__.values()
+            and message[0] != 0x00
+        )
 
     def data_received(self, data):
         self.buffer += data