From 874d8d5073b41089fa6915271e388cf9d23f9776 Mon Sep 17 00:00:00 2001 From: Thomas Kolb Date: Sun, 17 Oct 2021 19:45:54 +0200 Subject: [PATCH] Fixed the modulator + test demodulation --- impl/src/main.c | 8 ++++---- impl/src/packet_mod.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/impl/src/main.c b/impl/src/main.c index e5d6609..b168f4a 100644 --- a/impl/src/main.c +++ b/impl/src/main.c @@ -38,16 +38,16 @@ int main(void) float complex msg_mod[nsyms]; packet_mod_get_result_cf(&pmod, msg_mod, &nsyms); // get the data + dump_array_cf(msg_mod, nsyms, 1.0f, "/tmp/tx.cpx"); // channel float complex msg_received[nsyms]; - nsyms = nsyms - 63 - 8; + nsyms = nsyms - 63 - 16; //memcpy(msg_received, msg_mod, sizeof(msg_received)); // no noise in channel - dump_array_cf(msg_mod, nsyms, 1.0f, "/tmp/tx.cpx"); - channel_cccf_execute_block(channel, msg_mod + 63 + 8, nsyms, msg_received); + channel_cccf_execute_block(channel, msg_mod + 63 + 16, nsyms, msg_received); dump_array_cf(msg_received, nsyms, 1.0f, "/tmp/rx.cpx"); // demodulate @@ -64,7 +64,7 @@ int main(void) } unsigned int received_bytes; - liquid_repack_bytes(msg_demod_syms, bps, nsyms, msg_demod, 8, k+1, &received_bytes); + liquid_repack_bytes(msg_demod_syms, bps, nsyms, msg_demod, 8, sizeof(msg_demod), &received_bytes); //assert(received_bytes == k); diff --git a/impl/src/packet_mod.c b/impl/src/packet_mod.c index 2c37e6b..45b851c 100644 --- a/impl/src/packet_mod.c +++ b/impl/src/packet_mod.c @@ -158,7 +158,7 @@ result_t packet_mod_add_header(packet_mod_ctx_t *ctx) modem hdr_modem = modem_create(HEADER_MODULATION); // encode the header - unsigned int hdr_enc_length = fec_get_enc_msg_length(HEADER_CHANNEL_CODE, ctx->length); + unsigned int hdr_enc_length = fec_get_enc_msg_length(HEADER_CHANNEL_CODE, sizeof(header)); unsigned char header_encoded[hdr_enc_length]; ERR_CHECK_LIQUID(fec_encode(hdr_fec, sizeof(header), header, header_encoded));