#35 Functional AM demodulator with squelch control.

DSheirer · Apr 22, 2023 · 3fa01c3 · 3fa01c3
1 parent c6200a8
commit 3fa01c3
Show file tree

Hide file tree

Showing 12 changed files with 342 additions and 44 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/main/java/io/github/dsheirer/audio/AudioModule.java b/src/main/java/io/github/dsheirer/audio/AudioModule.java
@@ -141,11 +141,16 @@ public class SquelchStateListener implements Listener<SquelchStateEvent>
         @Override
         public void receive(SquelchStateEvent event)
         {
-            mSquelchState = event.getSquelchState();
+            SquelchState squelchState = event.getSquelchState();
 
-            if(mSquelchState == SquelchState.SQUELCH)
+            if(mSquelchState != squelchState)
             {
-                closeAudioSegment();
+                mSquelchState = squelchState;
+
+                if(mSquelchState == SquelchState.SQUELCH)
+                {
+                    closeAudioSegment();
+                }
             }
         }
     }

diff --git a/src/main/java/io/github/dsheirer/channel/state/DecoderStateEvent.java b/src/main/java/io/github/dsheirer/channel/state/DecoderStateEvent.java
@@ -73,7 +73,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append("Decoder State Event - source[").append(mSource.getClass())
+        sb.append("Decoder State Event - source[").append(mSource != null ? mSource.getClass() : "null")
                 .append("] event[").append(mEvent)
                 .append("] state[").append(mState)
                 .append("] timeslot[").append(mTimeslot)

diff --git a/src/main/java/io/github/dsheirer/dsp/am/SquelchingAMDemodulator.java b/src/main/java/io/github/dsheirer/dsp/am/SquelchingAMDemodulator.java
@@ -75,6 +75,8 @@ public void setSourceEventListener(Listener<SourceEvent> listener)
      */
     public float[] demodulate(float[] i, float[] q)
     {
+        setSquelchChanged(false);
+
         float[] magnitude = mMagnitudeCalculator.getMagnitude(i, q);
         float[] demodulated = mAmDemodulator.demodulateMagnitude(magnitude);
 

diff --git a/src/main/java/io/github/dsheirer/dsp/squelch/SimpleSquelch.java b/src/main/java/io/github/dsheirer/dsp/squelch/SimpleSquelch.java
@@ -130,10 +130,12 @@ public void process(float magnitude)
 
         if(mSquelch && mPower >= mSquelchThreshold)
         {
+            mLog.info("Setting squelch to false");
             setSquelch(false);
         }
         else if(!mSquelch && mPower < mSquelchThreshold)
         {
+            mLog.info("Setting squelch to true");
             setSquelch(true);
         }
     }