#35 WIP. Code review.

Author: Dennis Sheirer

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormatter.java

@@ -47,6 +47,10 @@ public class TalkgroupFormatter
 
     static
     {
+        AnalogTalkgroupFormatter analogTalkgroupFormatter = new AnalogTalkgroupFormatter();
+        mFormatterMap.put(Protocol.AM, analogTalkgroupFormatter);
+        mFormatterMap.put(Protocol.NBFM, analogTalkgroupFormatter);
+
         mFormatterMap.put(Protocol.APCO25, new APCO25TalkgroupFormatter());
         mFormatterMap.put(Protocol.DMR, new DMRTalkgroupFormatter());
         mFormatterMap.put(Protocol.FLEETSYNC, new FleetsyncTalkgroupFormatter());
@@ -55,7 +59,6 @@ public class TalkgroupFormatter
         mFormatterMap.put(Protocol.LTR_NET, ltr);
         mFormatterMap.put(Protocol.MDC1200, new MDC1200TalkgroupFormatter());
         mFormatterMap.put(Protocol.MPT1327, new MPT1327TalkgroupFormatter());
-        mFormatterMap.put(Protocol.NBFM, new AnalogTalkgroupFormatter());
         mFormatterMap.put(Protocol.PASSPORT, new PassportTalkgroupFormatter());
         mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
     }

src/main/java/io/github/dsheirer/dsp/am/AmDemodulatorFactory.java

@@ -48,10 +48,13 @@ public static IAmDemodulator getAmDemodulator(float gain)
             case VECTOR_SIMD_128:
                 return new VectorAMDemodulator128(gain);
             case VECTOR_SIMD_256:
+                return new VectorAMDemodulator256(gain);
             case VECTOR_SIMD_512:
+                return new VectorAMDemodulator512(gain);
             case VECTOR_SIMD_PREFERRED:
                 return new VectorAMDemodulator64(gain);
             case SCALAR:
+            case UNCALIBRATED:
                 return new ScalarAMDemodulator(gain);
             default:
                 mLog.warn("Unrecognized optimal operation for AM demodulator: " + implementation.name());

src/main/java/io/github/dsheirer/module/decode/DecoderFactory.java

@@ -537,6 +537,7 @@ public static DecodeConfiguration copy(DecodeConfiguration config)
                     copyAM.setBandwidth(origAM.getBandwidth());
                     copyAM.setTalkgroup(origAM.getTalkgroup());
                     copyAM.setSquelchThreshold(origAM.getSquelchThreshold());
+                    copyAM.setSquelchAutoTrack(origAM.isSquelchAutoTrack());
                     return copyAM;
                 case DMR:
                     return new DecodeConfigDMR();
@@ -563,6 +564,7 @@ public static DecodeConfiguration copy(DecodeConfiguration config)
                     DecodeConfigNBFM copyNBFM = new DecodeConfigNBFM();
                     copyNBFM.setBandwidth(origNBFM.getBandwidth());
                     copyNBFM.setSquelchThreshold(origNBFM.getSquelchThreshold());
+                    copyNBFM.setSquelchAutoTrack(origNBFM.isSquelchAutoTrack());
                     copyNBFM.setTalkgroup(origNBFM.getTalkgroup());
                     return copyNBFM;
                 case P25_PHASE1: