diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2019-09-01 15:38:16 +0200 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2019-11-29 15:58:32 +0100 |
| commit | 6dcc8baad448d000ef355abc6d9abf7a3490a800 (patch) | |
| tree | d46e472ec720c369071e49398783630d16f47bb2 /src/nmt | |
| parent | 360729d27034a3fe684b4a2ddea516d027dab935 (diff) | |
Split FSK modem code into separate modulator and demodulator
Diffstat (limited to 'src/nmt')
| -rw-r--r-- | src/nmt/dsp.c | 17 | ||||
| -rw-r--r-- | src/nmt/nmt.h | 3 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/nmt/dsp.c b/src/nmt/dsp.c index 9103722..1dcd606 100644 --- a/src/nmt/dsp.c +++ b/src/nmt/dsp.c @@ -120,7 +120,11 @@ int dsp_init_sender(nmt_t *nmt, double deviation_factor) PDEBUG(DDSP, DEBUG_DEBUG, "Using Supervisory level of %.3f (%.3f KHz deviation @ 4015 Hz)\n", TX_PEAK_SUPER * deviation_factor, 0.3 * deviation_factor); /* init fsk */ - if (fsk_init(&nmt->fsk, nmt, fsk_send_bit, fsk_receive_bit, nmt->sender.samplerate, BIT_RATE, F0, F1, TX_PEAK_FSK, 1, BIT_ADJUST) < 0) { + if (fsk_mod_init(&nmt->fsk_mod, nmt, fsk_send_bit, nmt->sender.samplerate, BIT_RATE, F0, F1, TX_PEAK_FSK, 1) < 0) { + PDEBUG_CHAN(DDSP, DEBUG_ERROR, "FSK init failed!\n"); + return -EINVAL; + } + if (fsk_demod_init(&nmt->fsk_demod, nmt, fsk_receive_bit, nmt->sender.samplerate, BIT_RATE, F0, F1, BIT_ADJUST) < 0) { PDEBUG_CHAN(DDSP, DEBUG_ERROR, "FSK init failed!\n"); return -EINVAL; } @@ -163,7 +167,8 @@ void dsp_cleanup_sender(nmt_t *nmt) { PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Cleanup DSP for Transceiver.\n"); - fsk_cleanup(&nmt->fsk); + fsk_mod_cleanup(&nmt->fsk_mod); + fsk_demod_cleanup(&nmt->fsk_demod); if (nmt->super_filter_spl) { free(nmt->super_filter_spl); @@ -336,7 +341,7 @@ void sender_receive(sender_t *sender, sample_t *samples, int length, double __at nmt->super_filter_pos = pos; /* fsk signal */ - fsk_receive(&nmt->fsk, samples, length); + fsk_demod_receive(&nmt->fsk_demod, samples, length); /* muting audio while receiving frame */ for (i = 0; i < length; i++) { @@ -449,7 +454,7 @@ again: jitter_load(&nmt->sender.dejitter, samples, length); /* send after dejitter, so audio is flushed */ if (nmt->dms.tx_frame_valid) { - fsk_send(&nmt->fsk, samples, length, 0); + fsk_mod_send(&nmt->fsk_mod, samples, length, 0); break; } if (nmt->supervisory) @@ -464,7 +469,7 @@ again: case DSP_MODE_FRAME: /* Encode frame into audio stream. If frames have * stopped, process again for rest of stream. */ - count = fsk_send(&nmt->fsk, samples, length, 0); + count = fsk_mod_send(&nmt->fsk_mod, samples, length, 0); /* special case: add supervisory signal to frame at loop test */ if (nmt->sender.loopback && nmt->supervisory) super_encode(nmt, samples, count); @@ -501,7 +506,7 @@ void nmt_set_dsp_mode(nmt_t *nmt, enum dsp_mode mode) { /* reset frame */ if (mode == DSP_MODE_FRAME && nmt->dsp_mode != mode) { - fsk_tx_reset(&nmt->fsk); + fsk_mod_tx_reset(&nmt->fsk_mod); nmt->tx_frame_length = 0; } diff --git a/src/nmt/nmt.h b/src/nmt/nmt.h index 6700b35..31d68f6 100644 --- a/src/nmt/nmt.h +++ b/src/nmt/nmt.h @@ -104,7 +104,8 @@ typedef struct nmt { /* dsp states */ enum dsp_mode dsp_mode; /* current mode: audio, durable tone 0 or 1, paging */ - fsk_t fsk; /* fsk processing */ + fsk_mod_t fsk_mod; /* fsk processing */ + fsk_demod_t fsk_demod; int super_samples; /* number of samples in buffer for supervisory detection */ goertzel_t super_goertzel[5]; /* filter for supervisory decoding */ sample_t *super_filter_spl; /* array with sample buffer for supervisory detection */ |