pyfastnet 2.0.6__tar.gz → 2.0.8__tar.gz

{pyfastnet-2.0.6/pyfastnet.egg-info → pyfastnet-2.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: pyfastnet
-Version: 2.0.6
+Version: 2.0.8
 Summary: A Python library for decoding FastNet protocol data streams.
 Home-page: https://github.com/ghotihook/pyfastnet
 Author: Alex Salmon
@@ -17,7 +17,6 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
-Dynamic: license-file
 Dynamic: requires-python
 Dynamic: summary
 

{pyfastnet-2.0.6 → pyfastnet-2.0.8}/fastnet_decoder/decode_fastnet.py

@@ -16,15 +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]") 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 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
 
 

{pyfastnet-2.0.6 → pyfastnet-2.0.8}/fastnet_decoder/mappings.py

@@ -281,18 +281,28 @@ SEGMENT_A = {
     0x20: "[data]-",  0xa0: "-[data]",
     0x8c: "=[data]",  0x0c: "[data]=",
     0xf3: "H[data]",  0x73: "[data]H",
-    0x00: " ",
 
-    # Plain-positive layout codes (no sign decoration) confirmed from raw log replay
-    0x80: " ",   # depth channels (0xC1/C2/C3)
-    0x5c: " ",   # sea temperature °C
-    0x74: " ",   # sea temperature °F
-    0x58: " ",   # autopilot compass target (0–360° bearing)
-    0x99: " ",   # VMG positive direction
-    0xbb: " ",   # VMG / tidal drift positive
-    0xd8: " ",   # leeway (always 0.0 in captured data; defaulted to plain)
-    0x54: " ",   # true wind angle positive (starboard tack)
-    0x01: " ",   # linear sensor null/zero state
+    # Blank — no segments lit, no indicator symbol
+    0x00: None,   # AFTER, all blank — COG, SOG
+    0x80: None,   # BEFORE, all blank — Depth (m/ft/fm)
+
+    # 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
+
+    # 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.6 → pyfastnet-2.0.8/pyfastnet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: pyfastnet
-Version: 2.0.6
+Version: 2.0.8
 Summary: A Python library for decoding FastNet protocol data streams.
 Home-page: https://github.com/ghotihook/pyfastnet
 Author: Alex Salmon
@@ -17,7 +17,6 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
-Dynamic: license-file
 Dynamic: requires-python
 Dynamic: summary
 

{pyfastnet-2.0.6 → pyfastnet-2.0.8}/setup.py

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

{pyfastnet-2.0.6 → pyfastnet-2.0.8}/tests/test_channels.py

@@ -249,7 +249,6 @@ class TestHeelAndTrim(unittest.TestCase):
 class TestSeaTemperature(unittest.TestCase):
     """
     Stored-log frame also carries sea temperature in Celsius and Fahrenheit.
-    Format 0x07 with a segment byte not present in SEGMENT_A → layout '?'.
     Cross-check: 23 °C ≈ 73 °F within 1 degree rounding.
     """
     FRAME = "ff011801e7cd840000acc7cf84ff0000001f17005c00171e17007400494f"
@@ -259,11 +258,11 @@ class TestSeaTemperature(unittest.TestCase):
 
     def test_sea_temp_celsius(self):
         self.assertEqual(self.v["Sea Temperature (°C)"]["value"], 23.0)
-        self.assertEqual(self.v["Sea Temperature (°C)"]["display_text"], "23")
+        self.assertEqual(self.v["Sea Temperature (°C)"]["display_text"], "23°C")
 
     def test_sea_temp_fahrenheit(self):
         self.assertEqual(self.v["Sea Temperature (°F)"]["value"], 73.0)
-        self.assertEqual(self.v["Sea Temperature (°F)"]["display_text"], "73")
+        self.assertEqual(self.v["Sea Temperature (°F)"]["display_text"], "73°F")
 
     def test_cross_unit_consistency(self):
         c = self.v["Sea Temperature (°C)"]["value"]