From 66ef6934950543046b3cc4f9c243de4761c96162 Mon Sep 17 00:00:00 2001
From: Marat Fayzullin <luarvique@gmail.com>
Date: Mon, 15 Apr 2024 09:57:05 -0400
Subject: [PATCH] Meteor-M2-4 is back to 72000 symbol rate.

---
 bands.json               |  3 +--
 owrx/dsp.py              |  7 ++-----
 owrx/modes.py            | 14 ++------------
 owrx/service/__init__.py |  7 ++-----
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/bands.json b/bands.json
index a190719d..0e9dc7bc 100644
--- a/bands.json
+++ b/bands.json
@@ -439,8 +439,7 @@
       "noaa-apt-15": 137620000,
       "noaa-apt-18": 137912500,
       "noaa-apt-19": 137100000,
-      "meteor-m23-lrpt": 137900000,
-      "meteor-m24-lrpt": 137101000
+      "meteor-lrpt": [137900000, 137101000]
     }
   },
   {
diff --git a/owrx/dsp.py b/owrx/dsp.py
index 9796b2b6..651a5cab 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -743,12 +743,9 @@ class DspManager(SdrSourceEventClient, ClientDemodulatorSecondaryDspEventClient)
         elif mod == "noaa-apt-19":
             from csdr.chain.toolbox import NoaaAptDemodulator
             return NoaaAptDemodulator(satellite=19)
-        elif mod == "meteor-m23-lrpt":
+        elif mod == "meteor-lrpt":
             from csdr.chain.toolbox import MeteorLrptDemodulator
-            return MeteorLrptDemodulator(symbolrate=72)
-        elif mod == "meteor-m24-lrpt":
-            from csdr.chain.toolbox import MeteorLrptDemodulator
-            return MeteorLrptDemodulator(symbolrate=80)
+            return MeteorLrptDemodulator()
 
     def setSecondaryDemodulator(self, mod):
         demodulator = self._getSecondaryDemodulator(mod)
diff --git a/owrx/modes.py b/owrx/modes.py
index a81dd588..5881de8f 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -302,18 +302,8 @@ class Modes(object):
 #            secondaryFft=False
 #        ),
 #        DigitalMode(
-#            "meteor-m23-lrpt",
-#            "Meteor-M2-3 LRPT",
-#            underlying=["empty"],
-#            bandpass=Bandpass(-75000, 75000),
-#            requirements=["wxsat"],
-#            service=True,
-#            squelch=False,
-#            secondaryFft=False
-#        ),
-#        DigitalMode(
-#            "meteor-m24-lrpt",
-#            "Meteor-M2-4 LRPT",
+#            "meteor-lrpt",
+#            "Meteor-M2 LRPT",
 #            underlying=["empty"],
 #            bandpass=Bandpass(-75000, 75000),
 #            requirements=["wxsat"],
diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index 121ddcfd..7c5b9a44 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -359,12 +359,9 @@ class ServiceHandler(SdrSourceEventClient):
         elif mod == "noaa-apt-19":
             from csdr.chain.toolbox import NoaaAptDemodulator
             return NoaaAptDemodulator(satellite=19, service=True)
-        elif mod == "meteor-m23-lrpt":
+        elif mod == "meteor-lrpt":
             from csdr.chain.toolbox import MeteorLrptDemodulator
-            return MeteorLrptDemodulator(samplerate=72, service=True)
-        elif mod == "meteor-m24-lrpt":
-            from csdr.chain.toolbox import MeteorLrptDemodulator
-            return MeteorLrptDemodulator(samplerate=80, service=True)
+            return MeteorLrptDemodulator(service=True)
 
         raise ValueError("unsupported service modulation: {}".format(mod))