From e317a0bbea6c1bb0216f1517263d11232a0ec515 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 12 Mar 2018 09:18:21 +0100 Subject: [PATCH] DSD demod: GUI scope simplification (4) --- Readme.md | 2 +- plugins/channelrx/demoddsd/dsddemodgui.ui | 985 ++++++++++++---------- 2 files changed, 534 insertions(+), 453 deletions(-) diff --git a/Readme.md b/Readme.md index 6559dfa3d..014d269dc 100644 --- a/Readme.md +++ b/Readme.md @@ -117,7 +117,7 @@ HackRF is better used with a sampling rate of 4.8 MS/s and above. The 2.4 and 3.

LimeSDR

-

⚠ Source code only. Recent versions of Lime Suite library are crap so official support cannot be maintained. You can still compile the plugins from source and see for yourself

+

⚠ Source code only. Due to instability of recent versions of Lime Suite the "official" support cannot be maintained. You can still compile the plugins from source and see for yourself

[LimeSDR](https://myriadrf.org/projects/limesdr/) and its smaller clone LimeSDR Mini are supported using LimeSuite library (see next). diff --git a/plugins/channelrx/demoddsd/dsddemodgui.ui b/plugins/channelrx/demoddsd/dsddemodgui.ui index cf4a3f097..3c8758fb0 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.ui +++ b/plugins/channelrx/demoddsd/dsddemodgui.ui @@ -6,8 +6,8 @@ 0 0 - 686 - 414 + 610 + 392 @@ -18,7 +18,7 @@ - 686 + 610 0 @@ -39,7 +39,7 @@ 0 0 - 684 + 608 172 @@ -51,7 +51,7 @@ - 684 + 608 0 @@ -131,6 +131,48 @@ + + + + RFBW + + + + + + + Bandwidth (kHz) before discriminator + + + 500 + + + 1 + + + 100 + + + Qt::Horizontal + + + + + + + + 35 + 0 + + + + 0.00 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -144,210 +186,6 @@ - - - - - 0 - 0 - - - - - 35 - 0 - - - - - 16777215 - 16777215 - - - - Baud rate: 2.4k: NXDN48, dPMR 4.8k: DMR, D-Star, YSF, NXDN96 - - - - 2.4k - - - - - 4.8k - - - - - - - - - 110 - 0 - - - - - 16777215 - 25 - - - - - DejaVu Sans Mono - 9 - - - - Synchronized on this frame type - - - QFrame::Box - - - QFrame::Sunken - - - 2 - - - No Sync______ - - - - - - - true - - - Symbol PLL toggle (green: PLL locked) - - - ... - - - - :/unlocked.png - :/locked.png:/unlocked.png - - - true - - - true - - - - - - - - 25 - 0 - - - - Symbol synchronization rate (%) - - - 000 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 25 - 0 - - - - Zero crossing relative position in number of samples (<0 sampling point lags, >0 it leads) - - - -00 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Enable cosine filtering - - - - - - - :/dsb.png:/dsb.png - - - - - - - Toggle between transition constellation and symbol synchronization displays - - - - - - - :/constellation.png - :/slopep_icon.png:/constellation.png - - - true - - - - - - - - 25 - 0 - - - - Carrier relative position (%) when synchronized - - - -00 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 25 - 0 - - - - Carrier input level (%) when synchronized - - - 000 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -415,133 +253,7 @@ - - - - - RFBW - - - - - - - Bandwidth (kHz) before discriminator - - - 500 - - - 1 - - - 100 - - - Qt::Horizontal - - - - - - - - 40 - 0 - - - - 00.0k - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 10 - 0 - - - - - - - - - - - Gain - - - - - - - - 0 - 0 - - - - Gain after discriminator - - - 50 - - - 400 - - - 1 - - - 100 - - - Qt::Horizontal - - - - - - - - 35 - 0 - - - - 0.00 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - + @@ -596,119 +308,6 @@ - - - - - - - - FMd - - - - - - - Maximum frequency deviation (kHz) - - - 500 - - - 1 - - - 50 - - - Qt::Horizontal - - - - - - - - 40 - 0 - - - - 00.0k - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - TDMA slot1 or FDMA unique slot voice on/off - - - - - - - :/slot1_off.png - :/slot1_on.png:/slot1_off.png - - - true - - - - - - - TDMA slot2 voice on/off - - - - - - - :/slot2_off.png - :/slot2_on.png:/slot2_off.png - - - true - - - - - - - Split TDMA channels on left (slot 1) and right (slot 2) audio stereo channels or merge as mono - - - - - - - :/mono.png - :/stereo.png:/mono.png - - - true - - - @@ -816,6 +415,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -931,13 +543,13 @@ 10 180 - 218 - 218 + 600 + 210 - 210 + 600 210 @@ -964,6 +576,475 @@ + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 10 + 10 + 59 + 20 + + + + + 0 + 0 + + + + + 35 + 0 + + + + + 16777215 + 16777215 + + + + Baud rate: 2.4k: NXDN48, dPMR 4.8k: DMR, D-Star, YSF, NXDN96 + + + + 2.4k + + + + + 4.8k + + + + + + + 80 + 10 + 110 + 25 + + + + + 110 + 0 + + + + + 16777215 + 25 + + + + + DejaVu Sans Mono + 9 + + + + Synchronized on this frame type + + + QFrame::Box + + + QFrame::Sunken + + + 2 + + + No Sync______ + + + + + true + + + + 200 + 10 + 23 + 22 + + + + Symbol PLL toggle (green: PLL locked) + + + ... + + + + :/unlocked.png + :/locked.png:/unlocked.png + + + true + + + true + + + + + + 10 + 40 + 25 + 28 + + + + + 25 + 0 + + + + Symbol synchronization rate (%) + + + 000 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 40 + 40 + 25 + 28 + + + + + 25 + 0 + + + + Zero crossing relative position in number of samples (<0 sampling point lags, >0 it leads) + + + -00 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 80 + 40 + 23 + 22 + + + + Enable cosine filtering + + + + + + + :/dsb.png:/dsb.png + + + + + + 110 + 40 + 25 + 28 + + + + + 25 + 0 + + + + Carrier relative position (%) when synchronized + + + -00 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 150 + 40 + 25 + 28 + + + + + 25 + 0 + + + + Carrier input level (%) when synchronized + + + 000 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 70 + 23 + 22 + + + + Toggle between transition constellation and symbol synchronization displays + + + + + + + :/constellation.png + :/slopep_icon.png:/constellation.png + + + true + + + + + + 50 + 105 + 115 + 16 + + + + Maximum frequency deviation (kHz) + + + 500 + + + 1 + + + 50 + + + Qt::Horizontal + + + + + + 10 + 100 + 25 + 29 + + + + FMd + + + + + + 180 + 100 + 40 + 29 + + + + + 40 + 0 + + + + 00.0k + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 130 + 28 + 30 + + + + Gain + + + + + + 50 + 135 + 115 + 16 + + + + + 0 + 0 + + + + Gain after discriminator + + + 50 + + + 400 + + + 1 + + + 100 + + + Qt::Horizontal + + + + + + 180 + 130 + 40 + 30 + + + + + 40 + 0 + + + + 00.0k + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 40 + 70 + 23 + 22 + + + + TDMA slot1 or FDMA unique slot voice on/off + + + + + + + :/slot1_off.png + :/slot1_on.png:/slot1_off.png + + + true + + + + + + 70 + 70 + 23 + 22 + + + + TDMA slot2 voice on/off + + + + + + + :/slot2_off.png + :/slot2_on.png:/slot2_off.png + + + true + + + + + + 100 + 70 + 23 + 22 + + + + Split TDMA channels on left (slot 1) and right (slot 2) audio stereo channels or merge as mono + + + + + + + :/mono.png + :/stereo.png:/mono.png + + + true + + + +