Merge pull request #1672 from DSheirer/1650-fm-decoder-7_5-bandwidth

#1650 Adds 7.5 kHz channel bandwidth option for FM channels.
DSheirer · Oct 15, 2023 · 123c25b · 123c25b
2 parents 3c73fdf + af56198
commit 123c25b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/io/github/dsheirer/module/decode/analog/DecodeConfigAnalog.java b/src/main/java/io/github/dsheirer/module/decode/analog/DecodeConfigAnalog.java
@@ -145,6 +145,7 @@ public enum Bandwidth
     {
         BW_3_0("3.0 kHz", 3000.0),
         BW_5_0("5.0 kHz", 5000.0),
+        BW_7_5("7.5 kHz", 7500.0),
         BW_8_33("8.33 kHz", 8333.0),
         BW_12_5("12.5 kHz", 12500.0),
         BW_15_0("15.0 kHz", 15000.0),
@@ -168,7 +169,7 @@ public enum Bandwidth
         public static EnumSet<Bandwidth> AM_BANDWIDTHS = EnumSet.of(BW_3_0, BW_5_0, BW_8_33, BW_15_0, BW_25_0);
 
         //FM demodulator channel bandwidth options
-        public static EnumSet<Bandwidth> FM_BANDWIDTHS = EnumSet.of(BW_12_5, BW_25_0);
+        public static EnumSet<Bandwidth> FM_BANDWIDTHS = EnumSet.of(BW_7_5, BW_12_5, BW_25_0);
 
         /**
          * Indicates if this entry is valid for the AM decoder.

diff --git a/src/main/java/io/github/dsheirer/module/decode/nbfm/DecodeConfigNBFM.java b/src/main/java/io/github/dsheirer/module/decode/nbfm/DecodeConfigNBFM.java
@@ -59,6 +59,8 @@ public ChannelSpecification getChannelSpecification()
     {
         switch(getBandwidth())
         {
+            case BW_7_5:
+                return new ChannelSpecification(25000.0, 7500, 3500.0, 3750.0);
             case BW_12_5:
                 return new ChannelSpecification(25000.0, 12500, 6000.0, 7000.0);
             case BW_25_0: