From be7b402c9585f8a598a19acfe7b35216902c69f1 Mon Sep 17 00:00:00 2001 From: Brumi-2021 <86470699+Brumi-2021@users.noreply.github.com> Date: Mon, 30 Oct 2023 11:32:34 +0100 Subject: [PATCH] Adding raw data stream BPSK - QPSK (#1534) * Adding raw data stream BPSK - QPSK * minor code compact --- firmware/application/apps/ui_siggen.cpp | 8 ++++ firmware/application/apps/ui_siggen.hpp | 23 +++++----- firmware/baseband/proc_siggen.cpp | 56 +++++++++++++++++++++---- 3 files changed, 68 insertions(+), 19 deletions(-) diff --git a/firmware/application/apps/ui_siggen.cpp b/firmware/application/apps/ui_siggen.cpp index 859ad9a3..e34e57d3 100644 --- a/firmware/application/apps/ui_siggen.cpp +++ b/firmware/application/apps/ui_siggen.cpp @@ -87,10 +87,18 @@ SigGenView::SigGenView( &field_stop, &tx_view}); + symfield_tone.hidden(1); // At first launch , by default we are in CW Shape has NO MOD , we are not using Tone modulation. + symfield_tone.set_value(1000); // Default: 1000 Hz options_shape.on_change = [this](size_t, OptionsField::value_t v) { text_shape.set(shape_strings[v]); if (auto_update) update_config(); + if ((v == 0) || (v == 6)) { // In Shapes Options (CW & Pseudo Random Noise) we are not using Tone modulation freq. + symfield_tone.hidden(1); + } else { + symfield_tone.hidden(0); + } + set_dirty(); }; options_shape.set_selected_index(0); text_shape.set(shape_strings[0]); diff --git a/firmware/application/apps/ui_siggen.hpp b/firmware/application/apps/ui_siggen.hpp index 7ee37bd2..1541426b 100644 --- a/firmware/application/apps/ui_siggen.hpp +++ b/firmware/application/apps/ui_siggen.hpp @@ -58,15 +58,16 @@ class SigGenView : public View { app_settings::SettingsManager settings_{ "tx_siggen", app_settings::Mode::TX}; - const std::string shape_strings[7] = { - "CW-just carrier", - "Sine signal ", - "Triangle signal", - "Saw up signal ", - "Saw down signal", - "Square signal ", - "Noise signal " // using 16 bits LFSR register, 16 order polynomial feedback. - }; + const std::string shape_strings[9] = { + "CW (No mod.) ", + "Sine mod. FM", + "Triangle mod.FM", // max 15 character text space. + "Saw up mod. FM", + "Saw down mod.FM", + "Square mod. FM", + "Pseudo Noise FM", // using 16 bits LFSR register, 16 order polynomial feedback. + "BPSK 0,1,0,1...", + "QPSK 00-01-10.."}; bool auto_update{false}; @@ -86,7 +87,9 @@ class SigGenView : public View { {&bitmap_sig_saw_up, 3}, {&bitmap_sig_saw_down, 4}, {&bitmap_sig_square, 5}, - {&bitmap_sig_noise, 6}}}; + {&bitmap_sig_noise, 6}, + {&bitmap_sig_noise, 7}, // Pending to add a correct BPSK icon. + {&bitmap_sig_noise, 8}}}; // Pending to add a correct QPSK icon. Text text_shape{ {15 * 8, 4 + 10, 15 * 8, 16}, diff --git a/firmware/baseband/proc_siggen.cpp b/firmware/baseband/proc_siggen.cpp index c27b3298..c743d315 100644 --- a/firmware/baseband/proc_siggen.cpp +++ b/firmware/baseband/proc_siggen.cpp @@ -40,7 +40,7 @@ void SigGenProcessor::execute(const buffer_c8_t& buffer) { if (tone_shape == 0) { // CW - re = 127; + re = 127; // max. signed 8 bits value . (-128 ...+127), max. amplitude , static phasor at 0º im = 0; } else { if (tone_shape == 1) { @@ -79,20 +79,58 @@ void SigGenProcessor::execute(const buffer_c8_t& buffer) { if (counter == 15) { counter = 0; } + } else if (tone_shape == 7) { + // Digital BPSK consecutive 0,1,0,...continuous cycle, 1 bit/symbol, at rate of 2 symbols / Freq Tone Periode... without any Pulse shape at the moment . + re = (((tone_phase & 0xFF000000) >> 24) & 0x80) ? 127 : -128; // Sending 2 bits by Periode T of the GUI tone, alternative static phasor to 0, -180º , 0º + im = 0; + } else if (tone_shape == 8) { + // Digital QPSK consecutive 00, 01, 10, 11,00, ...continuous cycle ,2 bits/symbol, at rate of 4 symbols / Freq Tone Periode. not random., without any Pulse shape at the moment . + + switch (((tone_phase & 0xFF000000) >> 24)) { + case 0 ... 63: // equivalent to 1/4 of total 360º degrees. + /* "00" */ + re = (sine_table_i8[32]); // we are sending symbol-phasor 45º during 1/4 of the total periode + im = (sine_table_i8[32 + 64]); // 32 index = rounded (45º/360º * 255 total sin table steps) + break; + + case 64 ... 127: + /* "01" */ + re = (sine_table_i8[96]); // symbol-phasor 135º + im = (sine_table_i8[96 + 64]); // 96 index = 32 + 256/4 + break; + break; + + case 128 ... 191: + /* "10" */ + re = (sine_table_i8[160]); // symbol-phasor 225º + im = (sine_table_i8[160 + 64]); // 160 index = 96 + 256/4 + break; + + case 192 ... 255: + /* "11" */ + re = (sine_table_i8[224]); // symbol-phasor 315º , (315/360) * 255 + im = (sine_table_i8[224 + 64]); + break; + + default: + break; + } } - if (tone_shape < 6) { // we are in periodic signals, we need tone phases update. - tone_phase += tone_delta; + if (tone_shape != 6) { //(all except Pseudo Random White Noise). We are in (1):periodic signals or (2):BPSK/QPSK , in both cases ,we need Tone updated acum sum phases to modulate in FM / or control phasor phase (BPSK & QPSK.) + tone_phase += tone_delta; // In periodic signals(Sine/triangle/square) we are using to FM mod. in BPSK-QSPK we are using to calculate each 1/4 of the periode. } - // Do FM modulation - delta = sample * fm_delta; + if (tone_shape < 7) { // All Option shape signals except BPSK(7) & QPSK(8) we are modulating in FM. (Those two has phase shift modulation XPSK , not FM ) + // Do FM modulation + delta = sample * fm_delta; - phase += delta; - sphase = phase + (64 << 24); + phase += delta; + sphase = phase + (64 << 24); - re = (sine_table_i8[(sphase & 0xFF000000) >> 24]); - im = (sine_table_i8[(phase & 0xFF000000) >> 24]); + re = (sine_table_i8[(sphase & 0xFF000000) >> 24]); // sin LUT is not dealing with decimals , output range [-128 ,...127] + im = (sine_table_i8[(phase & 0xFF000000) >> 24]); + } } buffer.p[i] = {re, im};