pyfastnet 2.0.16__tar.gz → 2.0.17__tar.gz

{pyfastnet-2.0.16/pyfastnet.egg-info → pyfastnet-2.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfastnet
-Version: 2.0.16
+Version: 2.0.17
 Summary: A Python library for decoding FastNet protocol data streams.
 Author-email: Alex Salmon <alex@ivila.net>
 License: MIT License

{pyfastnet-2.0.16 → pyfastnet-2.0.17}/fastnet_decoder/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.0.16"
+__version__ = "2.0.17"
 
 from .frame_buffer import FrameBuffer
 from .decode_fastnet import decode_frame, decode_ascii_frame

{pyfastnet-2.0.16 → pyfastnet-2.0.17}/fastnet_decoder/decode_fastnet.py

@@ -1,4 +1,5 @@
 import datetime
+import logging
 from .mappings import ADDRESS_LOOKUP, COMMAND_LOOKUP, CHANNEL_LOOKUP, FORMAT_SIZE_MAP
 from .mappings import SEGMENT_A, SEGMENT_B, AUTOPILOT_MODES
 from .logger import logger
@@ -109,6 +110,81 @@ def decode_frame(frame: bytes) -> dict:
         return {"error": "Decoding failure"}
 
 
+def probe_frame(frame: bytes) -> None:
+    """
+    Speculatively unpack a non-broadcast frame using the same channel-record
+    assembly as Broadcast frames, for reverse-engineering only.
+
+    The body layout of non-broadcast commands (pilot messages, NMEA-sourced
+    data, etc.) is NOT known to match the Broadcast channel-record format, so
+    everything decoded here is a guess: results are logged at DEBUG and are
+    never queued or assigned to channels. The point is to eyeball whether the
+    same (channel_id, format_byte, data...) structure holds for these frames.
+    """
+    if not logger.isEnabledFor(logging.DEBUG):
+        return
+    try:
+        to_address   = frame[0]
+        from_address = frame[1]
+        command      = frame[3]
+        body         = frame[5:-1]
+
+        to_name   = ADDRESS_LOOKUP.get(to_address,   f"Unknown (0x{to_address:02X})")
+        from_name = ADDRESS_LOOKUP.get(from_address, f"Unknown (0x{from_address:02X})")
+        cmd_name  = COMMAND_LOOKUP.get(command,      f"Unknown (0x{command:02X})")
+
+        logger.debug(
+            f"  PROBE cmd={cmd_name}  {to_name}←{from_name}  body=[{body.hex()}]"
+        )
+
+        index = 0
+        while index < len(body):
+            if index + 1 >= len(body):
+                logger.debug(f"    PROBE trailing byte  [{body[index:].hex()}]")
+                break
+
+            channel_id   = body[index]
+            format_byte  = body[index + 1]
+            channel_name = CHANNEL_LOOKUP.get(channel_id, f"Unknown (0x{channel_id:02X})")
+            index += 2
+
+            data_length = FORMAT_SIZE_MAP.get(format_byte & 0x0F, 0)
+            if data_length == 0:
+                logger.debug(
+                    f"    PROBE 0x{channel_id:02X} {channel_name}  "
+                    f"fmt=0x{format_byte:02X}  unknown format, stop  "
+                    f"remaining=[{body[index:].hex()}]"
+                )
+                break
+            if index + data_length > len(body):
+                logger.debug(
+                    f"    PROBE 0x{channel_id:02X} {channel_name}  "
+                    f"fmt=0x{format_byte:02X}  incomplete  need={data_length}B  "
+                    f"have={len(body) - index}B  remaining=[{body[index:].hex()}]"
+                )
+                break
+
+            data_bytes = body[index:index + data_length]
+            index     += data_length
+
+            decoded = decode_format_and_data(channel_id, format_byte, data_bytes)
+            if decoded:
+                logger.debug(
+                    f"    PROBE 0x{channel_id:02X} {channel_name}  "
+                    f"fmt=0x{format_byte:02X}  data=[{data_bytes.hex()}]  "
+                    f"value={decoded['value']}  display='{decoded['display_text']}'  "
+                    f"layout={decoded['layout']}"
+                )
+            else:
+                logger.debug(
+                    f"    PROBE 0x{channel_id:02X} {channel_name}  "
+                    f"fmt=0x{format_byte:02X}  data=[{data_bytes.hex()}]  (no decode)"
+                )
+
+    except Exception as e:
+        logger.debug(f"  PROBE error: {e}  [{frame.hex()}]")
+
+
 def decode_ascii_frame(frame: bytes) -> dict:
     try:
         to_address   = frame[0]

{pyfastnet-2.0.16 → pyfastnet-2.0.17}/fastnet_decoder/frame_buffer.py

@@ -1,7 +1,7 @@
 import logging
 from .utils import calculate_checksum
 from .mappings import COMMAND_LOOKUP, IGNORED_COMMANDS
-from .decode_fastnet import decode_frame, decode_ascii_frame
+from .decode_fastnet import decode_frame, decode_ascii_frame, probe_frame
 from .logger import logger
 from queue import Queue, Full
 
@@ -84,9 +84,22 @@ class FrameBuffer:
             self.decode_and_queue_frame(frame, command_name)
 
     def decode_and_queue_frame(self, frame, command_name):
-        """Decode a frame and add it to the queue if valid."""
-        decoder = decode_ascii_frame if command_name == "LatLon" else decode_frame
-        decoded_frame = decoder(frame)
+        """
+        Decode a frame and add it to the queue if valid.
+
+        Only Broadcast frames carry the channel-record body layout, and LatLon
+        frames carry ASCII; those are decoded and queued. Every other command
+        (pilot messages, NMEA-sourced data, etc.) has an unknown body structure,
+        so it is never queued — it is only probed speculatively for debugging.
+        """
+        if command_name == "Broadcast":
+            decoded_frame = decode_frame(frame)
+        elif command_name == "LatLon":
+            decoded_frame = decode_ascii_frame(frame)
+        else:
+            probe_frame(frame)
+            return
+
         if decoded_frame and "values" in decoded_frame:
             try:
                 self.frame_queue.put_nowait(decoded_frame)

{pyfastnet-2.0.16 → pyfastnet-2.0.17/pyfastnet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfastnet
-Version: 2.0.16
+Version: 2.0.17
 Summary: A Python library for decoding FastNet protocol data streams.
 Author-email: Alex Salmon <alex@ivila.net>
 License: MIT License