Skip to content

Commit 601ec70

Browse files
committed
ADC: fix stopping single shot acquisition while running not working
- added grtopbock stop comment Signed-off-by: Andrei Popa <andrei.popa@analog.com>
1 parent 3b7d1d2 commit 601ec70

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

gr-util/src/grtopblock.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void GRTopBlock::stop()
152152
Q_EMIT aboutToStop();
153153
running = false;
154154
top->stop();
155-
top->wait(); // ??
155+
top->wait(); // wait for flow to stop and then request rebuild or other actions
156156
Q_EMIT stopped();
157157
}
158158

packages/generic-plugins/plugins/adc/src/adcfftinstrumentcontroller.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,8 @@ void ADCFFTInstrumentController::createFFTSink(AcqTreeNode *node)
300300
setSingleShot(b);
301301
if(b && !m_started) {
302302
Q_EMIT requestStart();
303+
} else if(!b && m_started) {
304+
Q_EMIT requestStop();
303305
}
304306
});
305307
connect(m_ui, &ADCInstrument::requestStart, this, &ADCInstrumentController::requestStart);

packages/generic-plugins/plugins/adc/src/adctimeinstrumentcontroller.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ void ADCTimeInstrumentController::createTimeSink(AcqTreeNode *node)
141141
setSingleShot(b);
142142
if(b && !m_started) {
143143
Q_EMIT requestStart();
144+
} else if(!b && m_started) {
145+
Q_EMIT requestStop();
144146
}
145147
});
146148
connect(m_ui, &ADCInstrument::requestStart, this, &ADCInstrumentController::requestStart);

0 commit comments

Comments
 (0)