Skip to content

Commit ff9eca6

Browse files
committed
Overhaul PSK demodulator.
1 parent b382e5f commit ff9eca6

File tree

5 files changed

+332
-344
lines changed

5 files changed

+332
-344
lines changed

src/audio.h

+3-8
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,11 @@ struct audio_s {
145145

146146
// Original implementaion used alternative A for 2400 bbps PSK.
147147
// Years later, we discover that MFJ-2400 used alternative B.
148-
// It's likely the others did too.
149-
// For release 1.6, default to original style but print warning.
150-
// Later default to MFJ compatible and still print warning if
151-
// if user did not pick one explicitly.
148+
// It's likely the others did too. it also works a little better.
149+
// Default to MFJ compatible and print warning if user did not
150+
// pick one explicitly.
152151

153-
#if (MAJOR_VERSION > 1) || (MINOR_VERSION > 6)
154152
#define V26_DEFAULT V26_B
155-
#else
156-
#define V26_DEFAULT V26_A
157-
#endif
158153

159154
enum dtmf_decode_t { DTMF_DECODE_OFF, DTMF_DECODE_ON } dtmf_decode;
160155

src/demod.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ int demod_init (struct audio_s *pa)
494494
dw_printf ("Command line options -j and -J can be used for channel 0.\n");
495495
dw_printf ("For more information, read the Dire Wolf User Guide and\n");
496496
dw_printf ("2400-4800-PSK-for-APRS-Packet-Radio.pdf.\n");
497-
dw_printf ("The default in this release could be different in a later release.\n");
497+
dw_printf ("The default is now MFJ-2400 compatibility mode.\n");
498498

499499
save_audio_config_p->achan[chan].v26_alternative = V26_DEFAULT;
500500
}

0 commit comments

Comments
 (0)