From c7c5a6eb5d247fd69587295aa40b75cb6b982a11 Mon Sep 17 00:00:00 2001
From: Mark Jessop <darkside@Marks-MacBook-Pro.local>
Date: Sat, 8 Jul 2023 10:21:49 +0930
Subject: [PATCH] Upload speed field to sondehub

---
 horusdemodlib/__init__.py        | 2 +-
 horusdemodlib/sondehubamateur.py | 9 +++++++++
 horusdemodlib/uploader.py        | 5 +++++
 pyproject.toml                   | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/horusdemodlib/__init__.py b/horusdemodlib/__init__.py
index aa4cd15..91c67cc 100755
--- a/horusdemodlib/__init__.py
+++ b/horusdemodlib/__init__.py
@@ -1 +1 @@
-__version__ = "0.3.10"
+__version__ = "0.3.11"
diff --git a/horusdemodlib/sondehubamateur.py b/horusdemodlib/sondehubamateur.py
index 38938e4..b1e10b6 100644
--- a/horusdemodlib/sondehubamateur.py
+++ b/horusdemodlib/sondehubamateur.py
@@ -203,6 +203,15 @@ class SondehubAmateurUploader(object):
             if telemetry["battery_voltage"] >= 0.0:
                 _output["batt"] = telemetry["battery_voltage"]
 
+        if "speed" in telemetry:
+            _output["speed"] = telemetry["speed"]
+
+        if "vel_h" in telemetry:
+            _output["vel_h"] = telemetry["vel_h"]
+
+        if "vel_v" in telemetry:
+            _output["vel_v"] = telemetry["vel_v"]
+
         # Handle the additional SNR and frequency estimation if we have it
         if "snr" in telemetry:
             _output["snr"] = telemetry["snr"]
diff --git a/horusdemodlib/uploader.py b/horusdemodlib/uploader.py
index 2e03103..302c083 100644
--- a/horusdemodlib/uploader.py
+++ b/horusdemodlib/uploader.py
@@ -253,6 +253,11 @@ def main():
                         _logfile.flush()
 
                     logging.info(f"Decoded Binary Packet (SNR {demod_stats.snr:.1f} dB): {_decoded['ukhas_str']}")
+                    # Remove a few fields from the packet before printing.
+                    _temp_packet = _decoded.copy()
+                    _temp_packet.pop('packet_format')
+                    _temp_packet.pop('ukhas_str')
+                    logging.debug(f"Binary Packet Contents: {_temp_packet}")
                 except Exception as e:
                     logging.error(f"Decode Failed: {str(e)}")
 
diff --git a/pyproject.toml b/pyproject.toml
index df79e97..2e99a21 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "horusdemodlib"
-version = "0.3.10"
+version = "0.3.11"
 description = "Project Horus HAB Telemetry Demodulators"
 authors = ["Mark Jessop"]
 license = "LGPL-2.1-or-later"