From f91ca01d19e1f016d14abcb96c1819e9e8963d94 Mon Sep 17 00:00:00 2001
From: Marat Fayzullin <luarvique@gmail.com>
Date: Sat, 9 Mar 2024 14:39:15 -0500
Subject: [PATCH] Updating satellite stuff.

---
 bands.json                 |  9 ++++++++-
 bookmarks.d/satellite.json | 27 ---------------------------
 bookmarks.txt              |  9 ---------
 csdr/chain/toolbox.py      | 18 ++++++------------
 4 files changed, 14 insertions(+), 49 deletions(-)
 delete mode 100644 bookmarks.d/satellite.json

diff --git a/bands.json b/bands.json
index 33e9ee44..b1f4b00d 100644
--- a/bands.json
+++ b/bands.json
@@ -425,7 +425,14 @@
     "name": "VHF Satellite",
     "lower_bound": 137000000,
     "upper_bound": 138000000,
-    "tags": ["service"]
+    "tags": ["service"],
+    "frequencies": {
+      "noaa-apt-15": 137620000,
+      "noaa-apt-18": 137912500,
+      "noaa-apt-19": 137100000,
+      "meteor-lrpt": 137900000,
+      "meteor-lrpt": 137100000
+    }
   },
   {
     "name": "VHF Marine",
diff --git a/bookmarks.d/satellite.json b/bookmarks.d/satellite.json
deleted file mode 100644
index ad2b20ca..00000000
--- a/bookmarks.d/satellite.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-    {
-        "name" : "NOAA 15",
-        "frequency" : 137620000,
-        "modulation" : "noaa-apt-15"
-    },
-    {
-        "name" : "NOAA 18",
-        "frequency" : 137912500,
-        "modulation" : "noaa-apt-18"
-    },
-    {
-        "name" : "NOAA 19",
-        "frequency" : 137100000,
-        "modulation" : "noaa-apt-19"
-    },
-    {
-        "name" : "Meteor M2-3",
-        "frequency" : 137900000,
-        "modulation" : "meteor-lrpt"
-    },
-    {
-        "name" : "Meteor M2-4",
-        "frequency" : 137100000,
-        "modulation" : "meteor-lrpt"
-    }
-]
diff --git a/bookmarks.txt b/bookmarks.txt
index 7015af92..1f1266e0 100644
--- a/bookmarks.txt
+++ b/bookmarks.txt
@@ -487,12 +487,3 @@ RHA23|||71550|NFM
 RHA24|||71575|NFM
 RHA25|||71600|NFM
 RHA26|||72325|NFM
-
-#
-# Satellities
-#
-NOAA 15|||137620|NOAA-APT-15
-NOAA 18|||137912.5|NOAA-APT-18
-NOAA 19|||137100|NOAA-APT-19
-Meteor M2-3|||137900|METEOR-LRPT
-Meteor M2-4|||137100|METEOR-LRPT
diff --git a/csdr/chain/toolbox.py b/csdr/chain/toolbox.py
index c6627732..98dcc643 100644
--- a/csdr/chain/toolbox.py
+++ b/csdr/chain/toolbox.py
@@ -213,13 +213,13 @@ class RdsDemodulator(ServiceDemodulator, DialFrequencyReceiver):
         self.parser.setDialFrequency(frequency)
 
 
-class NoaaAptDemodulator(ServiceDemodulator, DialFrequencyReceiver):
+class NoaaAptDemodulator(ServiceDemodulator):
     def __init__(self, satellite: int = 19, service: bool = False):
         self.sampleRate = 50000
         workers = [
             SatDumpModule(mode = "noaa_apt", sampleRate = self.sampleRate, options = {
                 "satellite_number" : satellite,
-                "start_timestamp"  : datetime.utcnow().timestamp()
+                "start_timestamp"  : int(datetime.utcnow().timestamp())
             })
         ]
         # Connect all the workers
@@ -231,16 +231,14 @@ class NoaaAptDemodulator(ServiceDemodulator, DialFrequencyReceiver):
     def supportsSquelch(self) -> bool:
         return False
 
-    def setDialFrequency(self, frequency: int) -> None:
-        # TODO: Do something with the frequency or remove DialFrequencyReceiver
-        pass
 
-
-class MeteorLrptDemodulator(ServiceDemodulator, DialFrequencyReceiver):
+class MeteorLrptDemodulator(ServiceDemodulator):
     def __init__(self, service: bool = False):
         self.sampleRate = 150000
         workers = [
-            SatDumpModule(mode = "meteor_m2-x_lrpt", sampleRate = self.sampleRate)
+            SatDumpModule(mode = "meteor_m2-x_lrpt", sampleRate = self.sampleRate, options = {
+                "start_timestamp" : int(datetime.utcnow().timestamp())
+            })
         ]
         # Connect all the workers
         super().__init__(workers)
@@ -250,7 +248,3 @@ class MeteorLrptDemodulator(ServiceDemodulator, DialFrequencyReceiver):
 
     def supportsSquelch(self) -> bool:
         return False
-
-    def setDialFrequency(self, frequency: int) -> None:
-        # TODO: Do something with the frequency or remove DialFrequencyReceiver
-        pass