From b1c377548f240c2098bf60d834ce2f4a9466fe13 Mon Sep 17 00:00:00 2001
From: Marat Fayzullin <luarvique@gmail.com>
Date: Tue, 5 Mar 2024 21:50:15 -0500
Subject: [PATCH] Adding automatic 1kHz shift to DSC frequencies wherever
 applicable.

---
 bookmarks.txt       | 14 +++++++-------
 htdocs/lib/Utils.js |  1 +
 makebookmarks.pl    |  5 +++--
 owrx/eibi.py        |  4 +---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bookmarks.txt b/bookmarks.txt
index f3148f1d..1f1266e0 100644
--- a/bookmarks.txt
+++ b/bookmarks.txt
@@ -60,13 +60,13 @@ MSI|||16806.5|SITORB
 MSI|||19680.5|SITORB
 MSI|||22376|SITORB
 MSI|||26100.5|SITORB
-DSC|||2186.5|DSC
-DSC|||4206.5|DSC
-DSC|||6311|DSC
-DSC|||8413.5|DSC
-DSC|||12576|DSC
-DSC|||16803.5|DSC
-DSC|||156524|DSC
+DSC|||2187.5|DSC
+DSC|||4207.5|DSC
+DSC|||6312|DSC
+DSC|||8414.5|DSC
+DSC|||12577|DSC
+DSC|||16804.5|DSC
+DSC|||156525|DSC
 
 #
 # NOAA weather broadcasts
diff --git a/htdocs/lib/Utils.js b/htdocs/lib/Utils.js
index 36b7398c..5ac71212 100644
--- a/htdocs/lib/Utils.js
+++ b/htdocs/lib/Utils.js
@@ -46,6 +46,7 @@ Utils.offsetFreq = function(freq, mod) {
         case 'rtty170':
         case 'rtty85':
         case 'sitorb':
+        case 'dsc':
         case 'bpsk31':
         case 'bpsk63':
             return freq - 1000;
diff --git a/makebookmarks.pl b/makebookmarks.pl
index 55f10a1c..fb716d7f 100755
--- a/makebookmarks.pl
+++ b/makebookmarks.pl
@@ -37,10 +37,11 @@ while(<STDIN>)
       if(lc($Mod) eq "rtty450") { $Freq -= 1.0; }
       if(lc($Mod) eq "rtty170") { $Freq -= 1.0; }
       if(lc($Mod) eq "rtty85")  { $Freq -= 1.0; }
-      # Set NAVTEX/SITOR-B frequencies 1kHz lower than the left carrier
+      # Set NAVTEX/SITOR-B/DSC frequencies 1kHz lower than the left carrier
       if(lc($Mod) eq "sitorb")  { $Freq -= 1.0; }
+      if(lc($Mod) eq "dsc")     { $Freq -= 1.0; }
       # Set CW frequencies 800Hz lower than the carrier
-      if(lc($Mod) eq "cw")  { $Freq -= 0.8; }
+      if(lc($Mod) eq "cw")      { $Freq -= 0.8; }
 
       printf("    {\n");
       printf("        \"name\" : \"%s\",\n", $Name);
diff --git a/owrx/eibi.py b/owrx/eibi.py
index 755ca470..856490f4 100644
--- a/owrx/eibi.py
+++ b/owrx/eibi.py
@@ -53,9 +53,7 @@ class EIBI(object):
             return freq - 800
         elif mode == "fax":
             return freq - 1900
-        elif mode == "rtty450":
-            return freq - 1000
-        elif mode == "sitorb":
+        elif mode in ["cwdecoder", "rtty450", "rtty170", "rtty85", "sitorb", "dsc", "bpsk31", "bpsk63"]:
             return freq - 1000
         else:
             return freq