ka9q-python 3.2.0__tar.gz → 3.2.2__tar.gz

{ka9q_python-3.2.0/ka9q_python.egg-info → ka9q_python-3.2.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: ka9q-python
-Version: 3.2.0
+Version: 3.2.2
 Summary: Python interface for ka9q-radio control and monitoring
 Home-page: https://github.com/mijahauan/ka9q-python
 Author: Michael Hauan AC0G
 Author-email: Michael Hauan AC0G <ac0g@hauan.org>
-License-Expression: MIT
+License: MIT
 Project-URL: Homepage, https://github.com/mijahauan/ka9q-python
 Project-URL: Documentation, https://github.com/mijahauan/ka9q-python/blob/main/README.md
 Project-URL: Repository, https://github.com/mijahauan/ka9q-python

{ka9q_python-3.2.0 → ka9q_python-3.2.2}/ka9q/__init__.py

@@ -22,7 +22,7 @@ Basic usage:
         ssrc = allocate_ssrc(10.0e6, "iq", 16000)
 """
 
-__version__ = '3.2.0'
+__version__ = '3.2.1'
 __author__ = 'Michael Hauan AC0G'
 
 from .control import RadiodControl, allocate_ssrc

{ka9q_python-3.2.0 → ka9q_python-3.2.2}/ka9q/rtp_recorder.py

@@ -30,6 +30,7 @@ logger = logging.getLogger(__name__)
 GPS_UTC_OFFSET = 315964800  # GPS epoch (1980-01-06) - Unix epoch (1970-01-01)  
 UNIX_EPOCH = 2208988800     # Unix epoch in NTP seconds
 BILLION = 1_000_000_000
+GPS_LEAP_SECONDS = 18   # GPS time is ahead of UTC by 18 seconds (as of 2025)
 
 
 class RecorderState(Enum):
@@ -140,7 +141,10 @@ def rtp_to_wallclock(rtp_timestamp: int, channel: ChannelInfo) -> Optional[float
         return None
     
     # Convert GPS nanoseconds to Unix time
-    sender_time = channel.gps_time + BILLION * (UNIX_EPOCH - GPS_UTC_OFFSET)
+    # GPS epoch is Jan 6, 1980; Unix epoch is Jan 1, 1970
+    # gps_time is nanoseconds since GPS epoch, so add GPS_UTC_OFFSET (in ns)
+    # AND subtract current GPS_LEAP_SECONDS (18s) to align with UTC
+    sender_time = channel.gps_time + BILLION * (GPS_UTC_OFFSET - GPS_LEAP_SECONDS)
     
     # Add offset from RTP timestamp difference
     # Cast to int32 for proper wrapping behavior

{ka9q_python-3.2.0 → ka9q_python-3.2.2}/ka9q/types.py

@@ -150,12 +150,13 @@ class StatusType:
 # Command packet type
 CMD = 1
 
-# Encoding types (from ka9q-radio)
+# Encoding types - must match enum encoding in ka9q-radio/src/rtp.h
 class Encoding:
-    """Output encoding types"""
+    """Output encoding types - values must match ka9q-radio/src/rtp.h enum encoding"""
     NO_ENCODING = 0
-    S16BE = 1  # Signed 16-bit big-endian
-    S16LE = 2  # Signed 16-bit little-endian
-    F32 = 3    # 32-bit float
-    F16 = 4    # 16-bit float
-    OPUS = 5   # Opus codec
+    S16LE = 1  # Signed 16-bit little-endian
+    S16BE = 2  # Signed 16-bit big-endian
+    OPUS = 3   # Opus codec
+    F32 = 4    # 32-bit float (F32LE in C)
+    AX25 = 5   # AX.25 packet
+    F16 = 6    # 16-bit float (F16LE in C)

{ka9q_python-3.2.0 → ka9q_python-3.2.2/ka9q_python.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: ka9q-python
-Version: 3.2.0
+Version: 3.2.2
 Summary: Python interface for ka9q-radio control and monitoring
 Home-page: https://github.com/mijahauan/ka9q-python
 Author: Michael Hauan AC0G
 Author-email: Michael Hauan AC0G <ac0g@hauan.org>
-License-Expression: MIT
+License: MIT
 Project-URL: Homepage, https://github.com/mijahauan/ka9q-python
 Project-URL: Documentation, https://github.com/mijahauan/ka9q-python/blob/main/README.md
 Project-URL: Repository, https://github.com/mijahauan/ka9q-python

{ka9q_python-3.2.0 → ka9q_python-3.2.2}/ka9q_python.egg-info/SOURCES.txt

@@ -44,6 +44,7 @@ tests/test_multihomed.py
 tests/test_native_discovery.py
 tests/test_performance_fixes.py
 tests/test_remove_channel.py
+tests/test_rtp_recorder.py
 tests/test_security_features.py
 tests/test_tune.py
 tests/test_tune_cli.py

{ka9q_python-3.2.0 → ka9q_python-3.2.2}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ka9q-python"
-version = "3.2.0"
+version = "3.2.2"
 description = "Python interface for ka9q-radio control and monitoring"
 readme = "README.md"
 authors = [
     {name = "Michael Hauan AC0G", email = "ac0g@hauan.org"}
 ]
-license = "MIT"
+license = {text = "MIT"}
 requires-python = ">=3.9"
 classifiers = [
     "Development Status :: 4 - Beta",

{ka9q_python-3.2.0 → ka9q_python-3.2.2}/setup.py

@@ -12,7 +12,7 @@ long_description = readme.read_text() if readme.exists() else ''
 
 setup(
     name='ka9q-python',
-    version='3.2.0',
+    version='3.2.1',
     description='Python interface for ka9q-radio control and monitoring',
     long_description=long_description,
     long_description_content_type='text/markdown',

ka9q_python-3.2.2/tests/test_rtp_recorder.py

@@ -0,0 +1,41 @@
+"""
+Tests for RTP recorder functionality
+"""
+import pytest
+from ka9q.rtp_recorder import rtp_to_wallclock
+from ka9q.discovery import ChannelInfo
+
+def test_rtp_to_wallclock():
+    """Test GPS time to Unix time conversion"""
+    # Channel info with mocked timing
+    # GPS Time: 1234567890000000000 ns (random recent-ish GPS time)
+    # This corresponds to some time around 2019
+    gps_time_ns = 1234567890000000000 
+    
+    # Constants from code
+    GPS_UTC_OFFSET = 315964800
+    BILLION = 1_000_000_000
+    
+    channel = ChannelInfo(
+        ssrc=1234,
+        preset="test",
+        sample_rate=48000,
+        frequency=100.0,
+        snr=0.0,
+        multicast_address="239.1.2.3",
+        port=5004,
+        gps_time=gps_time_ns,
+        rtp_timesnap=1000
+    )
+    
+    # Case 1: Same RTP timestamp as snapshot
+    # Result should be exactly GPS time + offset
+    # Expected Unix time = GPS time + Offset - Leap Seconds
+    expected_unix_ns = gps_time_ns + (BILLION * (GPS_UTC_OFFSET - 18))
+    expected_unix_sec = expected_unix_ns / BILLION
+    
+    assert rtp_to_wallclock(1000, channel) == pytest.approx(expected_unix_sec)
+    
+    # Case 2: One second later
+    # 48000 samples later
+    assert rtp_to_wallclock(1000 + 48000, channel) == pytest.approx(expected_unix_sec + 1.0)