From 2856f9df136bb13d2de5a22a11fdf6c6febbee08 Mon Sep 17 00:00:00 2001 From: Aang23 Date: Tue, 23 Feb 2021 19:18:31 +0100 Subject: [PATCH] Few other fixes --- pipelines.json | 2 ++ src-cli/main.cpp | 2 +- src-core/modules/module_oqpsk_demod.cpp | 9 +++++---- src-core/modules/module_oqpsk_demod.h | 1 + src-ui/main.cpp | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pipelines.json b/pipelines.json index db6f46fcf..9521324ef 100644 --- a/pipelines.json +++ b/pipelines.json @@ -65,6 +65,7 @@ "clock_gain_mu": "0.001", "clock_omega_relative_limit": "0.005", "dc_block": "0", + "constellation_scale": "50", "buffer_size": "8192" } }, @@ -266,6 +267,7 @@ "clock_gain_mu": "0.037", "clock_omega_relative_limit": "0.0001", "dc_block": "1", + "constellation_scale": "100", "buffer_size": "8192" } }, diff --git a/src-cli/main.cpp b/src-cli/main.cpp index ddcb029c9..9ce7128a6 100644 --- a/src-cli/main.cpp +++ b/src-cli/main.cpp @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) registerModules(); - loadPipelines("../pipelines.json"); + loadPipelines("pipelines.json"); logger->debug("Registered pipelines :"); for (Pipeline &pipeline : pipelines) diff --git a/src-core/modules/module_oqpsk_demod.cpp b/src-core/modules/module_oqpsk_demod.cpp index 4840bc8f8..d9c2825f5 100644 --- a/src-core/modules/module_oqpsk_demod.cpp +++ b/src-core/modules/module_oqpsk_demod.cpp @@ -18,7 +18,8 @@ OQPSKDemodModule::OQPSKDemodModule(std::string input_file, std::string output_fi d_clock_gain_omega(std::stof(parameters["clock_gain_omega"])), d_clock_mu(std::stof(parameters["clock_mu"])), d_clock_gain_mu(std::stof(parameters["clock_gain_mu"])), - d_clock_omega_relative_limit(std::stof(parameters["clock_omega_relative_limit"])) + d_clock_omega_relative_limit(std::stof(parameters["clock_omega_relative_limit"])), + d_const_scale(std::stof(parameters["constellation_scale"])) { if (parameters["baseband_format"] == "i16") { @@ -128,8 +129,8 @@ void OQPSKDemodModule::process() for (int i = 0; i < dat_size; i++) { - sym_buffer[i * 2] = clamp(rec_buffer2[i].imag() * 50); - sym_buffer[i * 2 + 1] = clamp(rec_buffer2[i].real() * 50); + sym_buffer[i * 2] = clamp(rec_buffer2[i].imag() * d_const_scale); + sym_buffer[i * 2 + 1] = clamp(rec_buffer2[i].real() * d_const_scale); } data_out.write((char *)sym_buffer, dat_size * 2); @@ -359,7 +360,7 @@ std::string OQPSKDemodModule::getID() std::vector OQPSKDemodModule::getParameters() { - return {"samplerate", "symbolrate", "agc_rate", "rrc_alpha", "rrc_taps", "costas_bw", "iq_invert", "buffer_size", "clock_gain_omega", "clock_mu", "clock_gain_mu", "clock_omega_relative_limit", "baseband_format"}; + return {"samplerate", "symbolrate", "agc_rate", "rrc_alpha", "rrc_taps", "costas_bw", "iq_invert", "buffer_size", "clock_gain_omega", "clock_mu", "clock_gain_mu", "clock_omega_relative_limit", "constellation_scale", "baseband_format"}; } std::shared_ptr OQPSKDemodModule::getInstance(std::string input_file, std::string output_file_hint, std::map parameters) diff --git a/src-core/modules/module_oqpsk_demod.h b/src-core/modules/module_oqpsk_demod.h index 4418d8e48..d22a80939 100644 --- a/src-core/modules/module_oqpsk_demod.h +++ b/src-core/modules/module_oqpsk_demod.h @@ -30,6 +30,7 @@ protected: const float d_loop_bw; const int d_buffer_size; const bool d_dc_block; + const float d_const_scale; const float d_clock_gain_omega; const float d_clock_mu; diff --git a/src-ui/main.cpp b/src-ui/main.cpp index dfa6b903e..c1cbf7923 100644 --- a/src-ui/main.cpp +++ b/src-ui/main.cpp @@ -114,7 +114,7 @@ int main(int argc, char *argv[]) registerModules(); - loadPipelines("../pipelines.json"); + loadPipelines("pipelines.json"); logger->debug("Registered pipelines :"); for (Pipeline &pipeline : pipelines) @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) ImGui_ImplGlfw_InitForOpenGL(window, true); ImGui_ImplOpenGL3_Init("#version 150"); - style::setDarkStyle(".."); + style::setDarkStyle("."); if (processing) processThreadPool.push([&](int) { process(downlink_pipeline, input_level, input_file, output_level, output_file, parameters); });