VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-10-08 16:21:03 -04:00
Code Issues Projects Releases Wiki Activity

TestSource: period and duty cycle for the P1 and P2 patterns

Browse Source 
The sawtooth and square patterns had a fixed 1000 sample pulse width. Both
now take a period, and the square pattern a duty cycle, from the GUI, a
preset or the web API, with the period shown in seconds beside the sample
count.

A period of zero divides by zero in the sawtooth and wraps the unsigned
sample counter in the square pattern, giving a cycle of four billion
samples, so it is refused at every entrance: a minimum of one on the spin
box, a clamp when an older or hand edited preset is read, a clamp on the
web API, and a clamp in the worker for anything that reaches it another
way. The duty cycle is held to 0 to 100 the same way.

Also fixes the worker's timer. It is now parented to the worker so that it
moves to the worker thread with it, and it runs between startWork and
stopWork rather than from construction. TestSourceInput::stop() runs in
another thread, and Qt will not stop a timer from one, so the stop is
asked of the worker and waited for. The m_running flag it replaces is
gone, along with the test of it in every tick.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Jon Beniston
2026-09-11 19:42:07 +01:00
co-authored by Claude Opus 5
parent 37310ab984
commit d7bc4a94e4
9 changed files with 265 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/testsource/testsourceworker.cpp
+40 -40
View File
@@ -29,7 +29,6 @@
TestSourceWorker::TestSourceWorker(SampleSinkFifo* sampleFifo, QObject* parent) :
QObject(parent),
m_running(false),
m_buf(0),
m_bufsize(0),
m_chunksize(0),
@@ -42,6 +41,7 @@ TestSourceWorker::TestSourceWorker(SampleSinkFifo* sampleFifo, QObject* parent)
m_fmDeviationUnit(0.0f),
m_fmPhasor(0.0f),
m_pulseWidth(150),
m_period(2000),
m_pulseSampleCount(0),
m_pulsePatternCount(0),
m_pulsePatternCycle(8),
@@ -62,31 +62,32 @@ TestSourceWorker::TestSourceWorker(SampleSinkFifo* sampleFifo, QObject* parent)
m_frequency(435*1000),
m_fcPosShift(0),
m_throttlems(TESTSOURCE_THROTTLE_MS),
m_timer(this),
m_throttleToggle(false),
m_histoCounter(0)
{
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick()));
m_timer.setTimerType(Qt::PreciseTimer);
m_timer.start(50);
}
TestSourceWorker::~TestSourceWorker()
{
m_timer.stop();
qDebug("TestSourceWorker::~TestSourceWorker");
stopWork();
disconnect(&m_timer, SIGNAL(timeout()), this, SLOT(tick()));
}
void TestSourceWorker::startWork()
{
qDebug("TestSourceWorker::startWork");
m_running = true;
m_timer.start(50);
}
void TestSourceWorker::stopWork()
{
qDebug("TestSourceWorker::stopWork");
m_running = false;
m_timer.stop();
}
void TestSourceWorker::setSamplerate(int samplerate)
@@ -316,7 +317,7 @@ void TestSourceWorker::generate(quint32 chunksize)
m_buf[i++] = 0;
}
if (m_pulseSampleCount < 2*m_pulseWidth - 1) {
if (m_pulseSampleCount < m_period - 1) {
m_pulseSampleCount++;
} else {
m_pulseSampleCount = 0;
@@ -366,39 +367,36 @@ void TestSourceWorker::callback(const qint16* buf, qint32 len)
void TestSourceWorker::tick()
{
if (m_running)
{
qint64 throttlems = m_elapsedTimer.restart();
qint64 throttlems = m_elapsedTimer.restart();
std::map<int,int>::iterator it;
it = m_timerHistogram.find(throttlems);
std::map<int,int>::iterator it;
it = m_timerHistogram.find(throttlems);
if (it == m_timerHistogram.end()) {
m_timerHistogram[throttlems] = 1;
} else {
it->second++;
}
if (m_histoCounter < 49) {
m_histoCounter++;
} else {
// qDebug("TestSourceWorker::tick: -----------");
// for (std::map<int,int>::iterator it = m_timerHistogram.begin(); it != m_timerHistogram.end(); ++it) {
// qDebug("TestSourceWorker::tick: %d: %d", it->first, it->second);
// }
m_histoCounter = 0;
}
if ((throttlems > 45) && (throttlems < 55) && (throttlems != m_throttlems))
{
QMutexLocker mutexLocker(&m_mutex);
m_throttlems = throttlems;
m_chunksize = 4 * ((m_samplerate * (m_throttlems+(m_throttleToggle ? 1 : 0))) / 1000);
m_throttleToggle = !m_throttleToggle;
}
generate(m_chunksize);
if (it == m_timerHistogram.end()) {
m_timerHistogram[throttlems] = 1;
} else {
it->second++;
}
if (m_histoCounter < 49) {
m_histoCounter++;
} else {
// qDebug("TestSourceWorker::tick: -----------");
// for (std::map<int,int>::iterator it = m_timerHistogram.begin(); it != m_timerHistogram.end(); ++it) {
// qDebug("TestSourceWorker::tick: %d: %d", it->first, it->second);
// }
m_histoCounter = 0;
}
if ((throttlems > 45) && (throttlems < 55) && (throttlems != m_throttlems))
{
QMutexLocker mutexLocker(&m_mutex);
m_throttlems = throttlems;
m_chunksize = 4 * ((m_samplerate * (m_throttlems+(m_throttleToggle ? 1 : 0))) / 1000);
m_throttleToggle = !m_throttleToggle;
}
generate(m_chunksize);
}
void TestSourceWorker::handleInputMessages()
@@ -414,14 +412,16 @@ void TestSourceWorker::setPattern0()
m_pulsePatternPlaces = 3;
}
void TestSourceWorker::setPattern1()
void TestSourceWorker::setPattern1(int period)
{
m_pulseWidth = 1000;
m_pulseWidth = period < 1 ? 1 : period;
m_pulseSampleCount = 0;
}
void TestSourceWorker::setPattern2()
void TestSourceWorker::setPattern2(int period, int dutyCycle)
{
m_pulseWidth = 1000;
m_period = period < 1 ? 1 : period;
dutyCycle = dutyCycle < 0 ? 0 : dutyCycle > 100 ? 100 : dutyCycle;
m_pulseWidth = m_period * (dutyCycle / 100.0f);
m_pulseSampleCount = 0;
}