pyfastnet 2.0.2__tar.gz → 2.0.3__tar.gz

{pyfastnet-2.0.2/pyfastnet.egg-info → pyfastnet-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfastnet
-Version: 2.0.2
+Version: 2.0.3
 Summary: A Python library for decoding FastNet protocol data streams.
 Home-page: https://github.com/ghotihook/pyfastnet
 Author: Alex Salmon

{pyfastnet-2.0.2 → pyfastnet-2.0.3}/fastnet_decoder/decode_fastnet.py

@@ -33,11 +33,11 @@ def decode_frame(frame: bytes) -> dict:
         body_checksum   = frame[-1]
 
         if calculate_checksum(frame[:4]) != header_checksum:
-            logger.debug(f"FRAME discard  header-checksum  [{frame.hex()[:16]}...]")
+            logger.debug(f"FRAME discard  header-checksum  [{frame.hex()}]")
             return {"error": "Header checksum mismatch"}
 
         if calculate_checksum(body) != body_checksum:
-            logger.debug(f"FRAME discard  body-checksum  [{frame.hex()[:16]}...]")
+            logger.debug(f"FRAME discard  body-checksum  [{frame.hex()}]")
             return {"error": "Body checksum mismatch"}
 
         if len(body) < 2 or len(body) != body_size:
@@ -73,20 +73,22 @@ def decode_frame(frame: bytes) -> dict:
             data_bytes = body[index:index + data_length]
             index     += data_length
 
-            logger.debug(
-                f"  CH  0x{channel_id:02X} {channel_name}  "
-                f"fmt=0x{format_byte:02X}  data=[{data_bytes.hex()}]"
-            )
-
             decoded_value = decode_format_and_data(channel_id, format_byte, data_bytes)
             decoded_data["values"][channel_name] = decoded_value
 
             if decoded_value:
                 logger.debug(
-                    f"       value={decoded_value['value']}  "
+                    f"  CH  0x{channel_id:02X} {channel_name}  "
+                    f"fmt=0x{format_byte:02X}  data=[{data_bytes.hex()}]  "
+                    f"value={decoded_value['value']}  "
                     f"display='{decoded_value['display_text']}'  "
                     f"layout={decoded_value['layout']}"
                 )
+            else:
+                logger.debug(
+                    f"  CH  0x{channel_id:02X} {channel_name}  "
+                    f"fmt=0x{format_byte:02X}  data=[{data_bytes.hex()}]  (no decode)"
+                )
 
         return decoded_data
 

{pyfastnet-2.0.2 → pyfastnet-2.0.3}/fastnet_decoder/frame_buffer.py

@@ -52,15 +52,15 @@ class FrameBuffer:
             frame         = self.buffer[:full_frame_length]
             body          = self.buffer[5:full_frame_length - 1]
             body_checksum = self.buffer[full_frame_length - 1]
-            frame_hex     = bytes(frame[:8]).hex()
+            frame_hex     = bytes(frame).hex()
 
             if calculate_checksum(self.buffer[:4]) != header_checksum:
-                logger.debug(f"FRAME discard  header-checksum  [{frame_hex}...]")
+                logger.debug(f"FRAME discard  header-checksum  [{frame_hex}]")
                 self.buffer = self.buffer[1:]
                 continue
 
             if calculate_checksum(body) != body_checksum:
-                logger.debug(f"FRAME discard  body-checksum  [{frame_hex}...]")
+                logger.debug(f"FRAME discard  body-checksum  [{frame_hex}]")
                 self.buffer = self.buffer[1:]
                 continue
 
@@ -73,7 +73,7 @@ class FrameBuffer:
             logger.debug(
                 f"FRAME cmd={command_name}  "
                 f"0x{to_address:02X}←0x{from_address:02X}  "
-                f"body={body_size}B  [{frame_hex}...]"
+                f"body={body_size}B  [{frame_hex}]"
             )
             self.decode_and_queue_frame(frame, command_name)
 
@@ -88,11 +88,11 @@ class FrameBuffer:
                 names_str += f", +{len(channel_names) - 4} more"
             try:
                 self.frame_queue.put_nowait(decoded_frame)
-                logger.debug(f"QUEUE {len(channel_names)} channel(s)  [{names_str}]")
+                logger.debug(f"  QUEUE {len(channel_names)} channel(s)  [{names_str}]")
             except Full:
                 logger.warning("Frame queue full, dropping frame.")
         else:
-            logger.debug(f"QUEUE fail    decode error  [{frame.hex()[:16]}...]")
+            logger.debug(f"  QUEUE fail    decode error  [{frame.hex()}]")
 
     def get_buffer_size(self):
         return len(self.buffer)

{pyfastnet-2.0.2 → pyfastnet-2.0.3/pyfastnet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfastnet
-Version: 2.0.2
+Version: 2.0.3
 Summary: A Python library for decoding FastNet protocol data streams.
 Home-page: https://github.com/ghotihook/pyfastnet
 Author: Alex Salmon

{pyfastnet-2.0.2 → pyfastnet-2.0.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pyfastnet",
-    version="2.0.2",  # Ensure this matches your intended version
+    version="2.0.3",  # Ensure this matches your intended version
     author="Alex Salmon",
     author_email="alex@ivila.net",
     description="A Python library for decoding FastNet protocol data streams.",