pyfastnet 2.0.7__tar.gz → 2.0.9__tar.gz

{pyfastnet-2.0.7/pyfastnet.egg-info → pyfastnet-2.0.9}/PKG-INFO

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

{pyfastnet-2.0.7 → pyfastnet-2.0.9}/fastnet_decoder/decode_fastnet.py

@@ -16,19 +16,24 @@ _DECIMAL_PLACES_MAP = {1: 0, 10: 1, 100: 2, 1000: 3}
 #   "°M"       →  magnetic bearing, suffix added after value
 
 def _sign_from_layout(layout: str) -> int:
-    return -1 if layout in ("-[data]", "=[data]", "°[data]") else 1
+    return -1 if layout in ("-[data]", "=[data]", "L[data]") else 1
 
 
 def _display_from_layout(layout: str, formatted: str) -> str:
-    if layout == "°M":       return f"{formatted}°M"
-    if layout == "H[data]":  return f"H{formatted}"
-    if layout == "[data]H":  return f"{formatted}H"
-    if layout == "[data]=":  return f"{formatted}="
-    if layout == "[data]-":  return f"{formatted}-"
-    if layout == "[data]°C": return f"{formatted}°C"
-    if layout == "[data]°F": return f"{formatted}°F"
-    if layout == "[data]°":  return f"{formatted}°"
-    if layout == "°[data]":  return f"°{formatted}"
+    if layout is None:        return formatted
+    if layout == "°M":        return f"{formatted}°M"
+    if layout == "H[data]":   return f"H{formatted}"
+    if layout == "[data]H":   return f"{formatted}H"
+    if layout == "[data]=":   return f"{formatted}="
+    if layout == "[data]-":   return f"{formatted}-"
+    if layout == "[data]°C":  return f"{formatted}°C"
+    if layout == "[data]°F":  return f"{formatted}°F"
+    if layout == "[data]L":   return f"{formatted}L"
+    if layout == "L[data]":   return f"L{formatted}"
+    if layout == "[data]z":   return f"{formatted}z"
+    if layout == "z[data]":   return f"z{formatted}"
+    if layout == "u[data]":   return f"u{formatted}"
+    if layout == "d[data]":   return f"d{formatted}"
     return formatted
 
 
@@ -181,7 +186,7 @@ def decode_format_and_data(channel_id, format_byte, data_bytes):
         elif format_bits == 0x03:
             if len(data_bytes) != 2:
                 return None
-            layout   = SEGMENT_A.get(data_bytes[0], "?")
+            layout   = SEGMENT_A.get(data_bytes[0], "TBC")
             unsigned = data_bytes[1]
             value    = _sign_from_layout(layout) * unsigned / divisor
             display_text = _display_from_layout(layout, f"{value:.{decimal_places}f}")
@@ -212,7 +217,7 @@ def decode_format_and_data(channel_id, format_byte, data_bytes):
             if len(data_bytes) != 4:
                 return None
             # data_bytes[0] is a status/flag byte; byte 1 is the segment/layout code
-            layout   = SEGMENT_A.get(data_bytes[1], "?")
+            layout   = SEGMENT_A.get(data_bytes[1], "TBC")
             msb      = data_bytes[2] & 0b01111111
             unsigned = (msb << 8) | data_bytes[3]
             value    = _sign_from_layout(layout) * unsigned / divisor
@@ -222,7 +227,7 @@ def decode_format_and_data(channel_id, format_byte, data_bytes):
             if len(data_bytes) != 2:
                 return None
             segment_code = (data_bytes[0] >> 1) & 0b01111111
-            layout       = SEGMENT_A.get(segment_code, "?")
+            layout       = SEGMENT_A.get(segment_code, "TBC")
             unsigned     = ((data_bytes[0] & 0b1) << 8) | data_bytes[1]
             value        = unsigned / divisor
             display_text = _display_from_layout(layout, f"{value:.{decimal_places}f}")

{pyfastnet-2.0.7 → pyfastnet-2.0.9}/fastnet_decoder/mappings.py

@@ -258,7 +258,7 @@ CHANNEL_LOOKUP = {
     0xEB: "Speed Over Ground",
     0xEC: "VMG to Waypoint (VMC)",
     0xED: "Time to Waypoint",
-    0xEE: "Cross Track Error",
+    0xEE: "Cross Track Error",  # layout TBC — not present in captured log data
     0xEF: "Remote 0",
     0xF0: "Remote 1",
     0xF1: "Remote 2",
@@ -281,24 +281,28 @@ SEGMENT_A = {
     0x20: "[data]-",  0xa0: "-[data]",
     0x8c: "=[data]",  0x0c: "[data]=",
     0xf3: "H[data]",  0x73: "[data]H",
-    0x00: " ",
 
-    # Plain-positive codes — no suffix, confirmed from 7-segment bit decoding
-    0x80: " ",   # blank (no segments lit) — depth channels
-    0x01: " ",   # decimal-point only — linear sensor null/zero state
-    0x99: " ",   # top+bottom bars + dp — VMG positive direction indicator
-    0xbb: " ",   # f,d,b,c + dp — VMG / tidal drift positive indicator
-    0x32: " ",   # f,d,c — AP Off Course low indicator
-    0x61: " ",   # g,f + dp — AP Off Course high indicator
+    # Blank — no segments lit, no indicator symbol
+    0x00: None,   # AFTER, all blank — COG, SOG
+    0x80: None,   # BEFORE, all blank — Depth (m/ft/fm)
 
-    # Degree / temperature suffix codes (symbol appears AFTER value)
-    0x5c: "[data]°C",  # a,c,d,e,f (C-shape) — sea temperature °C
-    0x74: "[data]°F",  # a,b,d,e,f (F-shape) — sea temperature °F
-    0x58: "[data]°",   # a,d,g (three bars, ≡) — bearing / compass target, positive
-    0x54: "[data]°",   # a,d,e (partial) — true wind angle, starboard/positive
+    # Confirmed symbols
+    0xbb: "d[data]",   # 'd' BEFORE — Tidal Drift
+    0x99: "u[data]",   # 'u' BEFORE — VMG (upwind indicator)
+    0x58: "[data]L",   # 'L' AFTER  — AP Compass Target
+    0xd8: "L[data]",   # 'L' BEFORE — Leeway port/negative
 
-    # Negative counterpart: same three-bar symbol (a,d,g) BEFORE value
-    0xd8: "°[data]",   # pair of 0x58 — leeway port (negative)
+    # AP Off Course — dog-leg symbol, direction shown by z position
+    0x32: "[data]z",   # z after value — AP Off Course one direction
+    0x61: "z[data]",   # z before value — AP Off Course other direction
+
+    # Temperature suffixes
+    0x5c: "[data]°C",  # 'C' shape AFTER — Sea Temperature °C
+    0x74: "[data]°F",  # 'F' shape AFTER — Sea Temperature °F
+
+    # TBC — symbol seen but not yet identified
+    0x01: "TBC",   # lower-right segment only — Linear sensors, Node Reset
+    0x54: "TBC",   # upper-left+lower-left+top — True Wind Angle starboard
 }
 
 SEGMENT_B = {

{pyfastnet-2.0.7 → pyfastnet-2.0.9/pyfastnet.egg-info}/PKG-INFO

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

{pyfastnet-2.0.7 → pyfastnet-2.0.9}/setup.py

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