Packman Build Service PMBS

dab-mini.changes Changed

qt-dab.changes Changed

dab-mini.spec Changed

qt-dab.spec Changed

_service Changed

_service:download_url:qt-dab-3.5.2.tar.gz/dab-2/Output Deleted

_service:download_url:qt-dab-3.5.2.tar.gz/dab-2/Output/setup-dab-2.exe Deleted

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/pluto-handler/dabFilter.h-xx Deleted

@@ -1,145 +0,0 @@
-
-#
-//
-//	To avoid including the ad9361 library (just because in
-//	Ubuntu 16.04, used for generating an appImage, only
-//	an old version is available, the parameters of a filter
-//	
-//	Fpass     = 1536000 / 2;
-//	Fstop     = Fpass * 1.2;
-//	wnomTX    = 1.6 * Fstop;  // dummy here
-//	wnomRX    = 1536000; // RF bandwidth of analog filter
-//
-//	were extracted and the filter configuration is loaded
-
-//"BWRX 1536000\n"
-const char * dabFilter = "RX 3 GAIN -6 DEC 4\n"
-"-6\n"
-"164\n"
-"130\n"
-"450\n"
-"526\n"
-"846\n"
-"942\n"
-"1096\n"
-"1006\n"
-"860\n"
-"508\n"
-"142\n"
-"-268\n"
-"-534\n"
-"-662\n"
-"-554\n"
-"-298\n"
-"80\n"
-"416\n"
-"634\n"
-"624\n"
-"406\n"
-"18\n"
-"-390\n"
-"-694\n"
-"-758\n"
-"-556\n"
-"-126\n"
-"382\n"
-"798\n"
-"952\n"
-"770\n"
-"280\n"
-"-358\n"
-"-930\n"
-"-1208\n"
-"-1066\n"
-"-504\n"
-"304\n"
-"1090\n"
-"1550\n"
-"1482\n"
-"840\n"
-"-196\n"
-"-1292\n"
-"-2038\n"
-"-2108\n"
-"-1378\n"
-"-10\n"
-"1576\n"
-"2812\n"
-"3170\n"
-"2350\n"
-"434\n"
-"-2082\n"
-"-4376\n"
-"-5518\n"
-"-4726\n"
-"-1634\n"
-"3558\n"
-"10072\n"
-"16704\n"
-"22114\n"
-"25150\n"
-"25150\n"
-"22114\n"
-"16704\n"
-"10072\n"
-"3558\n"
-"-1634\n"
-"-4726\n"
-"-5518\n"
-"-4376\n"
-"-2082\n"
-"434\n"
-"2350\n"
-"3170\n"
-"2812\n"
-"1576\n"
-"-10\n"
-"-1378\n"
-"-2108\n"
-"-2038\n"
-"-1292\n"
-"-196\n"
-"840\n"
-"1482\n"
-"1550\n"
-"1090\n"
-"304\n"
-"-504\n"
-"-1066\n"
-"-1208\n"
-"-930\n"
-"-358\n"
-"280\n"
-"770\n"
-"952\n"
-"798\n"
-"382\n"
-"-126\n"
-"-556\n"
-"-758\n"
-"-694\n"
-"-390\n"
-"18\n"
-"406\n"
-"624\n"
-"634\n"
-"416\n"
-"80\n"
-"-298\n"
-"-554\n"
-"-662\n"
-"-534\n"
-"-268\n"
-"142\n"
-"508\n"
-"860\n"
-"1006\n"
-"1096\n"
-"942\n"
-"846\n"
-"526\n"
-"450\n"
-"130\n"
-"164\n"
-"-6\n";
-

_service:download_url:qt-dab-3.5.2.tar.gz/.travis.yml -> _service:download_url:qt-dab-3.5.3.tar.gz/.travis.yml Changed

_service:download_url:qt-dab-3.5.2.tar.gz/README.md -> _service:download_url:qt-dab-3.5.3.tar.gz/README.md Changed

@@ -33,7 +33,7 @@
 as for the Windows executables, packed into the Windows installer.
 
 ----------------------------------------------------------------------
-Differences 3.5.2 <-> 3.4
+Differences 3.5.3 <-> 3.4
 -----------------------------------------------------------------------
 
 	a. Support for pluto devices,
@@ -44,6 +44,8 @@
 	f. added a "mute" button (moved 2 buttons to technical data)
 	g. also for dabMini an appImage (x64) is availablce.
 
+Version 3.5.3. added - apart from a number of internal changes - color setting to the buttons and scopes.
+
 ------------------------------------------------------------------------
 README FIRST === README FIRST === README FIRST === README FIRST
 ------------------------------------------------------------------
@@ -85,6 +87,7 @@
 * [Features](#features)
 * [Widgets and scopes](#widgets-and-scopes-for-qt-dab)
 * [Presets](#presets-for-qt-dab-dabmini-and-dab-2)
+* [Colors](#Colors-for-Qt-DAB)
 * [History](maintaining-history-for-qt-dab-and-dab-2)
 * [Comment on some settings](#comment-on-some-settings)
 * [Obsolete properties](#obsolete-properties)
@@ -151,7 +154,7 @@
 * ip output: when configured the ip data - if selected - is sent to a specificied ip address (default: 127.0.0.1:8888),
 * TPEG output: when configured the data is sent to a specified ip address,
 * Supports inputs from 
-	- Adalm Pluto
+	- Adalm Pluto,
 	- SDR DAB sticks (RTL2838U or similar), 
 	- HACKRF One, 
 	- Airspy, including Airspy mini,
@@ -236,6 +239,11 @@
 
 ![Qt-DAB with xml input](/qt-dab-scanner.png?raw=true)
 
+Of course, different people have different tastes when it comes to
+colors on a scope.
+
+![Qt-DAB scope](/qt-dab-scope-2.png?raw=true)
+
 ----------------------------------------------------------------------
 Presets for Qt-DAB, dabMini and dab-2
 ----------------------------------------------------------------------
@@ -261,6 +269,34 @@
 clicking any of the mouse buttons) and press the *shift* and the *delete*
 button on the keyboard simultaneously.
 
+----------------------------------------------------------------------
+Colors for Qt-DAB
+----------------------------------------------------------------------
+
+While it has been possible for a long time to set some colors
+to the displays, 3.5.3 colors the various buttons (in total
+there are 18 push buttons, 16 on the main GUI, two on the
+technical data widget).
+Since selecting a color is a matter of taste,
+and setting all buttons to the same
+color seems rather boring, starting in version 3.5.3 there is the possibility
+to set a base color for each button as well as the color for the button text.
+(Dark base colors require light colored text and vice versa).
+
+To ease life a little, selecting a color setting for a button is
+now made easy: right clock with the mouse on the button, and a
+small menu appears on which the color for the button can be
+selected (one of a predefined list), and next a similar menu appears
+for selecting the color of the text on the button.
+
+The settings are saved in the ".ini" file.
+
+For setting the colors on the scopes, right click on the scope. Three
+questions will be asked: what will be the color of the display (background),
+what will be the color of the grid and what will be the color of the curve.
+
+![Qt-DAB with colors](/qt-dab-colors.png?raw=true)
+
 ---------------------------------------------------------------------------
 Maintaining History for Qt-DAB and dab-2
 ---------------------------------------------------------------------------

_service:download_url:qt-dab-3.5.2.tar.gz/correlation-viewer/correlation-viewer.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/correlation-viewer/correlation-viewer.cpp Changed

@@ -24,58 +24,69 @@
 #include	"correlation-viewer.h"
 #include	<QSettings>
 #include	<QColor>
+#include	"color-selector.h"
 
 	correlationViewer::correlationViewer	(RadioInterface	*mr,
 	 QSettings	*s,
 	 RingBuffer<float> *b) {
 QString	colorString	= "black";
-QColor	displayColor;
-QColor	gridColor;
-QColor	curveColor;
-
+bool	brush;
 	this	-> myRadioInterface	= mr;
 	this	-> dabSettings		= s;
 	plotLength			= s -> value ("plotLength",
 	 1000). toInt ();
 	this	-> responseBuffer	= b;
 
-	colorString			= dabSettings -> value ("displaycolor",
+	dabSettings	-> beginGroup ("correlationViewer");
+	colorString	= dabSettings -> value ("displayColor",
 	 "black"). toString();
-	displayColor			= QColor (colorString);
-	colorString			= dabSettings -> value ("gridcolor",
+	displayColor	= QColor (colorString);
+	colorString	= dabSettings -> value ("gridColor",
 	 "white"). toString();
-	gridColor			= QColor (colorString);
-	colorString			= dabSettings -> value ("gridcolor",
+	gridColor	= QColor (colorString);
+	colorString	= dabSettings -> value ("curveColor",
 	 "white"). toString();
-	curveColor = QColor (colorString);
-
+	curveColor	= QColor (colorString);
+	brush		= dabSettings -> value ("brush", 0). toInt () == 1;
+	dabSettings	-> endGroup ();
 	myFrame				= new QFrame;
 	setupUi (this -> myFrame);
 
 	plotgrid			= impulseGrid;
 	plotgrid	-> setCanvasBackground (displayColor);
-	grid			= new QwtPlotGrid;
+	grid		= new QwtPlotGrid;
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid	-> setMajPen (QPen(gridColor, 0, Qt::DotLine));
+	grid		-> setMajPen (QPen(gridColor, 0, Qt::DotLine));
 #else
-	grid	-> setMajorPen (QPen(gridColor, 0, Qt::DotLine));
+	grid		-> setMajorPen (QPen(gridColor, 0, Qt::DotLine));
 #endif
-	grid	-> enableXMin (true);
-	grid	-> enableYMin (true);
+	grid		-> enableXMin (true);
+	grid		-> enableYMin (true);
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid	-> setMinPen (QPen(gridColor, 0, Qt::DotLine));
+	grid		-> setMinPen (QPen(gridColor, 0, Qt::DotLine));
 #else
-	grid	-> setMinorPen (QPen(gridColor, 0, Qt::DotLine));
+	grid		-> setMinorPen (QPen(gridColor, 0, Qt::DotLine));
 #endif
-	grid	-> attach (plotgrid);
+	grid		-> attach (plotgrid);
+
+	lm_picker = new QwtPlotPicker (plotgrid -> canvas ());
+ QwtPickerMachine *lpickerMachine =
+ new QwtPickerClickPointMachine ();
+
+ lm_picker -> setStateMachine (lpickerMachine);
+ lm_picker -> setMousePattern (QwtPlotPicker::MouseSelect1,
+ Qt::RightButton);
+ connect (lm_picker, SIGNAL (selected (const QPointF&)),
+ this, SLOT (rightMouseClick (const QPointF &)));
 
 	spectrumCurve	= new QwtPlotCurve ("");
- 	spectrumCurve	-> setPen (QPen(curveColor));
+ 	spectrumCurve	-> setPen (QPen(curveColor, 2.0));
 	spectrumCurve	-> setOrientation (Qt::Horizontal);
 	spectrumCurve	-> setBaseline	(0);
 	ourBrush	= new QBrush (curveColor);
 	ourBrush	-> setStyle (Qt::Dense3Pattern);
-	spectrumCurve	-> setBrush (*ourBrush);
+	if (brush)
+	 spectrumCurve	-> setBrush (*ourBrush);
 	spectrumCurve	-> attach (plotgrid);
 	plotgrid	-> enableAxis (QwtPlot::yLeft);
 }
@@ -169,3 +180,55 @@
 	return 20 * log10 ((x + 1) / (float)(4 * 512));
 }
 
+void	correlationViewer::rightMouseClick	(const QPointF &point) {
+colorSelector *selector;
+int	index;
+	(void)point;
+	selector		= new colorSelector ("display color");
+	index			= selector -> QDialog::exec ();
+	QString displayColor	= selector -> getColor (index);
+	delete selector;
+	if (index == 0)
+	 return;
+	selector		= new colorSelector ("grid color");
+	index			= selector	-> QDialog::exec ();
+	QString gridColor	= selector	-> getColor (index);
+	delete selector;
+	if (index == 0)
+	 return;
+	selector		= new colorSelector ("curve color");
+	index			= selector	-> QDialog::exec ();
+	QString curveColor	= selector	-> getColor (index);
+	delete selector;
+	if (index == 0)
+	 return;
+
+	dabSettings	-> beginGroup ("correlationViewer");
+	dabSettings	-> setValue ("displayColor", displayColor);
+	dabSettings	-> setValue ("gridColor", gridColor);
+	dabSettings	-> setValue ("curveColor", curveColor);
+	dabSettings	-> endGroup ();
+
+	this		-> displayColor	= QColor (displayColor);
+	this		-> gridColor	= QColor (gridColor);
+	this		-> curveColor	= QColor (curveColor);
+	spectrumCurve	-> setPen (QPen(this -> curveColor, 2.0));
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid		-> setMajPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#else
+	grid		-> setMajorPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#endif
+	grid		-> enableXMin (true);
+	grid		-> enableYMin (true);
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid		-> setMinPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#else
+	grid		-> setMinorPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#endif
+	plotgrid	-> setCanvasBackground (this -> displayColor);
+}
+

_service:download_url:qt-dab-3.5.2.tar.gz/correlation-viewer/correlation-viewer.h -> _service:download_url:qt-dab-3.5.3.tar.gz/correlation-viewer/correlation-viewer.h Changed

_service:download_url:qt-dab-3.5.2.tar.gz/dab-2/dab-2.pro -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-2/dab-2.pro Changed

@@ -10,11 +10,11 @@
 #CONFIG		+= console
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++11
-QMAKE_CFLAGS	+=  -flto -ffast-math
-MAKE_CXXFLAGS	+=  -flto -ffast-math
-#QMAKE_CFLAGS	+=  -g
-#QMAKE_CXXFLAGS	+=  -g
-#QMAKE_LFLAGS	+=  -g
+#QMAKE_CFLAGS	+=  -flto -ffast-math
+#MAKE_CXXFLAGS	+=  -flto -ffast-math
+QMAKE_CFLAGS	+=  -g
+QMAKE_CXXFLAGS	+=  -g
+QMAKE_LFLAGS	+=  -g
 QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
 RC_ICONS	=  dab-2.ico
 RESOURCES	+= resources.qrc
@@ -288,6 +288,7 @@
 #
 CONFIG		+= sdrplay-v2
 CONFIG		+= sdrplay-v3
+CONFIG		+= pluto
 CONFIG		+= rtlsdr
 CONFIG		+= rtl_tcp
 CONFIG		+= hackrf
@@ -370,6 +371,7 @@
 CONFIG		+= airspy
 #CONFIG		+= rtl_tcp
 CONFIG		+= rtlsdr
+CONFIG		+= pluto
 CONFIG		+= sdrplay-v2
 #CONFIG		+= sdrplay-v3
 CONFIG		+= hackrf
@@ -448,6 +450,18 @@
 	FORMS		+= ./devices-dab-2/hackrf-handler/hackrf-widget.ui
 }
 #
+#	pluto
+#
+hackrf {
+	DEFINES		+= HAVE_PLUTO
+	DEPENDPATH	+= ./devices-dab-2/pluto-handler 
+	INCLUDEPATH	+= ./devices-dab-2/pluto-handler 
+	HEADERS		+= ./devices-dab-2/pluto-handler/pluto-handler.h 
+	SOURCES		+= ./devices-dab-2/pluto-handler/pluto-handler.cpp 
+	FORMS		+= ./devices-dab-2/pluto-handler/pluto-widget.ui
+	LIBS		+= -liio -lad9361
+}
+#
 # airspy support
 #
 airspy {

_service:download_url:qt-dab-3.5.2.tar.gz/dab-2/dab-processor.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-2/dab-processor.cpp Changed

@@ -83,6 +83,8 @@
 	avgSignalValue			= 0;
 	avgLocalValue			= 0;
 	counter				= 0;
+	sampleCounter			= 0;
+	nrFrames			= 0;
 	dataBuffer. resize (BUFSIZE);
 	memset (dataBuffer. data (), 0, BUFSIZE * sizeof (float));
 	bufferP				= 0;
@@ -101,6 +103,8 @@
 
 	connect (this, SIGNAL (show_snr (float)),
 	 myRadioInterface, SLOT (show_snr (float)));
+	connect (this, SIGNAL (show_clockErr (int)),
+	 mr, SLOT (show_clockError (int)));
 	connect (this, SIGNAL (setSynced (bool)),
 	 myRadioInterface, SLOT (setSynced (bool)));
 	connect (this, SIGNAL (set_freqOffset (int)),
@@ -122,21 +126,18 @@
 //	the basic interpretation is using an explicit state-based
 //	approach
 
-static int frameCount = 0;
 int	dabProcessor::addSymbol	(std::complex<float> *buffer, int count) {
 int	retValue	= GO_ON;		// default
 
-static	int dabCounter	= 0;
-
 	for (int i = 0; i < count; i ++) {
 	 std::complex<float> symbol = buffer [i];
 	 avgSignalValue	= 0.9999 * avgSignalValue +
-	 0.0001 * jan_abs (symbol);
+	 0.0001 * jan_abs (symbol);
 	 dataBuffer [bufferP] = jan_abs (symbol);
 	 avgLocalValue	+= jan_abs (symbol) -
 	 dataBuffer [(bufferP - 50) & BUFMASK];
 	 bufferP		= (bufferP + 1) & BUFMASK;
-	 dabCounter ++;
+	 sampleCounter ++;
 
 	 if (localCounter < bufferSize)
 	 localBuffer [localCounter ++] = symbol;
@@ -213,6 +214,8 @@
 	 dipValue		= 0;
 	 processorMode 	= END_OF_DIP;
 	 ofdmBufferIndex	= 0;
+	 totalSamples	= 0;
+	 frameCount		= 0;
 	 }
 	 else 
 	 if (dipCnt > T_null + 100) {	// no luck here
@@ -232,21 +235,22 @@
 	 case END_OF_DIP:
 	 ofdmBuffer [ofdmBufferIndex ++] = symbol;
 	 if (ofdmBufferIndex >= T_u) {
-	 int startIndex = phaseSynchronizer. findIndex (ofdmBuffer, 3);
+	 int startIndex =
+	 phaseSynchronizer. findIndex (ofdmBuffer, 3);
 	 if (startIndex < 0) {		// no sync
 	 if (attempts > 5) {
 	 emit No_Signal_Found ();
- processorMode = START;
+ processorMode = START;
 	 break;
- }
+ }
 	 else {
 	 processorMode = LOOKING_FOR_DIP;
 	 break;
 	 }
 	 }
 	 attempts	= 0;	// we made it!!!
-	 dabCounter	= dabCounter - T_u + startIndex;
-	 dabCounter	= T_u - startIndex;
+//	 sampleCounter = sampleCounterCounter - T_u + startIndex;
+	 sampleCounter = T_u - startIndex;
 	 memmove (ofdmBuffer. data (),
 	 &((ofdmBuffer. data ()) [startIndex]),
 (T_u - startIndex) * sizeof (std::complex<float>));
@@ -263,7 +267,7 @@
 	 if (startIndex < 0) {		// no sync
 	 if (attempts > 5) {
 	 emit No_Signal_Found ();
- processorMode = START;
+ processorMode = START;
 	 break;
 	 }
 	 else {
@@ -271,10 +275,18 @@
 	 break;
 	 }
 	 }
+
 	 attempts	= 0;	// we made it!!!
-	 dabCounter	= dabCounter - T_u + startIndex;
-//	 fprintf (stderr, "%d \n", dabCounter);
-	 dabCounter	= T_u - startIndex;
+	 sampleCounter	= sampleCounter - T_u + startIndex;
+	 totalSamples	+= sampleCounter;
+	 frameCount ++;
+	 if (frameCount >= 10) {
+	 show_clockErr (totalSamples - frameCount * 196608);
+ totalSamples = 0;
+ frameCount = 0;
+ }
+	 
+	 sampleCounter	= T_u - startIndex;
 	 memmove (ofdmBuffer. data (),
 	 &((ofdmBuffer. data ()) [startIndex]),
 (T_u - startIndex) * sizeof (std::complex<float>));
@@ -287,6 +299,7 @@
 	 ofdmBuffer [ofdmBufferIndex] = symbol;
 	 if (++ofdmBufferIndex < T_u)
 	 break;
+
 	 my_ofdmDecoder. processBlock_0 (ofdmBuffer);
 	 my_mscHandler. processBlock_0 (ofdmBuffer. data ());
 // Here we look only at the block_0 when we need a coarse
@@ -294,7 +307,7 @@
 	 correctionNeeded = !my_ficHandler. syncReached ();
 	 if (correctionNeeded) {
 	 int correction =
- phaseSynchronizer. estimate_CarrierOffset (ofdmBuffer);
+ phaseSynchronizer. estimate_CarrierOffset (ofdmBuffer);
 	 if (correction != 100) {
 	 coarseOffset = correction * carrierDiff;
 	 totalOffset	+= coarseOffset;
@@ -370,12 +383,12 @@
 	 dipValue	/= T_null;
 	 avg_dipValue	= 0.9 * avg_dipValue + 0.1 * dipValue;
 	 avg_signalValue	= 0.9 * avg_signalValue + 0.1 * avgSignalValue;
-	 if (++frameCount >= 10) {
+	 if (++nrFrames >= 10) {
 	 set_Values (coarseOffset + fineOffset,
 	 avg_dipValue, avg_signalValue);
 	 coarseOffset	= 0;
 	 fineOffset	= 0;
-	 frameCount 	= 0;
+	 nrFrames 	= 0;
 	 float snr = 20 * log10 (avg_signalValue / avg_dipValue);
 	 show_snr (snr);
 	 }

_service:download_url:qt-dab-3.5.2.tar.gz/dab-2/dab-processor.h -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-2/dab-processor.h Changed

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/pluto-handler Added

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/pluto-handler/dabFilter.h Added

@@ -0,0 +1,145 @@
+
+#
+//
+//	To avoid including the ad9361 library (just because in
+//	Ubuntu 16.04, used for generating an appImage, only
+//	an old version is available, the parameters of a filter
+//	
+//	Fpass     = 1536000 / 2;
+//	Fstop     = Fpass * 1.2;
+//	wnomTX    = 1.6 * Fstop;  // dummy here
+//	wnomRX    = 1536000; // RF bandwidth of analog filter
+//
+//	were extracted and the filter configuration is loaded
+
+//"BWRX 1536000\n"
+const char * dabFilter =
+"RX 3 GAIN -12 DEC 4\n"
+"-250\n"
+"296\n"
+"-324\n"
+"458\n"
+"100\n"
+"766\n"
+"652\n"
+"1100\n"
+"936\n"
+"1020\n"
+"618\n"
+"366\n"
+"-146\n"
+"-406\n"
+"-668\n"
+"-578\n"
+"-398\n"
+"26\n"
+"374\n"
+"688\n"
+"704\n"
+"530\n"
+"96\n"
+"-360\n"
+"-766\n"
+"-884\n"
+"-724\n"
+"-248\n"
+"334\n"
+"876\n"
+"1118\n"
+"990\n"
+"458\n"
+"-278\n"
+"-1006\n"
+"-1414\n"
+"-1352\n"
+"-758\n"
+"172\n"
+"1152\n"
+"1798\n"
+"1850\n"
+"1198\n"
+"24\n"
+"-1312\n"
+"-2312\n"
+"-2572\n"
+"-1880\n"
+"-380\n"
+"1490\n"
+"3068\n"
+"3724\n"
+"3038\n"
+"1044\n"
+"-1768\n"
+"-4490\n"
+"-6068\n"
+"-5578\n"
+"-2550\n"
+"2850\n"
+"9794\n"
+"16962\n"
+"22850\n"
+"26166\n"
+"26166\n"
+"22850\n"
+"16962\n"
+"9794\n"
+"2850\n"
+"-2550\n"
+"-5578\n"
+"-6068\n"
+"-4490\n"
+"-1768\n"
+"1044\n"
+"3038\n"
+"3724\n"
+"3068\n"
+"1490\n"
+"-380\n"
+"-1880\n"
+"-2572\n"
+"-2312\n"
+"-1312\n"
+"24\n"
+"1198\n"
+"1850\n"
+"1798\n"
+"1152\n"
+"172\n"
+"-758\n"
+"-1352\n"
+"-1414\n"
+"-1006\n"
+"-278\n"
+"458\n"
+"990\n"
+"1118\n"
+"876\n"
+"334\n"
+"-248\n"
+"-724\n"
+"-884\n"
+"-766\n"
+"-360\n"
+"96\n"
+"530\n"
+"704\n"
+"688\n"
+"374\n"
+"26\n"
+"-398\n"
+"-578\n"
+"-668\n"
+"-406\n"
+"-146\n"
+"366\n"
+"618\n"
+"1020\n"
+"936\n"
+"1100\n"
+"652\n"
+"766\n"
+"100\n"
+"458\n"
+"-324\n"
+"296\n"
+"-250\n";

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/pluto-handler/functions Added

@@ -0,0 +1,25 @@
+__api __pure struct iio_channel * iio_device_find_channel(
+                const struct iio_device *dev, const char *name, bool output);
+__api struct iio_context * iio_create_default_context(void);
+__api struct iio_context * iio_create_local_context(void);
+__api struct iio_context * iio_create_network_context(const char *host);
+__api __pure const char * iio_context_get_name(const struct iio_context *ctx);
+__api __pure unsigned int iio_context_get_devices_count(
+                const struct iio_context *ctx);
+__api __pure struct iio_device * iio_context_find_device(
+                const struct iio_context *ctx, const char *name);
+__api ssize_t iio_channel_attr_write(const struct iio_channel *chn,
+                const char *attr, const char *src);
+__api int iio_device_attr_write_longlong(const struct iio_device *dev,
+                const char *attr, long long val);
+__api struct iio_buffer * iio_device_create_buffer(const struct iio_device *dev,
+                size_t samples_count, bool cyclic);
+__api int iio_buffer_set_blocking_mode(struct iio_buffer *buf, bool blocking);
+__api void iio_buffer_destroy (struct iio_buffer *buf);
+__api void iio_context_destroy(struct iio_context *ctx);
+__api ssize_t iio_buffer_refill(struct iio_buffer *buf);
+__api ptrdiff_t iio_buffer_step(const struct iio_buffer *buf);
+__api void * iio_buffer_end(const struct iio_buffer *buf);
+__api void * iio_buffer_first(const struct iio_buffer *buf,
+                const struct iio_channel *chn);
+

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/pluto-handler/iio.h Added

@@ -0,0 +1,1777 @@
+/*
+ * libiio - Library for interfacing industrial I/O (IIO) devices
+ *
+ * Copyright (C) 2014 Analog Devices, Inc.
+ * Author: Paul Cercueil <paul.cercueil@analog.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * */
+
+/** @file iio.h
+ * @brief Public interface */
+
+#ifndef __IIO_H__
+#define __IIO_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stddef.h>
+
+#if (defined(_WIN32) || defined(__MBED__))
+#ifndef _SSIZE_T_DEFINED
+typedef ptrdiff_t ssize_t;
+#define _SSIZE_T_DEFINED
+#endif
+#else
+#include <sys/types.h>
+#endif
+
+#if defined(_MSC_VER) && (_MSC_VER < 1800) && !defined(__BOOL_DEFINED)
+#undef bool
+#undef false
+#undef true
+#define bool char
+#define false 0
+#define true 1
+#else
+#include <stdbool.h>
+#endif
+
+#if defined(__GNUC__) && !defined(MATLAB_MEX_FILE) && !defined(MATLAB_LOADLIBRARY)
+#ifndef __cnst
+#define __cnst __attribute__((const))
+#endif
+#ifndef __pure
+#define __pure __attribute__((pure))
+#endif
+#define __notused __attribute__((unused))
+#else
+#define __cnst
+#define __pure
+#define __notused
+#endif
+
+#ifdef _WIN32
+# ifdef LIBIIO_EXPORTS
+#	define __api __declspec(dllexport)
+# else
+#	define __api __declspec(dllimport)
+# endif
+#elif __GNUC__ >= 4 && !defined(MATLAB_MEX_FILE) && !defined(MATLAB_LOADLIBRARY)
+# define __api __attribute__((visibility ("default")))
+#else
+# define __api
+#endif
+
+struct iio_context;
+struct iio_device;
+struct iio_channel;
+struct iio_buffer;
+
+struct iio_context_info;
+struct iio_scan_context;
+
+/**
+ * @enum iio_chan_type
+ * @brief IIO channel type
+ *
+ * A IIO channel has a type specifying the type of data associated with the
+ * channel.
+ */
+enum iio_chan_type {
+	IIO_VOLTAGE,
+	IIO_CURRENT,
+	IIO_POWER,
+	IIO_ACCEL,
+	IIO_ANGL_VEL,
+	IIO_MAGN,
+	IIO_LIGHT,
+	IIO_INTENSITY,
+	IIO_PROXIMITY,
+	IIO_TEMP,
+	IIO_INCLI,
+	IIO_ROT,
+	IIO_ANGL,
+	IIO_TIMESTAMP,
+	IIO_CAPACITANCE,
+	IIO_ALTVOLTAGE,
+	IIO_CCT,
+	IIO_PRESSURE,
+	IIO_HUMIDITYRELATIVE,
+	IIO_ACTIVITY,
+	IIO_STEPS,
+	IIO_ENERGY,
+	IIO_DISTANCE,
+	IIO_VELOCITY,
+	IIO_CONCENTRATION,
+	IIO_RESISTANCE,
+	IIO_PH,
+	IIO_UVINDEX,
+	IIO_ELECTRICALCONDUCTIVITY,
+	IIO_COUNT,
+	IIO_INDEX,
+	IIO_GRAVITY,
+	IIO_CHAN_TYPE_UNKNOWN = INT_MAX
+};
+
+/**
+ * @enum iio_modifier
+ * @brief IIO channel modifier
+ *
+ * In a addition to a type a IIO channel can optionally have a channel modifier
+ * further specifying the data type of of the channel.
+ */
+enum iio_modifier {
+	IIO_NO_MOD,
+	IIO_MOD_X,
+	IIO_MOD_Y,
+	IIO_MOD_Z,
+	IIO_MOD_X_AND_Y,
+	IIO_MOD_X_AND_Z,
+	IIO_MOD_Y_AND_Z,
+	IIO_MOD_X_AND_Y_AND_Z,
+	IIO_MOD_X_OR_Y,
+	IIO_MOD_X_OR_Z,
+	IIO_MOD_Y_OR_Z,
+	IIO_MOD_X_OR_Y_OR_Z,
+	IIO_MOD_LIGHT_BOTH,
+	IIO_MOD_LIGHT_IR,
+	IIO_MOD_ROOT_SUM_SQUARED_X_Y,
+	IIO_MOD_SUM_SQUARED_X_Y_Z,
+	IIO_MOD_LIGHT_CLEAR,
+	IIO_MOD_LIGHT_RED,
+	IIO_MOD_LIGHT_GREEN,
+	IIO_MOD_LIGHT_BLUE,
+	IIO_MOD_QUATERNION,
+	IIO_MOD_TEMP_AMBIENT,
+	IIO_MOD_TEMP_OBJECT,
+	IIO_MOD_NORTH_MAGN,
+	IIO_MOD_NORTH_TRUE,
+	IIO_MOD_NORTH_MAGN_TILT_COMP,
+	IIO_MOD_NORTH_TRUE_TILT_COMP,
+	IIO_MOD_RUNNING,
+	IIO_MOD_JOGGING,
+	IIO_MOD_WALKING,
+	IIO_MOD_STILL,
+	IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z,
+	IIO_MOD_I,
+	IIO_MOD_Q,
+	IIO_MOD_CO2,
+	IIO_MOD_VOC,
+	IIO_MOD_LIGHT_UV,
+};
+
+/* ---------------------------------------------------------------------------*/
+/* ------------------------- Scan functions ----------------------------------*/
+/** @defgroup Scan Functions for scanning available contexts
+ * @{
+ * @struct iio_scan_context
+ * @brief The scanning context
+ *
+ * @struct iio_context_info
+ * @brief The information related to a discovered context
+ */
+
+
+/** @brief Create a scan context
+ * @param backend A NULL-terminated string containing the backend to use for
+ * scanning. If NULL, all the available backends are used.
+ * @param flags Unused for now. Set to 0.
+ * @return on success, a pointer to a iio_scan_context structure
+ * @return On failure, NULL is returned and errno is set appropriately */
+__api struct iio_scan_context * iio_create_scan_context(
+		const char *backend, unsigned int flags);
+
+

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/pluto-handler/pluto-handler.cpp Added

@@ -0,0 +1,675 @@
+#
+/*
+ * Copyright (C) 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of dab-2
+ *
+ * dab-2 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * dab-2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with dab-2 if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	<QThread>
+#include	<QSettings>
+#include	<QFileDialog>
+#include	<QTime>
+#include	<QDate>
+#include	<QLabel>
+#include	<QDebug>
+#include	<QFileDialog>
+#include	"pluto-handler.h"
+#include	"xml-filewriter.h"
+#include	"radio.h"
+#include	"dab-processor.h"
+//
+//	Description for the fir-filter is here:
+#include	"ad9361.h"
+
+/* static scratch mem for strings */
+static char tmpstr[64];
+
+/* helper function generating channel names */
+static
+char*	get_ch_name (const char* type, int id) {
+ snprintf (tmpstr, sizeof(tmpstr), "%s%d", type, id);
+ return tmpstr;
+}
+
+static 
+QString get_ch_name (QString type, int id) {
+QString result = type;
+	result. append (QString::number (id));
+	return result;
+}
+
+int	ad9361_set_trx_fir_enable(struct iio_device *dev, int enable) {
+int ret = iio_device_attr_write_bool (dev,
+	 "in_out_voltage_filter_fir_en",
+	 !!enable);
+	if (ret < 0)
+	 ret = iio_channel_attr_write_bool (
+	 iio_device_find_channel(dev, "out", false),
+	 "voltage_filter_fir_en", !!enable);
+	return ret;
+}
+
+int	ad9361_get_trx_fir_enable (struct iio_device *dev, int *enable) {
+bool value;
+
+	int ret = iio_device_attr_read_bool (dev,
+	 "in_out_voltage_filter_fir_en",
+	 &value);
+
+	if (ret < 0)
+	 ret = iio_channel_attr_read_bool (
+	 iio_device_find_channel (dev, "out", false),
+	 "voltage_filter_fir_en", &value);
+	if (!ret)
+	 *enable	= value;
+
+	return ret;
+}
+
+/* finds AD9361 streaming IIO channels */
+bool	plutoHandler::
+	 get_ad9361_stream_ch (struct iio_context *ctx,
+	 struct iio_device *dev,
+	 int chid, struct iio_channel **chn) {
+	(void)ctx;
+ *chn = iio_device_find_channel (dev, get_ch_name ("voltage", chid),
+	 false);
+ if (*chn == nullptr)
+	 *chn = iio_device_find_channel (dev,
+	 get_ch_name ("altvoltage", chid),
+	 false);
+ return *chn != nullptr;
+}
+
+	plutoHandler::plutoHandler (RadioInterface	*mr,
+	 QSettings		*s,
+	 dabProcessor	*base,
+	 QString &recorderVersion):
+	 myFrame (nullptr) {
+struct iio_channel *chn		= nullptr;
+//struct iio_device *phys_dev	= nullptr;
+
+	phys_dev			= nullptr;
+
+	this		-> base		= base;
+	plutoSettings			= s;
+	this	-> recorderVersion	= recorderVersion;
+	setupUi (&myFrame);
+	myFrame. show	();
+
+	this	-> ctx			= nullptr;
+	this	-> rxbuf		= nullptr;
+	this	-> rx0_i		= nullptr;
+	this	-> rx0_q		= nullptr;
+
+	this	-> bw_hz		= PLUTO_RATE;
+	this	-> fs_hz		= PLUTO_RATE;
+	this	-> lo_hz		= 220000000;
+	this	-> rfport		= "A_BALANCED";
+
+	plutoSettings	-> beginGroup ("plutoSettings");
+	bool agcMode	=
+	 plutoSettings -> value ("pluto-agc", 0). toInt () == 1;
+	int gainValue	=
+	 plutoSettings -> value ("pluto-gain", 50). toInt ();
+	debugFlag	=
+	 plutoSettings -> value ("pluto-debug", 0). toInt () == 1;
+	plutoSettings	-> endGroup ();
+
+	if (debugFlag)
+	 debugButton	-> setText ("debug on");
+	if (agcMode) {
+	 agcControl	-> setChecked (true);	
+	 gainControl	-> hide ();
+	}
+	gainControl	-> setValue (gainValue);
+	 
+	state	-> setText ("Looking for context");
+	ctx	= iio_create_default_context ();
+	if (ctx == nullptr) {
+	 if (debugFlag)
+	 fprintf (stderr, "default context failed\n");
+	 ctx = iio_create_local_context ();
+	}
+
+	if (ctx == nullptr) {
+	 if (debugFlag)
+	 fprintf (stderr, "creating local context failed\n");
+	 ctx = iio_create_network_context ("pluto.local");
+	}
+
+	if (ctx == nullptr) {
+	 if (debugFlag)
+	 fprintf (stderr, "creating network context with pluto.local failed\n");
+	 ctx = iio_create_network_context ("192.168.2.1");
+	}
+
+	if (ctx == nullptr) {
+	 fprintf (stderr, "No pluto found, fatal\n");
+	 throw (24);
+	}
+
+	if (debugFlag)
+	 fprintf (stderr, "context name found %s\n",
+	 iio_context_get_name (ctx));
+
+	state	-> setText ("Context created,\n looking for devices");
+	if (iio_context_get_devices_count (ctx) <= 0) {
+	 state -> setText ("no devices found, fatal");
+	 iio_context_destroy	(ctx);
+	 throw (25);
+	}
+
+	rx = iio_context_find_device (ctx, "cf-ad9361-lpc");
+	if (rx == nullptr) {
+	 state -> setText ("No device found");
+	 iio_context_destroy (ctx);
+	 throw (26);
+	}
+
+	contextName	-> setText (iio_context_get_name (ctx));
+	name_of_device	-> setText (iio_device_get_name (rx));
+ state -> setText ("* Configuring AD9361 for streaming\n");
+
+// Configure phy and lo channels
+	if (debugFlag)
+	 fprintf (stderr, "* Acquiring AD9361 phy channel %d\n", 0);
+	phys_dev = iio_context_find_device (ctx, "ad9361-phy");
+	if (phys_dev == nullptr) {
+	 if (debugFlag) 
+	 fprintf (stderr, "no ad9361 found\n");
+	 iio_context_destroy (ctx);
+	 throw (27);
+	}
+

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/pluto-handler/pluto-handler.h Added

@@ -0,0 +1,117 @@
+#
+/*
+ * Copyright (C) 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of dab-2
+ *
+ * dab-2 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * dab-2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with dab-2; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __PLUTO_HANDLER__
+#define	__PLUTO_HANDLER__
+
+#include	<QtNetwork>
+#include <QMessageBox>
+#include <QByteArray>
+#include	<QObject>
+#include	<QFrame>
+#include	<QSettings>
+#include	<atomic>
+#include	<iio.h>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+#include	"ui_pluto-widget.h"
+
+class	xml_fileWriter;
+class	RadioInterface;
+class	dabProcessor;
+
+#ifndef	PLUTO_RATE
+#define	PLUTO_RATE	2100000
+#define	DAB_RATE	2048000
+#define	DIVIDER		1000
+#define	CONV_SIZE	(PLUTO_RATE / DIVIDER)
+#endif
+
+class	plutoHandler: public deviceHandler, public Ui_plutoWidget {
+Q_OBJECT
+public:
+			plutoHandler		(RadioInterface *,
+	 QSettings *,
+	 dabProcessor	*,
+	 QString &);
+ 		~plutoHandler		();
+	bool		restartReader		(int32_t);
+	void		stopReader		();
+	int32_t		getVFOFrequency		();
+	void		resetBuffer		();
+	int16_t		bitDepth		();
+	void		show			();
+	void		hide			();
+	bool		isHidden		();
+	QString		deviceName		();
+	dabProcessor	*base;
+private:
+	QFrame			myFrame;
+	QSettings		*plutoSettings;
+	QString			recorderVersion;
+	FILE			*xmlDumper;
+	xml_fileWriter		*xmlWriter;
+	bool			setup_xmlDump	();
+	void			close_xmlDump	();
+	void			handle_Value	(int, float, float);
+	int			totalOffset;
+	std::atomic<bool>	dumping;
+	void			run		();
+	int32_t			inputRate;
+	int32_t			vfoFrequency;
+	std::atomic<bool>	running;
+	bool			debugFlag;
+// configuration items
+	struct iio_device *phys_dev;
+ int64_t bw_hz; // Analog banwidth in Hz
+ int64_t fs_hz; // Baseband sample rate in Hz
+ int64_t lo_hz; // Local oscillator frequency in Hz
+	bool			get_ad9361_stream_ch (struct iio_context *ctx,
+ struct iio_device *dev,
+ int chid,
+	 struct iio_channel **);
+
+ const char* rfport; // Port name
+ struct iio_channel *lo_channel;
+ struct iio_channel *gain_channel;
+	struct	iio_device	*rx;
+	struct	iio_context	*ctx;
+	struct	iio_channel	*rx0_i;
+	struct	iio_channel	*rx0_q;
+	struct	iio_buffer	*rxbuf;
+	bool			connected;
+	std::complex<float>	convBuffer	[CONV_SIZE + 1];
+	int			convIndex;
+	int16_t			mapTable_int	[DAB_RATE / DIVIDER];
+	float			mapTable_float	[DAB_RATE / DIVIDER];
+
+//
+private slots:
+	void		set_gainControl		(int);
+	void		set_agcControl		(int);
+	void		toggle_debugButton	();
+	void		set_xmlDump		();
+};
+#endif
+

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/pluto-handler/pluto-widget.ui Added

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>plutoWidget</class>
+ <widget class="QWidget" name="plutoWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>324</width>
+ <height>224</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Pluto control</string>
+ </property>
+ <property name="toolTip">
+ <string>Pluto support is experimental. I do not have one so testing was limited.</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="text">
+ <string>agc</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="gainControl">
+ <property name="maximum">
+ <number>73</number>
+ </property>
+ <property name="value">
+ <number>33</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="state">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="toolTip">
+ <string>Experimental interface for Adalm Pluto. No garantees!!</string>
+ </property>
+ <property name="text">
+ <string>Pluto interface</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="contextName">
+ <property name="text">
+ <string>context name</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="name_of_device">
+ <property name="text">
+ <string>device name</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLCDNumber" name="offsetDisplay"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="debugButton">
+ <property name="text">
+ <string>debug off</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="dumpButton">
+ <property name="text">
+ <string>dump</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="serial_number_display">
+ <property name="font">
+ 
+ <pointsize>11</pointsize>
+ 
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/pluto-handler/xx Added

@@ -0,0 +1,129 @@
+"RX 3 GAIN -12 DEC 4\n"
+"-250\n"
+"296\n"
+"-324\n"
+"458\n"
+"100\n"
+"766\n"
+"652\n"
+"1100\n"
+"936\n"
+"1020\n"
+"618\n"
+"366\n"
+"-146\n"
+"-406\n"
+"-668\n"
+"-578\n"
+"-398\n"
+"26\n"
+"374\n"
+"688\n"
+"704\n"
+"530\n"
+"96\n"
+"-360\n"
+"-766\n"
+"-884\n"
+"-724\n"
+"-248\n"
+"334\n"
+"876\n"
+"1118\n"
+"990\n"
+"458\n"
+"-278\n"
+"-1006\n"
+"-1414\n"
+"-1352\n"
+"-758\n"
+"172\n"
+"1152\n"
+"1798\n"
+"1850\n"
+"1198\n"
+"24\n"
+"-1312\n"
+"-2312\n"
+"-2572\n"
+"-1880\n"
+"-380\n"
+"1490\n"
+"3068\n"
+"3724\n"
+"3038\n"
+"1044\n"
+"-1768\n"
+"-4490\n"
+"-6068\n"
+"-5578\n"
+"-2550\n"
+"2850\n"
+"9794\n"
+"16962\n"
+"22850\n"
+"26166\n"
+"26166\n"
+"22850\n"
+"16962\n"
+"9794\n"
+"2850\n"
+"-2550\n"
+"-5578\n"
+"-6068\n"
+"-4490\n"
+"-1768\n"
+"1044\n"
+"3038\n"
+"3724\n"
+"3068\n"
+"1490\n"
+"-380\n"
+"-1880\n"
+"-2572\n"
+"-2312\n"
+"-1312\n"
+"24\n"
+"1198\n"
+"1850\n"
+"1798\n"
+"1152\n"
+"172\n"
+"-758\n"
+"-1352\n"
+"-1414\n"
+"-1006\n"
+"-278\n"
+"458\n"
+"990\n"
+"1118\n"
+"876\n"
+"334\n"
+"-248\n"
+"-724\n"
+"-884\n"
+"-766\n"
+"-360\n"
+"96\n"
+"530\n"
+"704\n"
+"688\n"
+"374\n"
+"26\n"
+"-398\n"
+"-578\n"
+"-668\n"
+"-406\n"
+"-146\n"
+"366\n"
+"618\n"
+"1020\n"
+"936\n"
+"1100\n"
+"652\n"
+"766\n"
+"100\n"
+"458\n"
+"-324\n"
+"296\n"
+"-250\n";

_service:download_url:qt-dab-3.5.2.tar.gz/dab-2/devices-dab-2/sdrplay-handler-v2/sdrplay-handler.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/sdrplay-handler-v2/sdrplay-handler.cpp Changed

_service:download_url:qt-dab-3.5.2.tar.gz/dab-2/main.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-2/main.cpp Changed

_service:download_url:qt-dab-3.5.2.tar.gz/dab-2/radio.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-2/radio.cpp Changed

@@ -83,6 +83,9 @@
 #ifdef	HAVE_LIME
 #include	"lime-handler.h"
 #endif
+#ifdef	HAVE_PLUTO
+#include	"pluto-handler.h"
+#endif
 #include	"ui_technical_data.h"
 #include	"history-handler.h"
 
@@ -153,7 +156,7 @@
 	                                        tiiBuffer (32768),
 	                                        responseBuffer (32768),
 	                                        frameBuffer (2 * 32768),
-        	                                dataBuffer (32768),
+		                                dataBuffer (32768),
 	                                        audioBuffer (8 * 32768),
 	                                        my_spectrumViewer (
 	                                                 this, Si,
@@ -233,10 +236,10 @@
 
 	epgPath		= dabSettings -> value ("epgPath", ""). toString ();
 	filePath	= dabSettings -> value ("filePath", ""). toString ();
-        if ((epgPath != "") && (!epgPath. endsWith ("/")))
-           epgPath = epgPath + "/";
-        if ((filePath != "") && (!filePath. endsWith ("/")))
-           filePath = filePath + "/";
+	if ((epgPath != "") && (!epgPath. endsWith ("/")))
+	   epgPath = epgPath + "/";
+	if ((filePath != "") && (!filePath. endsWith ("/")))
+	   filePath = filePath + "/";
 
 /*
  * Experimental:
@@ -256,19 +259,19 @@
 	techData. setupUi (dataDisplay);
 
 	bool    b       =
-                    dabSettings -> value ("motSlides", 0). toInt () == 1;
-        motSlides       = b ? new QLabel () : nullptr;
-        if (motSlides != nullptr)
-           motSlides            -> hide ();
+	            dabSettings -> value ("motSlides", 0). toInt () == 1;
+	motSlides       = b ? new QLabel () : nullptr;
+	if (motSlides != nullptr)
+	   motSlides            -> hide ();
 
 	dataDisplay		->  hide();
 	serviceList. clear ();
-        model . clear ();
-        ensembleDisplay         -> setModel (&model);
+	model . clear ();
+	ensembleDisplay         -> setModel (&model);
 
 	bool showWidget         =
 	                 dabSettings -> value ("showDeviceWidget", 0).
-                                                              toInt () != 0;
+	                                                      toInt () != 0;
 	devicewidgetButton	-> setText (showWidget ? "show" : "hide");
 
 #ifdef	DATA_STREAMER
@@ -302,15 +305,20 @@
 #endif
 //
 	QString historyFile     = QDir::homePath () + "/.qt-history.xml";
-        historyFile             = dabSettings -> value ("history",
-                                                    historyFile). toString ();
-        historyFile             = QDir::toNativeSeparators (historyFile);
-        my_history              = new historyHandler (this, historyFile);
+	historyFile             = dabSettings -> value ("history",
+	                                            historyFile). toString ();
+	historyFile             = QDir::toNativeSeparators (historyFile);
+	my_history              = new historyHandler (this, historyFile);
+
+	connect (my_history, SIGNAL (handle_historySelect (const QString &)),
+	         this, SLOT (handle_historySelect (const QString &)));
+	connect (historyButton, SIGNAL (clicked ()),
+	         this, SLOT (handle_historyButton ()));
+	connect (this, SIGNAL (set_newChannel (int)),
+	         channelSelector, SLOT (setCurrentIndex (int)));
+	connect (this, SIGNAL (set_newPresetIndex (int)),
+	         presetSelector, SLOT (setCurrentIndex (int)));
 
-        connect (my_history, SIGNAL (handle_historySelect (const QString &)),
-                 this, SLOT (handle_historySelect (const QString &)));
-        connect (historyButton, SIGNAL (clicked ()),
-                 this, SLOT (handle_historyButton ()));
 
 //	restore some settings from previous incarnations
 	QString t       =
@@ -359,9 +367,9 @@
 	numberofSeconds		= 0;
 //
 //	timer for scanning
-	signalTimer. setSingleShot (true);
-	signalTimer. setInterval (10000);
-	connect (&signalTimer, SIGNAL (timeout (void)),
+	channelTimer. setSingleShot (true);
+	channelTimer. setInterval (10000);
+	connect (&channelTimer, SIGNAL (timeout (void)),
 	         this, SLOT (No_Signal_Found (void)));
 //
 //	presetTimer
@@ -369,6 +377,12 @@
 	presetTimer. setInterval (switchTime);
 	connect (&presetTimer, SIGNAL (timeout (void)),
 	         this, SLOT (setPresetStation (void)));
+
+//      timer for muting
+	muteTimer. setSingleShot (true);
+	muting          = false;
+	muteDelay       = dabSettings -> value ("muteTime", 2). toInt ();
+
 	currentServiceDescriptor	= nullptr;
 
 //	It is time for some action
@@ -383,6 +397,9 @@
 #ifdef	HAVE_SDRPLAY_V3
 	deviceSelector	-> addItem ("sdrplay-v3");
 #endif
+#ifdef	HAVE_PLUTO
+	deviceSelector	-> addItem ("pluto");
+#endif
 #ifdef	HAVE_RTLSDR
 	deviceSelector	-> addItem ("rtlsdr");
 #endif
@@ -490,18 +507,43 @@
 
 QString RadioInterface::footText () {
 	version			= QString (CURRENT_VERSION);
-        QString versionText = "dab-2- version: " + QString(CURRENT_VERSION);
-        versionText += "Copyright J van Katwijk, J. vanKatwijk@gmail.com\n";
-        versionText += "Rights of Qt, fftw, portaudio, libsamplerate and libsndfile gratefully acknowledged";
-        versionText += "Rights of other contribuants gratefully acknowledged\n";
-        versionText += " Build on: " + QString(__TIMESTAMP__) + QString (" ") + QString (GITHASH);
-        return versionText;
+	QString versionText = "dab-2- version: " + QString(CURRENT_VERSION);
+	versionText += "Copyright J van Katwijk, J. vanKatwijk@gmail.com\n";
+	versionText += "Rights of Qt, fftw, portaudio, libsamplerate and libsndfile gratefully acknowledged";
+	versionText += "Rights of other contribuants gratefully acknowledged\n";
+	versionText += " Build on: " + QString(__TIMESTAMP__) + QString (" ") + QString (GITHASH);
+	return versionText;
 }
 
 	RadioInterface::~RadioInterface() {
 	fprintf (stderr, "radioInterface is deleted\n");
 }
 //
+void	RadioInterface::dumpControlState (QSettings *s) {
+	if (s == nullptr)	// cannot happen
+	   return;
+	QString presetName;
+	
+	if (currentService. valid) {
+	   s	-> setValue ("presetname", currentService. serviceName);
+	}
+	else
+	   s	-> setValue ("presetname", "");
+
+
+	s	-> setValue ("device",
+	                     deviceSelector -> currentText ());
+	s	-> setValue ("channel",
+	                      channelSelector -> currentText());
+	s	-> setValue ("soundchannel",
+	                               streamoutSelector -> currentText());
+	if (inputDevice != nullptr)
+	   s    -> setValue ("devicewidgetButton",
+	                          inputDevice -> isHidden () != 0);
+	s	-> sync();
+}
+
+//
 //	precondition: everything is quiet
 deviceHandler	*RadioInterface::setDevice (const QString &s) {
 QString	file;
@@ -544,20 +586,20 @@
 	else
 #endif
 #ifdef  HAVE_SOAPY
-        if (s == "soapy") {
-           try {
-              inputDevice       = new soapyHandler (this,
+	if (s == "soapy") {
+	   try {
+	      inputDevice       = new soapyHandler (this,
 	                                            dabSettings,
 	                                            my_dabProcessor);
-              showButtons();
-           }
-           catch (int e) {
-              QMessageBox::warning (this, tr ("Warning"),
-                                          tr ("no soapy device found\n"));
-              return nullptr;
-           }
-        }
-        else
+	      showButtons();
+	   }
+	   catch (int e) {

_service:download_url:qt-dab-3.5.2.tar.gz/dab-2/radio.h -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-2/radio.h Changed

@@ -151,10 +151,13 @@
                                                       serviceId, int);
 	QStringList		soundChannels;
 	QTimer			displayTimer;
-	QTimer			signalTimer;
+	QTimer			channelTimer;
 	QTimer			presetTimer;
 	QTimer			startTimer;
+	QTimer			muteTimer;
 	int32_t			numberofSeconds;
+	int			muteDelay;
+	bool			muting;
 	int16_t			ficBlocks;
 	int16_t			ficSuccess;
 	void			connectGUI		();
@@ -172,6 +175,8 @@
 	void			start_audioService	(const QString &);
 	void			start_packetService	(const QString &);
 	void			startScanning		();
+	FILE                    *findScanDump_FileName  ();
+        FILE                    *scanDumpFile;
 	void			stopScanning		(bool);
         void			start_audioDumping      ();
         void			stop_audioDumping       ();
@@ -191,6 +196,18 @@
 	                                                 QString);
         void                    show_MOTlabel           (QByteArray, int,
                                                                   QString);
+	void			hide_for_safety		();
+        void                    show_for_safety         ();
+
+//
+//      short hands
+        void                    new_presetIndex         (int);
+        void                    new_channelIndex        (int);
+
+signals:
+        void                    set_newChannel          (int);
+        void                    set_newPresetIndex      (int);
+
 public slots:
 	void			set_CorrectorDisplay	(int);
 	void			addtoEnsemble		(const QString &, int);
@@ -209,7 +226,7 @@
 	void			changeinConfiguration	();
 	void			newAudio		(int, int);
 //
-	void			setStereo		(int);
+	void			setStereo		(bool);
 	void			set_streamSelector	(int);
 	void			No_Signal_Found		();
 	void			show_motHandling	(bool);
@@ -226,12 +243,13 @@
 	void			stopAnnouncement	(const QString &, int);
 	void			newFrame		(int);
 	void			show_rsCorrections	(int);
+	void			show_clockError		(int);
 //	Somehow, these must be connected to the GUI
 private slots:
 	void			handle_scanButton	();
 	void			handle_audiodumpButton 	();
         void			handle_framedumpButton	();
-        void			handle_rawdumpButton	();
+        void			handle_sourcedumpButton	();
 	void			handle_nextChannelButton();
 	void			handle_prevChannelButton();
 	void			handle_prevServiceButton	();
@@ -252,10 +270,11 @@
 	void			handle_historyButton	();
 	void			TerminateProcess	();
 	void			updateTimeDisplay	();
-	void			signalTimer_out		();
+	void			channel_timeOut		();
 	void			selectChannel		(const QString &);
 	void			selectService		(QModelIndex);
 	void			setPresetStation	();
+	void			handle_muteButton	();
 };
 #endif

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/CMakeLists.txt -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/CMakeLists.txt Changed

@@ -209,7 +209,8 @@
 	)
 
 	set (${objectName}_HDRS
-	     ./dab-maxi/radio.h
+	     ./radio.h
+	     ./color-selector.h
 	     ../dab-processor.h
 	     ../service-description/service-descriptor.h 
 	     ../service-description/audio-descriptor.h 
@@ -302,6 +303,7 @@
 	     ${${objectName}_SRCS}
 	     ./main.cpp
 	     ./radio.cpp
+	     ./color-selector.cpp
 	     ../dab-processor.cpp
 	     ../service-description/audio-descriptor.cpp
 	     ../service-description/data-descriptor.cpp
@@ -381,6 +383,7 @@
 
 	set (${objectName}_MOCS
 	     ./radio.h
+	     ./color-selector.h
 	     ../dab-processor.h
 	     ../includes/output/audio-base.h
 	     ../includes/output/audiosink.h
@@ -648,26 +651,26 @@
 	if (PLUTO)
 	   set (${objectName}_UIS
 	        ${${objectName}_UIS}
-	        ./qt-devices/pluto-handler/pluto-widget.ui
+	        ./qt-devices/pluto-handler-2/pluto-widget.ui
 	   )
 
 	   set (${objectName}_MOCS
 	        ${${objectName}_MOCS}
-	        ./qt-devices/pluto-handler/pluto-handler.h
+	        ./qt-devices/pluto-handler-2/pluto-handler.h
 	   )
 
 	   include_directories (
-	     ./qt-devices/pluto-handler
+	     ./qt-devices/pluto-handler-2
 	   )
 
 	   set ($(objectName)_HDRS
 	        ${${objectName}_HDRS}
-	        ./qt-devices/pluto-handler/pluto-handler.h
+	        ./qt-devices/pluto-handler-2/pluto-handler.h
 	   )
 
 	   set (${objectName}_SRCS
 	        ${${objectName}_SRCS}
-	        ./qt-devices/pluto-handler/pluto-handler.cpp
+	        ./qt-devices/pluto-handler-2/pluto-handler.cpp
 	   )
 
 	   list(APPEND extraLibs -liio)

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/color-scheme Added

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/color-selector.cpp Added

@@ -0,0 +1,63 @@
+#
+/*
+ * Copyright (C) 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	<cstdio>
+#include	<QVBoxLayout>
+#include	"color-selector.h"
+//
+//	Whenever there are two or more sdrplay devices connected
+//	to the computer, the user is asked to make a choice.
+
+	colorSelector::colorSelector	(const QString &topText) {
+	toptext		= new QLabel (this);
+	toptext		-> setText (topText);
+	selectorDisplay	= new QListView (this);
+	QVBoxLayout	*layOut = new QVBoxLayout;
+	layOut		-> addWidget (selectorDisplay);
+	layOut		-> addWidget (toptext);
+	setWindowTitle (tr("color select"));
+	setLayout (layOut);
+
+	colors = QStringList();
+	colors << "colors" << "white" << "black" << "red" <<
+	 "darkRed" << "green" << "darkGreen" << "blue" <<
+	 "darkBlue" << "cyan" << "darkCyan" << "magenta" <<
+	 "darkMagenta" << "yellow" << "darkYellow" <<
+	 "gray" << "darkGray";
+	colorList. setStringList (colors);
+	selectorDisplay	-> setModel (&colorList);
+	connect (selectorDisplay, SIGNAL (clicked (QModelIndex)),
+	 this, SLOT (select_color (QModelIndex)));
+	selectedItem	= -1;
+}
+
+	colorSelector::~colorSelector() {
+}
+
+void	colorSelector::select_color (QModelIndex s) {
+	QDialog::done (s. row());
+}
+
+QString	colorSelector::getColor (int index) {
+	return colors. at (index);
+}
+

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/color-selector.h Added

@@ -0,0 +1,51 @@
+#
+/*
+ * Copyright (C) 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#
+#ifndef	__COLOR_SELECTOR__
+#define	__COLOR_SELECTOR__
+#
+#include	<QDialog>
+#include	<QLabel>
+#include	<QListView>
+#include	<QStringListModel>
+#include	<QStringList>
+#include	<cstdint>
+
+class	colorSelector: public QDialog {
+Q_OBJECT
+public:
+			colorSelector	(const QString &);
+			~colorSelector	();
+	QString		getColor	(int);
+private:
+	QLabel		*toptext;
+	QListView	*selectorDisplay;
+	QStringListModel colorList;
+	QStringList	colors;
+	int16_t		selectedItem;
+private slots:
+void	select_color	(QModelIndex);
+};
+
+#endif
+

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-dab.pro -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-dab.pro Changed

@@ -80,6 +80,7 @@
 
 # Input
 HEADERS += ./radio.h \
+	   ./color-selector.h \
 	   ../dab-processor.h \
 	   ../service-description/service-descriptor.h \
 	   ../service-description/audio-descriptor.h \
@@ -185,6 +186,7 @@
 
 SOURCES += ./main.cpp \
 	   ./radio.cpp \
+	   ./color-selector.cpp \
 	   ../dab-processor.cpp \
 	   ../service-description/audio-descriptor.cpp \
 	   ../service-description/data-descriptor.cpp \
@@ -300,7 +302,7 @@
 CONFIG		+= airspy
 CONFIG		+= hackrf
 CONFIG		+= lime
-#CONFIG		+= soapy
+CONFIG		+= soapy
 CONFIG		+= pluto
 
 CONFIG		+= faad
@@ -317,7 +319,7 @@
 #CONFIG		+= qt-audio
 #comment both out if you just want to use the "normal" way
 
-#CONFIG		+= try-epg		# do not use
+CONFIG		+= try-epg		# do not use
 CONFIG		+= PC
 #CONFIG		+= RPI
 #DEFINES	+= SHOW_MISSING
@@ -369,10 +371,10 @@
 	CONFIG		+= rtl_tcp
 	CONFIG		+= dabstick
 	CONFIG		+= sdrplay-v2
-	CONFIG		+= pluto
 	CONFIG		+= sdrplay-v3
 	CONFIG		+= hackrf
 	CONFIG		+= lime
+	CONFIG		+= pluto-2
 	CONFIG		+= NO_SSE
 #
 #	end of 32/64 specifics
@@ -532,7 +534,17 @@
 	HEADERS		+= ./qt-devices/pluto-handler/pluto-handler.h
 	SOURCES		+= ./qt-devices/pluto-handler/pluto-handler.cpp
 	FORMS		+= ./qt-devices/pluto-handler/pluto-widget.ui
-	LIBS		+= -liio 
+	LIBS		+= -liio -lad9361
+}
+
+pluto-2	{
+	DEFINES		+= HAVE_PLUTO
+	QT		+= network
+	INCLUDEPATH	+= ./qt-devices/pluto-handler-2
+	HEADERS		+= ./qt-devices/pluto-handler-2/dabFilter.h
+	HEADERS		+= ./qt-devices/pluto-handler-2/pluto-handler.h
+	SOURCES		+= ./qt-devices/pluto-handler-2/pluto-handler.cpp
+	FORMS		+= ./qt-devices/pluto-handler-2/pluto-widget.ui
 }
 
 send_datagram {

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler-2 Added

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler-2/dabFilter.h Added

@@ -0,0 +1,145 @@
+
+#
+//
+//	To avoid including the ad9361 library (just because in
+//	Ubuntu 16.04, used for generating an appImage, only
+//	an old version is available, the parameters of a filter
+//	
+//	Fpass     = 1536000 / 2;
+//	Fstop     = Fpass * 1.2;
+//	wnomTX    = 1.6 * Fstop;  // dummy here
+//	wnomRX    = 1536000; // RF bandwidth of analog filter
+//
+//	were extracted and the filter configuration is loaded
+
+const char * dabFilter =
+"RX 3 GAIN -12 DEC 4\n"
+"TX 3 GAIN 0 INT 4\n"
+"924,226\n"
+"-576,-562\n"
+"1276,-78\n"
+"-710,-1344\n"
+"274,-1448\n"
+"-1630,-2816\n"
+"-1662,-3388\n"
+"-3472,-4572\n"
+"-3878,-4970\n"
+"-5114,-5406\n"
+"-5014,-4970\n"
+"-5092,-4288\n"
+"-3978,-2894\n"
+"-2918,-1422\n"
+"-1158,254\n"
+"188,1530\n"
+"1542,2442\n"
+"2056,2602\n"
+"2176,2216\n"
+"1474,1238\n"
+"576,90\n"
+"-602,-1064\n"
+"-1406,-1800\n"
+"-1894,-2046\n"
+"-1678,-1654\n"
+"-1062,-838\n"
+"-32,234\n"
+"904,1174\n"
+"1626,1768\n"
+"1752,1782\n"
+"1378,1266\n"
+"486,332\n"
+"-522,-690\n"
+"-1432,-1520\n"
+"-1840,-1848\n"
+"-1688,-1598\n"
+"-916,-798\n"
+"166,280\n"
+"1282,1318\n"
+"1988,1950\n"
+"2084,1966\n"
+"1436,1306\n"
+"268,168\n"
+"-1112,-1118\n"
+"-2202,-2108\n"
+"-2642,-2462\n"
+"-2176,-1982\n"
+"-908,-770\n"
+"852,856\n"
+"2512,2368\n"
+"3518,3244\n"
+"3388,3076\n"
+"2020,1776\n"
+"-354,-408\n"
+"-3066,-2874\n"
+"-5262,-4828\n"
+"-6028,-5460\n"
+"-4708,-4184\n"
+"-1070,-808\n"
+"4560,4360\n"
+"11344,10552\n"
+"18086,16686\n"
+"23502,21604\n"
+"26516,24338\n"
+"26516,24338\n"
+"23502,21604\n"
+"18086,16686\n"
+"11344,10552\n"
+"4560,4360\n"
+"-1070,-808\n"
+"-4708,-4184\n"
+"-6028,-5460\n"
+"-5262,-4828\n"
+"-3066,-2874\n"
+"-354,-408\n"
+"2020,1776\n"
+"3388,3076\n"
+"3518,3244\n"
+"2512,2368\n"
+"852,856\n"
+"-908,-770\n"
+"-2176,-1982\n"
+"-2642,-2462\n"
+"-2202,-2108\n"
+"-1112,-1118\n"
+"268,168\n"
+"1436,1306\n"
+"2084,1966\n"
+"1988,1950\n"
+"1282,1318\n"
+"166,280\n"
+"-916,-798\n"
+"-1688,-1598\n"
+"-1840,-1848\n"
+"-1432,-1520\n"
+"-522,-690\n"
+"486,332\n"
+"1378,1266\n"
+"1752,1782\n"
+"1626,1768\n"
+"904,1174\n"
+"-32,234\n"
+"-1062,-838\n"
+"-1678,-1654\n"
+"-1894,-2046\n"
+"-1406,-1800\n"
+"-602,-1064\n"
+"576,90\n"
+"1474,1238\n"
+"2176,2216\n"
+"2056,2602\n"
+"1542,2442\n"
+"188,1530\n"
+"-1158,254\n"
+"-2918,-1422\n"
+"-3978,-2894\n"
+"-5092,-4288\n"
+"-5014,-4970\n"
+"-5114,-5406\n"
+"-3878,-4970\n"
+"-3472,-4572\n"
+"-1662,-3388\n"
+"-1630,-2816\n"
+"274,-1448\n"
+"-710,-1344\n"
+"1276,-78\n"
+"-576,-562\n"
+"924,226\n";

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler-2/functions Added

@@ -0,0 +1,25 @@
+__api __pure struct iio_channel * iio_device_find_channel(
+                const struct iio_device *dev, const char *name, bool output);
+__api struct iio_context * iio_create_default_context(void);
+__api struct iio_context * iio_create_local_context(void);
+__api struct iio_context * iio_create_network_context(const char *host);
+__api __pure const char * iio_context_get_name(const struct iio_context *ctx);
+__api __pure unsigned int iio_context_get_devices_count(
+                const struct iio_context *ctx);
+__api __pure struct iio_device * iio_context_find_device(
+                const struct iio_context *ctx, const char *name);
+__api ssize_t iio_channel_attr_write(const struct iio_channel *chn,
+                const char *attr, const char *src);
+__api int iio_device_attr_write_longlong(const struct iio_device *dev,
+                const char *attr, long long val);
+__api struct iio_buffer * iio_device_create_buffer(const struct iio_device *dev,
+                size_t samples_count, bool cyclic);
+__api int iio_buffer_set_blocking_mode(struct iio_buffer *buf, bool blocking);
+__api void iio_buffer_destroy (struct iio_buffer *buf);
+__api void iio_context_destroy(struct iio_context *ctx);
+__api ssize_t iio_buffer_refill(struct iio_buffer *buf);
+__api ptrdiff_t iio_buffer_step(const struct iio_buffer *buf);
+__api void * iio_buffer_end(const struct iio_buffer *buf);
+__api void * iio_buffer_first(const struct iio_buffer *buf,
+                const struct iio_channel *chn);
+

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler-2/iio.h Added

@@ -0,0 +1,1777 @@
+/*
+ * libiio - Library for interfacing industrial I/O (IIO) devices
+ *
+ * Copyright (C) 2014 Analog Devices, Inc.
+ * Author: Paul Cercueil <paul.cercueil@analog.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * */
+
+/** @file iio.h
+ * @brief Public interface */
+
+#ifndef __IIO_H__
+#define __IIO_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stddef.h>
+
+#if (defined(_WIN32) || defined(__MBED__))
+#ifndef _SSIZE_T_DEFINED
+typedef ptrdiff_t ssize_t;
+#define _SSIZE_T_DEFINED
+#endif
+#else
+#include <sys/types.h>
+#endif
+
+#if defined(_MSC_VER) && (_MSC_VER < 1800) && !defined(__BOOL_DEFINED)
+#undef bool
+#undef false
+#undef true
+#define bool char
+#define false 0
+#define true 1
+#else
+#include <stdbool.h>
+#endif
+
+#if defined(__GNUC__) && !defined(MATLAB_MEX_FILE) && !defined(MATLAB_LOADLIBRARY)
+#ifndef __cnst
+#define __cnst __attribute__((const))
+#endif
+#ifndef __pure
+#define __pure __attribute__((pure))
+#endif
+#define __notused __attribute__((unused))
+#else
+#define __cnst
+#define __pure
+#define __notused
+#endif
+
+#ifdef _WIN32
+# ifdef LIBIIO_EXPORTS
+#	define __api __declspec(dllexport)
+# else
+#	define __api __declspec(dllimport)
+# endif
+#elif __GNUC__ >= 4 && !defined(MATLAB_MEX_FILE) && !defined(MATLAB_LOADLIBRARY)
+# define __api __attribute__((visibility ("default")))
+#else
+# define __api
+#endif
+
+struct iio_context;
+struct iio_device;
+struct iio_channel;
+struct iio_buffer;
+
+struct iio_context_info;
+struct iio_scan_context;
+
+/**
+ * @enum iio_chan_type
+ * @brief IIO channel type
+ *
+ * A IIO channel has a type specifying the type of data associated with the
+ * channel.
+ */
+enum iio_chan_type {
+	IIO_VOLTAGE,
+	IIO_CURRENT,
+	IIO_POWER,
+	IIO_ACCEL,
+	IIO_ANGL_VEL,
+	IIO_MAGN,
+	IIO_LIGHT,
+	IIO_INTENSITY,
+	IIO_PROXIMITY,
+	IIO_TEMP,
+	IIO_INCLI,
+	IIO_ROT,
+	IIO_ANGL,
+	IIO_TIMESTAMP,
+	IIO_CAPACITANCE,
+	IIO_ALTVOLTAGE,
+	IIO_CCT,
+	IIO_PRESSURE,
+	IIO_HUMIDITYRELATIVE,
+	IIO_ACTIVITY,
+	IIO_STEPS,
+	IIO_ENERGY,
+	IIO_DISTANCE,
+	IIO_VELOCITY,
+	IIO_CONCENTRATION,
+	IIO_RESISTANCE,
+	IIO_PH,
+	IIO_UVINDEX,
+	IIO_ELECTRICALCONDUCTIVITY,
+	IIO_COUNT,
+	IIO_INDEX,
+	IIO_GRAVITY,
+	IIO_CHAN_TYPE_UNKNOWN = INT_MAX
+};
+
+/**
+ * @enum iio_modifier
+ * @brief IIO channel modifier
+ *
+ * In a addition to a type a IIO channel can optionally have a channel modifier
+ * further specifying the data type of of the channel.
+ */
+enum iio_modifier {
+	IIO_NO_MOD,
+	IIO_MOD_X,
+	IIO_MOD_Y,
+	IIO_MOD_Z,
+	IIO_MOD_X_AND_Y,
+	IIO_MOD_X_AND_Z,
+	IIO_MOD_Y_AND_Z,
+	IIO_MOD_X_AND_Y_AND_Z,
+	IIO_MOD_X_OR_Y,
+	IIO_MOD_X_OR_Z,
+	IIO_MOD_Y_OR_Z,
+	IIO_MOD_X_OR_Y_OR_Z,
+	IIO_MOD_LIGHT_BOTH,
+	IIO_MOD_LIGHT_IR,
+	IIO_MOD_ROOT_SUM_SQUARED_X_Y,
+	IIO_MOD_SUM_SQUARED_X_Y_Z,
+	IIO_MOD_LIGHT_CLEAR,
+	IIO_MOD_LIGHT_RED,
+	IIO_MOD_LIGHT_GREEN,
+	IIO_MOD_LIGHT_BLUE,
+	IIO_MOD_QUATERNION,
+	IIO_MOD_TEMP_AMBIENT,
+	IIO_MOD_TEMP_OBJECT,
+	IIO_MOD_NORTH_MAGN,
+	IIO_MOD_NORTH_TRUE,
+	IIO_MOD_NORTH_MAGN_TILT_COMP,
+	IIO_MOD_NORTH_TRUE_TILT_COMP,
+	IIO_MOD_RUNNING,
+	IIO_MOD_JOGGING,
+	IIO_MOD_WALKING,
+	IIO_MOD_STILL,
+	IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z,
+	IIO_MOD_I,
+	IIO_MOD_Q,
+	IIO_MOD_CO2,
+	IIO_MOD_VOC,
+	IIO_MOD_LIGHT_UV,
+};
+
+/* ---------------------------------------------------------------------------*/
+/* ------------------------- Scan functions ----------------------------------*/
+/** @defgroup Scan Functions for scanning available contexts
+ * @{
+ * @struct iio_scan_context
+ * @brief The scanning context
+ *
+ * @struct iio_context_info
+ * @brief The information related to a discovered context
+ */
+
+
+/** @brief Create a scan context
+ * @param backend A NULL-terminated string containing the backend to use for
+ * scanning. If NULL, all the available backends are used.
+ * @param flags Unused for now. Set to 0.
+ * @return on success, a pointer to a iio_scan_context structure
+ * @return On failure, NULL is returned and errno is set appropriately */
+__api struct iio_scan_context * iio_create_scan_context(
+		const char *backend, unsigned int flags);
+
+

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler-2/pluto-handler.cpp Added

@@ -0,0 +1,960 @@
+#
+/*
+ * Copyright (C) 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	<QThread>
+#include	<QSettings>
+#include	<QFileDialog>
+#include	<QTime>
+#include	<QDate>
+#include	<QLabel>
+#include	<QDebug>
+#include	<QFileDialog>
+#include	"pluto-handler.h"
+#include	"xml-filewriter.h"
+//
+//	Description for the fir-filter is here:
+#include	"dabFilter.h"
+
+/* static scratch mem for strings */
+static char tmpstr[64];
+
+/* helper function generating channel names */
+static
+char*	get_ch_name (const char* type, int id) {
+ snprintf (tmpstr, sizeof(tmpstr), "%s%d", type, id);
+ return tmpstr;
+}
+
+int	plutoHandler::
+	ad9361_set_trx_fir_enable (struct iio_device *dev, int enable) {
+int ret = iio_device_attr_write_bool (dev,
+	 "in_out_voltage_filter_fir_en",
+	 !!enable);
+	if (ret < 0)
+	 ret = iio_channel_attr_write_bool (
+	 iio_device_find_channel(dev, "out", false),
+	 "voltage_filter_fir_en", !!enable);
+	return ret;
+}
+
+int	plutoHandler::
+	ad9361_get_trx_fir_enable (struct iio_device *dev, int *enable) {
+bool value;
+
+	int ret = iio_device_attr_read_bool (dev,
+	 "in_out_voltage_filter_fir_en",
+	 &value);
+
+	if (ret < 0)
+	 ret = iio_channel_attr_read_bool (
+	 iio_device_find_channel (dev, "out", false),
+	 "voltage_filter_fir_en", &value);
+	if (!ret)
+	 *enable	= value;
+
+	return ret;
+}
+
+/* returns ad9361 phy device */
+struct iio_device* plutoHandler::get_ad9361_phy (struct iio_context *ctx) {
+struct iio_device *dev = iio_context_find_device (ctx, "ad9361-phy");
+	return dev;
+}
+
+/* finds AD9361 streaming IIO devices */
+bool 	plutoHandler::get_ad9361_stream_dev (struct iio_context *ctx,
+	 enum iodev d, struct iio_device **dev) {
+	switch (d) {
+	case TX:
+	 *dev = iio_context_find_device (ctx, "cf-ad9361-dds-core-lpc");
+	 return *dev != NULL;
+
+	case RX:
+	 *dev = iio_context_find_device (ctx, "cf-ad9361-lpc");
+	 return *dev != NULL;
+
+	default: 
+	 return false;
+	}
+}
+
+/* finds AD9361 streaming IIO channels */
+bool	plutoHandler::get_ad9361_stream_ch (__notused struct iio_context *ctx,
+	 enum iodev d,
+	 struct iio_device *dev,
+	 int chid,
+	 struct iio_channel **chn) {
+	*chn = iio_device_find_channel (dev,
+	 get_ch_name ("voltage", chid),
+	 d == TX);
+	if (!*chn)
+	 *chn = iio_device_find_channel (dev,
+	 get_ch_name ("altvoltage", chid),
+	 d == TX);
+	return *chn != NULL;
+}
+
+/* finds AD9361 phy IIO configuration channel with id chid */
+bool	plutoHandler::get_phy_chan (struct iio_context *ctx,
+	 enum iodev d, int chid, struct iio_channel **chn) {
+	switch (d) {
+	 case RX:
+	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	 get_ch_name ("voltage", chid),
+	 false);
+	 return *chn != NULL;
+
+	 case TX:
+	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	 get_ch_name ("voltage", chid),
+	 true);
+	 return *chn != NULL;
+
+	 default: 
+	 return false;
+	}
+}
+
+/* finds AD9361 local oscillator IIO configuration channels */
+bool	plutoHandler::get_lo_chan (struct iio_context *ctx,
+	 enum iodev d, struct iio_channel **chn) {
+// LO chan is always output, i.e. true
+	switch (d) {
+	 case RX:
+	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	 get_ch_name ("altvoltage", 0),
+	 true);
+	 return *chn != NULL;
+
+	 case TX:
+	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	 get_ch_name ("altvoltage", 1),
+	 true);
+	 return *chn != NULL;
+
+	 default: 
+	 return false;
+	}
+}
+
+/* applies streaming configuration through IIO */
+bool	plutoHandler::cfg_ad9361_streaming_ch (struct iio_context *ctx,
+	 struct stream_cfg *cfg,
+	 enum iodev type, int chid) {
+struct iio_channel *chn = NULL;
+int	ret;
+
+// Configure phy and lo channels
+	printf("* Acquiring AD9361 phy channel %d\n", chid);
+	if (!get_phy_chan (ctx, type, chid, &chn)) {
+	 return false;
+	}
+	ret = iio_channel_attr_write (chn,
+	 "rf_port_select", cfg -> rfport);
+	if (ret < 0)
+	 return false;
+	ret = iio_channel_attr_write_longlong (chn,
+	 "rf_bandwidth", cfg -> bw_hz);
+	ret = iio_channel_attr_write_longlong (chn,
+	 "sampling_frequency",
+	 cfg -> fs_hz);
+
+// Configure LO channel
+	printf("* Acquiring AD9361 %s lo channel\n", type == TX ? "TX" : "RX");
+	if (!get_lo_chan (ctx, type, &chn)) {
+	 return false;
+	}
+	ret = iio_channel_attr_write_longlong (chn,
+	 "frequency", cfg -> lo_hz);
+	return true;
+}
+
+	plutoHandler::plutoHandler (QSettings *s,
+	 QString &recorderVersion):
+	 myFrame (nullptr),
+	 _I_Buffer (4 * 1024 * 1024) {
+	plutoSettings			= s;
+	this	-> recorderVersion	= recorderVersion;
+	setupUi (&myFrame);
+	myFrame. show	();
+

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler-2/pluto-handler.h Added

@@ -0,0 +1,271 @@
+#
+/*
+ * Copyright (C) 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __PLUTO_HANDLER__
+#define	__PLUTO_HANDLER__
+
+#include	<QtNetwork>
+#include <QMessageBox>
+#include <QByteArray>
+#include	<QObject>
+#include	<QFrame>
+#include	<QSettings>
+#include	<atomic>
+#include	<iio.h>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+#include	"ui_pluto-widget.h"
+
+#ifdef __MINGW32__
+#define GETPROCADDRESS GetProcAddress
+#else
+#define GETPROCADDRESS dlsym
+#endif
+
+class	xml_fileWriter;
+
+#ifndef	PLUTO_RATE
+#define	PLUTO_RATE	2100000
+#define	DAB_RATE	2048000
+#define	DIVIDER		1000
+#define	CONV_SIZE	(PLUTO_RATE / DIVIDER)
+#endif
+
+enum iodev { RX, TX };
+
+//
+//	Dll and ".so" function prototypes
+
+typedef struct iio_channel * (*pfn_iio_device_find_channel)(
+ const struct iio_device *dev,
+	 const char *name, bool output);
+typedef struct iio_context * (*pfn_iio_create_default_context)(void);
+typedef struct iio_context * (*pfn_iio_create_local_context) (void);
+typedef struct iio_context * (*pfn_iio_create_network_context)(const char *host);
+typedef const char * (*pfn_iio_context_get_name)(const struct iio_context *ctx);
+typedef unsigned int (*pfn_iio_context_get_devices_count)(
+ const struct iio_context *ctx);
+typedef struct iio_device * (*pfn_iio_context_find_device)(
+ const struct iio_context *ctx,
+	 const char *name);
+typedef void (*pfn_iio_channel_enable)(struct iio_channel *chn);
+
+typedef int (*pfn_iio_device_attr_write_bool)(const struct iio_device *dev,
+ const char *attr, bool val);
+typedef int (*pfn_iio_device_attr_read_bool)(const struct iio_device *dev,
+ const char *attr, bool *val);
+
+typedef int (*pfn_iio_channel_attr_read_bool)(
+	 const struct iio_channel *chn,
+ const char *attr, bool *val);
+typedef int (*pfn_iio_channel_attr_write_bool)(
+	 const struct iio_channel *chn,
+ const char *attr, bool val);
+
+typedef ssize_t (*pfn_iio_channel_attr_write)(
+	 const struct iio_channel *chn,
+ const char *attr,
+	 const char *src);
+typedef int (*pfn_iio_channel_attr_write_longlong)(
+	 const struct iio_channel *chn,
+ const char *attr,
+	 long long val);
+typedef int (*pfn_iio_device_attr_write_longlong)(
+	 const struct iio_device *dev,
+ const char *attr,
+	 long long val);
+typedef ssize_t (*pfn_iio_device_attr_write_raw)(
+	 const struct iio_device *dev,
+ const char *attr,
+	 const void *src, size_t len);
+
+typedef struct iio_buffer * (*pfn_iio_device_create_buffer)(const struct iio_device *dev,
+ size_t samples_count, bool cyclic);
+typedef int (*pfn_iio_buffer_set_blocking_mode)(struct iio_buffer *buf,
+	 bool blocking);
+typedef void (*pfn_iio_buffer_destroy) (struct iio_buffer *buf);
+typedef void (*pfn_iio_context_destroy) (struct iio_context *ctx);
+typedef ssize_t (*pfn_iio_buffer_refill) (struct iio_buffer *buf);
+typedef ptrdiff_t (*pfn_iio_buffer_step) (const struct iio_buffer *buf);
+typedef void * (*pfn_iio_buffer_end)(const struct iio_buffer *buf);
+typedef void * (*pfn_iio_buffer_first)(const struct iio_buffer *buf,
+ const struct iio_channel *chn);
+
+struct stream_cfg {
+ long long bw_hz;
+ long long fs_hz;
+ long long lo_hz;
+ const char *rfport;
+};
+
+class	plutoHandler: public deviceHandler, public Ui_plutoWidget {
+Q_OBJECT
+public:
+			plutoHandler		(QSettings *, QString &);
+ 		~plutoHandler		();
+	void		setVFOFrequency		(int32_t);
+	int32_t		getVFOFrequency		();
+	bool		restartReader		(int32_t);
+	void		stopReader		();
+	int32_t		getSamples		(std::complex<float> *,
+	 int32_t);
+	int32_t		Samples			();
+	void		resetBuffer		();
+	int16_t		bitDepth		();
+
+	void		show			();
+	void		hide			();
+	bool		isHidden		();
+	QString		deviceName		();
+private:
+	bool			loadFunctions	();
+	HINSTANCE		Handle;
+	QFrame			myFrame;
+	RingBuffer<std::complex<float>>	_I_Buffer;
+	QSettings		*plutoSettings;
+	QString			recorderVersion;
+	FILE			*xmlDumper;
+	xml_fileWriter		*xmlWriter;
+	bool			setup_xmlDump	();
+	void			close_xmlDump	();
+	std::atomic<bool>	dumping;
+	bool			filterOn;
+	void			run		();
+	int32_t			inputRate;
+	int32_t			vfoFrequency;
+	std::atomic<bool>	running;
+	bool			debugFlag;
+// configuration items
+
+	struct	iio_device	*rx;
+	struct	iio_context	*ctx;
+	struct	iio_channel	*rx0_i;
+	struct	iio_channel	*rx0_q;
+	struct	iio_buffer	*rxbuf;
+	struct stream_cfg	rx_cfg;
+	bool			connected;
+	std::complex<float>	convBuffer	[CONV_SIZE + 1];
+	int			convIndex;
+	int16_t			mapTable_int	[DAB_RATE / DIVIDER];
+	float			mapTable_float	[DAB_RATE / DIVIDER];
+
+	void			record_gainSettings	(int);
+	void			update_gainSettings	(int);
+	bool			save_gainSettings;
+//
+	int			ad9361_set_trx_fir_enable (
+ struct iio_device *dev,
+	 int enable);
+	int			ad9361_get_trx_fir_enable (
+	 struct iio_device *dev,
+	 int *enable);
+	struct iio_device* 	get_ad9361_phy (struct iio_context *ctx);
+	bool			get_ad9361_stream_dev (
+	 struct iio_context *ctx,
+ enum iodev d,
+	 struct iio_device **dev);
+	bool			get_ad9361_stream_ch (
+	 __notused struct iio_context *ctx,
+ enum iodev d,
+ struct iio_device *dev,
+ int chid,
+ struct iio_channel **chn);
+	bool			get_phy_chan (struct iio_context *ctx,
+ enum iodev d,
+	 int chid,
+	 struct iio_channel **chn);
+	bool			get_lo_chan (struct iio_context *ctx,
+ enum iodev d,

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler-2/pluto-widget.ui Added

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>plutoWidget</class>
+ <widget class="QWidget" name="plutoWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>324</width>
+ <height>224</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Pluto control</string>
+ </property>
+ <property name="toolTip">
+ <string>Pluto support is experimental. I do not have one so testing was limited.</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="text">
+ <string>agc</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="gainControl">
+ <property name="maximum">
+ <number>73</number>
+ </property>
+ <property name="value">
+ <number>33</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="state">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="toolTip">
+ <string>Experimental interface for Adalm Pluto. No garantees!!</string>
+ </property>
+ <property name="text">
+ <string>Pluto interface</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="contextName">
+ <property name="text">
+ <string>context name</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="name_of_device">
+ <property name="text">
+ <string>device name</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="filterButton">
+ <property name="toolTip">
+ <string>The filter button. The pluto has a possibility of loading a filter configuration and enabling (or
+disabling it). By default a filter configuration is loaded and enabled. The text on the button states what the effect of touching it is. If the button text reads &quot;filter on&quot;, it therefore means that the
+filter is disabled, but will be enabled by touching the button.</string>
+ </property>
+ <property name="text">
+ <string>filter</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="debugButton">
+ <property name="text">
+ <string>debug off</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="dumpButton">
+ <property name="text">
+ <string>dump</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="serial_number_display">
+ <property name="font">
+ 
+ <pointsize>11</pointsize>
+ 
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler-2/xx Added

@@ -0,0 +1,130 @@
+RX 3 GAIN -12 DEC 4
+TX 3 GAIN 0 INT 4
+924,226
+-576,-562
+1276,-78
+-710,-1344
+274,-1448
+-1630,-2816
+-1662,-3388
+-3472,-4572
+-3878,-4970
+-5114,-5406
+-5014,-4970
+-5092,-4288
+-3978,-2894
+-2918,-1422
+-1158,254
+188,1530
+1542,2442
+2056,2602
+2176,2216
+1474,1238
+576,90
+-602,-1064
+-1406,-1800
+-1894,-2046
+-1678,-1654
+-1062,-838
+-32,234
+904,1174
+1626,1768
+1752,1782
+1378,1266
+486,332
+-522,-690
+-1432,-1520
+-1840,-1848
+-1688,-1598
+-916,-798
+166,280
+1282,1318
+1988,1950
+2084,1966
+1436,1306
+268,168
+-1112,-1118
+-2202,-2108
+-2642,-2462
+-2176,-1982
+-908,-770
+852,856
+2512,2368
+3518,3244
+3388,3076
+2020,1776
+-354,-408
+-3066,-2874
+-5262,-4828
+-6028,-5460
+-4708,-4184
+-1070,-808
+4560,4360
+11344,10552
+18086,16686
+23502,21604
+26516,24338
+26516,24338
+23502,21604
+18086,16686
+11344,10552
+4560,4360
+-1070,-808
+-4708,-4184
+-6028,-5460
+-5262,-4828
+-3066,-2874
+-354,-408
+2020,1776
+3388,3076
+3518,3244
+2512,2368
+852,856
+-908,-770
+-2176,-1982
+-2642,-2462
+-2202,-2108
+-1112,-1118
+268,168
+1436,1306
+2084,1966
+1988,1950
+1282,1318
+166,280
+-916,-798
+-1688,-1598
+-1840,-1848
+-1432,-1520
+-522,-690
+486,332
+1378,1266
+1752,1782
+1626,1768
+904,1174
+-32,234
+-1062,-838
+-1678,-1654
+-1894,-2046
+-1406,-1800
+-602,-1064
+576,90
+1474,1238
+2176,2216
+2056,2602
+1542,2442
+188,1530
+-1158,254
+-2918,-1422
+-3978,-2894
+-5092,-4288
+-5014,-4970
+-5114,-5406
+-3878,-4970
+-3472,-4572
+-1662,-3388
+-1630,-2816
+274,-1448
+-710,-1344
+1276,-78
+-576,-562
+924,226

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/pluto-handler/dabFilter.h -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler/dabFilter.h Changed

@@ -1,130 +1,145 @@
-const char *dabFilter = "RX 3 GAIN -12 DEC 4\n"
-"BWRX 1536000\n"
-"-180\n"
-"794\n"
-"-258\n"
-"1416\n"
-"574\n"
-"1846\n"
-"1296\n"
-"1930\n"
-"1254\n"
-"1236\n"
-"352\n"
-"4\n"
-"-738\n"
-"-860\n"
-"-1036\n"
-"-626\n"
-"-260\n"
-"390\n"
-"738\n"
-"1006\n"
-"798\n"
-"440\n"
-"-200\n"
-"-696\n"
-"-1068\n"
-"-1000\n"
-"-652\n"
-"22\n"
-"668\n"
-"1180\n"
-"1254\n"
-"930\n"
-"200\n"
-"-620\n"
-"-1326\n"
-"-1576\n"
-"-1308\n"
-"-510\n"
-"520\n"
-"1490\n"
-"1984\n"
-"1830\n"
-"966\n"
-"-326\n"
-"-1664\n"
-"-2528\n"
-"-2582\n"
-"-1674\n"
-"-42\n"
-"1844\n"
-"3306\n"
-"3766\n"
-"2870\n"
-"736\n"
-"-2102\n"
-"-4726\n"
-"-6128\n"
-"-5446\n"
-"-2292\n"
-"3132\n"
-"9984\n"
-"16988\n"
-"22708\n"
-"25920\n"
-"25920\n"
-"22708\n"
-"16988\n"
-"9984\n"
-"3132\n"
-"-2292\n"
-"-5446\n"
-"-6128\n"
-"-4726\n"
-"-2102\n"
-"736\n"
-"2870\n"
-"3766\n"
-"3306\n"
-"1844\n"
-"-42\n"
-"-1674\n"
-"-2582\n"
-"-2528\n"
-"-1664\n"
-"-326\n"
-"966\n"
-"1830\n"
-"1984\n"
-"1490\n"
-"520\n"
-"-510\n"
-"-1308\n"
-"-1576\n"
-"-1326\n"
-"-620\n"
-"200\n"
-"930\n"
-"1254\n"
-"1180\n"
-"668\n"
-"22\n"
-"-652\n"
-"-1000\n"
-"-1068\n"
-"-696\n"
-"-200\n"
-"440\n"
-"798\n"
-"1006\n"
-"738\n"
-"390\n"
-"-260\n"
-"-626\n"
-"-1036\n"
-"-860\n"
-"-738\n"
-"4\n"
-"352\n"
-"1236\n"
-"1254\n"
-"1930\n"
-"1296\n"
-"1846\n"
-"574\n"
-"1416\n"
-"-258\n"
-"794\n"
-"-180\n";
+
+#
+//
+//	To avoid including the ad9361 library (just because in
+//	Ubuntu 16.04, used for generating an appImage, only
+//	an old version is available, the parameters of a filter
+//	
+//	Fpass     = 1536000 / 2;
+//	Fstop     = Fpass * 1.2;
+//	wnomTX    = 1.6 * Fstop;  // dummy here
+//	wnomRX    = 1536000; // RF bandwidth of analog filter
+//
+//	were extracted and the filter configuration is loaded
+
+const char * dabFilter =
+"RX 3 GAIN -12 DEC 4\n"
+"TX 3 GAIN 0 INT 4\n"
+"924,226\n"
+"-576,-562\n"
+"1276,-78\n"
+"-710,-1344\n"
+"274,-1448\n"
+"-1630,-2816\n"
+"-1662,-3388\n"
+"-3472,-4572\n"
+"-3878,-4970\n"
+"-5114,-5406\n"
+"-5014,-4970\n"
+"-5092,-4288\n"
+"-3978,-2894\n"
+"-2918,-1422\n"
+"-1158,254\n"
+"188,1530\n"
+"1542,2442\n"
+"2056,2602\n"
+"2176,2216\n"
+"1474,1238\n"
+"576,90\n"
+"-602,-1064\n"
+"-1406,-1800\n"
+"-1894,-2046\n"
+"-1678,-1654\n"
+"-1062,-838\n"
+"-32,234\n"
+"904,1174\n"
+"1626,1768\n"
+"1752,1782\n"
+"1378,1266\n"
+"486,332\n"
+"-522,-690\n"
+"-1432,-1520\n"
+"-1840,-1848\n"
+"-1688,-1598\n"
+"-916,-798\n"
+"166,280\n"
+"1282,1318\n"
+"1988,1950\n"
+"2084,1966\n"
+"1436,1306\n"
+"268,168\n"
+"-1112,-1118\n"
+"-2202,-2108\n"
+"-2642,-2462\n"
+"-2176,-1982\n"
+"-908,-770\n"
+"852,856\n"
+"2512,2368\n"
+"3518,3244\n"
+"3388,3076\n"

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-handler.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-handler.cpp Changed

@@ -32,7 +32,7 @@
 #include	"xml-filewriter.h"
 //
 //	Description for the fir-filter is here:
-#include	"dabFilter.h"
+#include	"ad9361.h"
 
 /* static scratch mem for strings */
 static char tmpstr[64];
@@ -44,13 +44,6 @@
 return tmpstr;
 }
 
-static 
-QString get_ch_name (QString type, int id) {
-QString result = type;
-	result. append (QString::number (id));
-	return result;
-}
-
 int	ad9361_set_trx_fir_enable(struct iio_device *dev, int enable) {
 int ret = iio_device_attr_write_bool (dev,
 	 "in_out_voltage_filter_fir_en",
@@ -79,30 +72,129 @@
 	return ret;
 }
 
+enum iodev { RX, TX };
+
+/* returns ad9361 phy device */
+static
+struct iio_device* get_ad9361_phy (struct iio_context *ctx) {
+struct iio_device *dev = iio_context_find_device (ctx, "ad9361-phy");
+	return dev;
+}
+
+/* finds AD9361 streaming IIO devices */
+static
+bool get_ad9361_stream_dev (struct iio_context *ctx,
+	 enum iodev d, struct iio_device **dev) {
+	switch (d) {
+	case TX:
+	 *dev = iio_context_find_device (ctx, "cf-ad9361-dds-core-lpc");
+	 return *dev != NULL;
+
+	case RX:
+	 *dev = iio_context_find_device (ctx, "cf-ad9361-lpc");
+	 return *dev != NULL;
+
+	default: 
+	 return false;
+	}
+}
+
 /* finds AD9361 streaming IIO channels */
-bool	plutoHandler::
-	 get_ad9361_stream_ch (struct iio_context *ctx,
-	 struct iio_device *dev,
-	 int chid, struct iio_channel **chn) {
-	(void)ctx;
- *chn = iio_device_find_channel (dev, get_ch_name ("voltage", chid),
-	 false);
- if (*chn == nullptr)
+static
+bool get_ad9361_stream_ch (__notused struct iio_context *ctx,
+	 enum iodev d, struct iio_device *dev,
+	 int chid, struct iio_channel **chn) {
+	*chn = iio_device_find_channel (dev,
+	 get_ch_name ("voltage", chid),
+	 d == TX);
+	if (!*chn)
 	 *chn = iio_device_find_channel (dev,
 	 get_ch_name ("altvoltage", chid),
-	 false);
- return *chn != nullptr;
+	 d == TX);
+	return *chn != NULL;
+}
+
+/* finds AD9361 phy IIO configuration channel with id chid */
+static
+bool	get_phy_chan (struct iio_context *ctx,
+	 enum iodev d, int chid, struct iio_channel **chn) {
+	switch (d) {
+	 case RX:
+	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	 get_ch_name ("voltage", chid),
+	 false);
+	 return *chn != NULL;
+
+	 case TX:
+	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	 get_ch_name ("voltage", chid),
+	 true);
+	 return *chn != NULL;
+
+	 default: 
+	 return false;
+	}
+}
+
+/* finds AD9361 local oscillator IIO configuration channels */
+static
+bool	get_lo_chan (struct iio_context *ctx,
+	 enum iodev d, struct iio_channel **chn) {
+// LO chan is always output, i.e. true
+	switch (d) {
+	 case RX:
+	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	 get_ch_name ("altvoltage", 0),
+	 true);
+	 return *chn != NULL;
+
+	 case TX:
+	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	 get_ch_name ("altvoltage", 1),
+	 true);
+	 return *chn != NULL;
+
+	 default: 
+	 return false;
+	}
+}
+
+/* applies streaming configuration through IIO */
+bool cfg_ad9361_streaming_ch (struct iio_context *ctx,
+	 struct stream_cfg *cfg,
+	 enum iodev type, int chid) {
+struct iio_channel *chn = NULL;
+int	ret;
+
+// Configure phy and lo channels
+	printf("* Acquiring AD9361 phy channel %d\n", chid);
+	if (!get_phy_chan (ctx, type, chid, &chn)) {
+	 return false;
+	}
+	ret = iio_channel_attr_write (chn,
+	 "rf_port_select", cfg -> rfport);
+	if (ret < 0)
+	 return false;
+	ret = iio_channel_attr_write_longlong (chn,
+	 "rf_bandwidth", cfg -> bw_hz);
+	ret = iio_channel_attr_write_longlong (chn,
+	 "sampling_frequency",
+	 cfg -> fs_hz);
+
+// Configure LO channel
+	printf("* Acquiring AD9361 %s lo channel\n", type == TX ? "TX" : "RX");
+	if (!get_lo_chan (ctx, type, &chn)) {
+	 return false;
+	}
+	ret = iio_channel_attr_write_longlong (chn,
+	 "frequency", cfg -> lo_hz);
+	return true;
 }
 
 	plutoHandler::plutoHandler (QSettings *s,
 	 QString &recorderVersion):
 	 myFrame (nullptr),
 	 _I_Buffer (4 * 1024 * 1024) {
-struct iio_channel *chn		= nullptr;
-//struct iio_device *phys_dev	= nullptr;
-
-	phys_dev			= nullptr;
-
 	plutoSettings			= s;
 	this	-> recorderVersion	= recorderVersion;
 	setupUi (&myFrame);
@@ -113,10 +205,10 @@
 	this	-> rx0_i		= nullptr;
 	this	-> rx0_q		= nullptr;
 
-	this	-> bw_hz		= PLUTO_RATE;
-	this	-> fs_hz		= PLUTO_RATE;
-	this	-> lo_hz		= 220000000;
-	this	-> rfport		= "A_BALANCED";
+	rx_cfg. bw_hz			= 1536000;
+	rx_cfg. fs_hz			= PLUTO_RATE;
+	rx_cfg. lo_hz			= 220000000;
+	rx_cfg. rfport			= "A_BALANCED";
 
 	plutoSettings	-> beginGroup ("plutoSettings");
 	bool agcMode	=
@@ -137,24 +229,19 @@
 	 gainControl	-> hide ();
 	}
 	gainControl	-> setValue (gainValue);
-	 
-	state	-> setText ("Looking for context");
+//
+//	step 1: establish a context
+//
 	ctx	= iio_create_default_context ();
 	if (ctx == nullptr) {
-	 if (debugFlag)
-	 fprintf (stderr, "default context failed\n");
 	 ctx = iio_create_local_context ();
 	}
 
 	if (ctx == nullptr) {

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-handler.h -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-handler.h Changed

@@ -46,6 +46,14 @@
 #define	CONV_SIZE	(PLUTO_RATE / DIVIDER)
 #endif
 
+
+struct stream_cfg {
+ long long bw_hz;
+ long long fs_hz;
+ long long lo_hz;
+ const char *rfport;
+};
+
 class	plutoHandler: public deviceHandler, public Ui_plutoWidget {
 Q_OBJECT
 public:
@@ -82,23 +90,13 @@
 	std::atomic<bool>	running;
 	bool			debugFlag;
 // configuration items
-	struct iio_device *phys_dev;
- int64_t bw_hz; // Analog banwidth in Hz
- int64_t fs_hz; // Baseband sample rate in Hz
- int64_t lo_hz; // Local oscillator frequency in Hz
-	bool			get_ad9361_stream_ch (struct iio_context *ctx,
- struct iio_device *dev,
- int chid,
-	 struct iio_channel **);
 
- const char* rfport; // Port name
- struct iio_channel *lo_channel;
- struct iio_channel *gain_channel;
 	struct	iio_device	*rx;
 	struct	iio_context	*ctx;
 	struct	iio_channel	*rx0_i;
 	struct	iio_channel	*rx0_q;
 	struct	iio_buffer	*rxbuf;
+	struct stream_cfg	rx_cfg;
 	bool			connected;
 	std::complex<float>	convBuffer	[CONV_SIZE + 1];
 	int			convIndex;

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler/xx Added

@@ -0,0 +1,130 @@
+RX 3 GAIN -12 DEC 4
+TX 3 GAIN 0 INT 4
+924,226
+-576,-562
+1276,-78
+-710,-1344
+274,-1448
+-1630,-2816
+-1662,-3388
+-3472,-4572
+-3878,-4970
+-5114,-5406
+-5014,-4970
+-5092,-4288
+-3978,-2894
+-2918,-1422
+-1158,254
+188,1530
+1542,2442
+2056,2602
+2176,2216
+1474,1238
+576,90
+-602,-1064
+-1406,-1800
+-1894,-2046
+-1678,-1654
+-1062,-838
+-32,234
+904,1174
+1626,1768
+1752,1782
+1378,1266
+486,332
+-522,-690
+-1432,-1520
+-1840,-1848
+-1688,-1598
+-916,-798
+166,280
+1282,1318
+1988,1950
+2084,1966
+1436,1306
+268,168
+-1112,-1118
+-2202,-2108
+-2642,-2462
+-2176,-1982
+-908,-770
+852,856
+2512,2368
+3518,3244
+3388,3076
+2020,1776
+-354,-408
+-3066,-2874
+-5262,-4828
+-6028,-5460
+-4708,-4184
+-1070,-808
+4560,4360
+11344,10552
+18086,16686
+23502,21604
+26516,24338
+26516,24338
+23502,21604
+18086,16686
+11344,10552
+4560,4360
+-1070,-808
+-4708,-4184
+-6028,-5460
+-5262,-4828
+-3066,-2874
+-354,-408
+2020,1776
+3388,3076
+3518,3244
+2512,2368
+852,856
+-908,-770
+-2176,-1982
+-2642,-2462
+-2202,-2108
+-1112,-1118
+268,168
+1436,1306
+2084,1966
+1988,1950
+1282,1318
+166,280
+-916,-798
+-1688,-1598
+-1840,-1848
+-1432,-1520
+-522,-690
+486,332
+1378,1266
+1752,1782
+1626,1768
+904,1174
+-32,234
+-1062,-838
+-1678,-1654
+-1894,-2046
+-1406,-1800
+-602,-1064
+576,90
+1474,1238
+2176,2216
+2056,2602
+1542,2442
+188,1530
+-1158,254
+-2918,-1422
+-3978,-2894
+-5092,-4288
+-5014,-4970
+-5114,-5406
+-3878,-4970
+-3472,-4572
+-1662,-3388
+-1630,-2816
+274,-1448
+-710,-1344
+1276,-78
+-576,-562
+924,226

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp Changed

@@ -67,7 +67,6 @@
 	}
 }
 
-
 	sdrplayHandler_v3::sdrplayHandler_v3 (QSettings *s,
 	 QString &recorderVersion):
 	 _I_Buffer (4 * 1024 * 1024),
@@ -98,8 +97,6 @@
 
 	agcMode		=
 	 sdrplaySettings -> value ("sdrplay-agcMode", 0). toInt() != 0;
-	save_gainSettings	=
-	 sdrplaySettings -> value ("save_gainSettings", 1). toInt () != 0;
 	sdrplaySettings	-> endGroup	();
 
 	if (agcMode) {
@@ -171,38 +168,17 @@
 }
 
 bool	sdrplayHandler_v3::restartReader	(int32_t newFreq) {
-int	GRdB	= GRdBSelector -> value ();
-int	lnaState	= lnaGainSetting	-> value ();
-int	agc	= agcControl -> isChecked () ? 1 : 0;
 restartRequest r (newFreq);
 
 if (receiverRuns. load ())
 return true;
 vfoFrequency = newFreq;
-	if (save_gainSettings) {
-	 update_gainSettings (vfoFrequency / MHz (1));
-	 GRdB		= GRdBSelector -> value ();
-	 lnaState	= lnaGainSetting	-> value ();
-	 agc		= agcControl	-> isChecked () ? 1 : 0;
-
-	 GRdBRequest req_1 (GRdB);
- messageHandler (&req_1);
-
-	 lnaRequest req_2 (lnaState);
- messageHandler (&req_2);
- lnaGRdBDisplay -> display (get_lnaGRdB (hwVersion, lnaState));
-
-	 agcRequest req_3 (agcControl -> isChecked (), 30);
- messageHandler (&req_3);
-	}
-	messageHandler (&r);
+	return messageHandler (&r);
 }
 
 void	sdrplayHandler_v3::stopReader	() {
 stopRequest r;
 	close_xmlDump ();
-	if (save_gainSettings)
-	 record_gainSettings (vfoFrequency / MHz (1));
 if (!receiverRuns. load ())
 return;
 messageHandler (&r);
@@ -261,6 +237,7 @@
 
 void	sdrplayHandler_v3::set_ifgainReduction	(int GRdB) {
 GRdBRequest r (GRdB);
+
 	if (!receiverRuns. load ())
 return;
 messageHandler (&r);
@@ -268,6 +245,7 @@
 
 void	sdrplayHandler_v3::set_lnagainReduction (int lnaState) {
 lnaRequest r (lnaState);
+
 	if (!receiverRuns. load ())
 return;
 messageHandler (&r);
@@ -295,8 +273,7 @@
 }
 
 void	sdrplayHandler_v3::set_antennaSelect	(const QString &s) {
-antennaRequest r (s == "Antenna A" ? 'A' : 'B');
- messageHandler (&r);
+//	messageHandler (new antennaRequest (s == "Antenna A" ? 'A' : 'B'));
 }
 
 void	sdrplayHandler_v3::set_xmlDump () {
@@ -394,11 +371,11 @@
 
 bool sdrplayHandler_v3::messageHandler (generalCommand *r) {
 server_queue. push (r);
- serverjobs. release (1);
- while (!r -> waiter. tryAcquire (1, 1000))
- if (!threadRuns. load ())
- return false;
- return true;
+	serverjobs. release (1);
+	while (!r -> waiter. tryAcquire (1, 1000))
+	 if (!threadRuns. load ())
+	 return false;
+	return true;
 }
 
 static
@@ -531,7 +508,8 @@
 	 goto closeAPI;
 }
 
- if (apiVersion < (SDRPLAY_API_VERSION - 0.01)) {
+	if (apiVersion < 3.05) {
+//	if (apiVersion < (SDRPLAY_API_VERSION - 0.01)) {
 fprintf (stderr, "API versions don't match (local=%.2f dll=%.2f)\n",
 SDRPLAY_API_VERSION, apiVersion);
 	 goto closeAPI;
@@ -664,12 +642,15 @@
 	set_antennaSelect_signal (has_antennaSelect);
 	threadRuns. store (true);	// it seems we can do some work
 	successFlag	= true;
+
 	while (threadRuns. load ()) {
 	 while (!serverjobs. tryAcquire (1, 1000))
 	 if (!threadRuns. load ())
 	 goto normal_exit;
-//
+
 //	here we could assert that the server_queue is not empty
+//	Note that we emulate synchronous calling, so
+//	we signal the caller when we are done
 	 switch (server_queue. front () -> cmd) {
 	 case RESTART_REQUEST: {
 	 restartRequest *p = (restartRequest *)(server_queue. front ());
@@ -1030,62 +1011,3 @@
 	return myFrame. isHidden ();
 }
 
-//Experimental
-/////////////////////////////////////////////////////////////////////////
-//
-//	the frequency (the MHz component) is used as key
-//
-void	sdrplayHandler_v3::record_gainSettings (int freq) {
-int	GRdB		= GRdBSelector		-> value ();
-int	lnaState	= lnaGainSetting	-> value ();
-int	agc		= agcControl		-> isChecked () == 1;
-QString theValue	= QString::number (GRdB) + ":";
-
-	theValue. append (QString::number (lnaState));
-	theValue. append (":");
-	theValue. append (QString::number (agc));
-
-	sdrplaySettings -> beginGroup ("sdrplaySettings_v3");
-	sdrplaySettings		-> setValue (QString::number (freq), theValue);
-	sdrplaySettings		-> endGroup ();
-}
-
-void	sdrplayHandler_v3::update_gainSettings (int freq) {
-int	GRdB;
-int	lnaState;
-int	agc;
-QString	theValue	= "";
-
-	sdrplaySettings	-> beginGroup ("sdrplaySettings_v3");
-	theValue	= sdrplaySettings -> value (QString::number (freq), ""). toString ();
-	sdrplaySettings	-> endGroup ();
-
-	if (theValue == QString (""))
-	 return;		// or set some defaults here
-
-	QStringList result	= theValue. split (":");
-	if (result. size () < 3) 	// should not happen
-	 return;
-
-	GRdB		= result. at (0). toInt ();
-	lnaState	= result. at (1). toInt ();
-	agc		= result. at (2). toInt ();
-
-	fprintf (stderr, "for %d values are %d %d %d\n",
-	 freq, GRdB, lnaState, agc);
-	GRdBSelector	-> blockSignals (true);
-	new_GRdBValue (GRdB);
-	while (GRdBSelector -> value () != GRdB)
-	 usleep (1000);
-	GRdBSelector	-> blockSignals (false);
-	lnaGainSetting	-> blockSignals (true);
-	new_lnaValue (lnaState);
-	while (lnaGainSetting -> value () != lnaState)
-	 usleep (1000);
-	lnaGainSetting	-> blockSignals (false);
-	agcControl	-> blockSignals (true);
-	new_agcSetting (agc == 1);
-	while (agcControl -> isChecked () != (agc == 1))
-	 usleep (1000);
-	agcControl	-> blockSignals (false);
-}

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.h -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.h Changed

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/radio.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/radio.cpp Changed

@@ -46,6 +46,7 @@
 #include	"rawfiles.h"
 #include	"wavfiles.h"
 #include	"xml-filereader.h"
+#include	"color-selector.h"
 #include	"dab-tables.h"
 #ifdef	TCP_STREAMER
 #include	"tcp-streamer.h"
@@ -86,9 +87,6 @@
 #ifdef	HAVE_PLUTO
 #include	"pluto-handler.h"
 #endif
-#ifdef	HAVE_PLUTO_2
-#include	"pluto-2.h"
-#endif
 #include	"ui_technical_data.h"
 #include	"spectrum-viewer.h"
 #include	"correlation-viewer.h"
@@ -106,7 +104,6 @@
 	return (foo.QuadPart);
 }
 
-
 bool get_cpu_times (size_t &idle_time, size_t &total_time) {
 FILETIME IdleTime, KernelTime, UserTime;
 size_t	thisIdle, thisKernel, thisUser;
@@ -139,6 +136,34 @@
 }
 #endif
 
+#define	CONTENT_BUTTON		QString ("contentButton")
+#define DETAIL_BUTTON		QString ("detailButton")
+#define	RESET_BUTTON		QString ("resetButton")
+#define SCAN_BUTTON		QString ("scanButton")
+#define	TII_BUTTON		QString ("tiiButton")
+#define	CORRELATION_BUTTON	QString ("correlationButton")
+#define	SPECTRUM_BUTTON		QString ("spectrumButton")
+#define	DEVICEWIDGET_BUTTON	QString ("devicewidgetButton")
+#define	HISTORY_BUTTON		QString ("historyButton")
+#define	DUMP_BUTTON		QString ("dumpButton")
+#define	MUTE_BUTTON		QString ("muteButton")
+#define PREVCHANNEL_BUTTON	QString ("prevChannelButton")
+#define NEXTCHANNEL_BUTTON	QString ("nextChannelButton")
+#define PREVSERVICE_BUTTON	QString ("prevServiceButton")
+#define NEXTSERVICE_BUTTON	QString ("nextServiceButton")
+#define	FRAMEDUMP_BUTTON	QString ("framedumpButton")
+#define	AUDIODUMP_BUTTON	QString ("audiodumpButton")
+static
+void	colorButton (QPushButton *pb, QColor c, int p) {
+QPalette pal = pb	-> palette ();
+	pal. setColor (QPalette::Button, c);
+	pb		-> setAutoFillBackground (true);
+	pb		-> setPalette (pal);
+	QFont font	= pb -> font ();
+	font. setPointSize (p);
+	pb		-> setFont (font);
+}
+
 static
 uint8_t convert (QString s) {
 	if (s == "Mode 1")
@@ -289,12 +314,12 @@
 
 //	Where do we leave the audio out?
 	streamoutSelector	-> hide();
-//#ifdef	TCP_STREAMER
-//	soundOut		= new tcpStreamer	(20040);
-//#elif	QT_AUDIO
-//	soundOut		= new Qt_Audio();
-//#else
-// just sound out
+#ifdef	TCP_STREAMER
+	soundOut		= new tcpStreamer	(20040);
+#elif	QT_AUDIO
+	soundOut		= new Qt_Audio();
+#else
+//	just sound out
 	soundOut		= new audioSink		(latency);
 
 	((audioSink *)soundOut)	-> setupChannels (streamoutSelector);
@@ -309,7 +334,7 @@
 
 	if ((k == -1) || err)
 	   ((audioSink *)soundOut)	-> selectDefaultDevice();
-//#endif
+#endif
 //
 	QString historyFile     = QDir::homePath () + "/.qt-history.xml";
         historyFile             =
@@ -319,8 +344,6 @@
 
         connect (my_history, SIGNAL (handle_historySelect (const QString &)),
                  this, SLOT (handle_historySelect (const QString &)));
-        connect (historyButton, SIGNAL (clicked ()),
-                 this, SLOT (handle_historyButton ()));
 	connect (this, SIGNAL (set_newChannel (int)),
                  channelSelector, SLOT (setCurrentIndex (int)));
         connect (this, SIGNAL (set_newPresetIndex (int)),
@@ -334,10 +357,11 @@
 	theBand. setupChannels  (channelSelector, dabBand);
 
 	QPalette p	= ficError_display -> palette();
-	p. setColor (QPalette::Highlight, Qt::green);
+	p. setColor (QPalette::Highlight, Qt::red);
 	ficError_display		-> setPalette (p);
 	techData. stereoLabel		->
 	                   setStyleSheet ("QLabel {background-color : red}");
+	p. setColor (QPalette::Highlight, Qt::green);
 	techData. frameError_display	-> setPalette (p);
 	techData. rsError_display	-> setPalette (p);
 	techData. aacError_display	-> setPalette (p);
@@ -357,15 +381,52 @@
 	total_ficError		= 0;
 	total_fics		= 0;
 	syncedLabel		->
-	               setStyleSheet ("QLabel {background-color : red; color: white}");
-//	stereoLabel		->
-//	               setStyleSheet ("QLabel {background-color : red}");
+	        setStyleSheet ("QLabel {background-color : red; color: white}");
+	techData. stereoLabel		->
+	        setStyleSheet ("QLabel {background-color : red}");
 
 //
 	connect (streamoutSelector, SIGNAL (activated (int)),
 	         this,  SLOT (set_streamSelector (int)));
 	my_presetHandler. loadPresets (presetFile, presetSelector);
-//	
+//
+//	Connect the buttons for the color_settings
+	connect (contentButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_contentButton (void)));
+	connect (detailButton, SIGNAL (rightClicked ()),
+	         this, SLOT (color_detailButton ()));
+	connect (resetButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_resetButton (void)));
+	connect	(scanButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_scanButton (void)));
+	connect (show_tiiButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_tiiButton (void)));
+	connect (show_correlationButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_correlationButton (void)));
+	connect (show_spectrumButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_spectrumButton (void)));
+        connect (devicewidgetButton, SIGNAL (rightClicked ()),
+                 this, SLOT (color_devicewidgetButton ()));
+        connect (historyButton, SIGNAL (rightClicked ()),
+                 this, SLOT (color_historyButton ()));
+	connect (dumpButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_sourcedumpButton (void)));
+	connect (muteButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_muteButton (void)));
+
+	connect	(prevChannelButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_prevChannelButton (void)));
+	connect (nextChannelButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_nextChannelButton (void)));
+	connect (prevServiceButton, SIGNAL (rightClicked ()),
+                 this, SLOT (color_prevServiceButton ()));
+        connect (nextServiceButton, SIGNAL (rightClicked ()),
+                 this, SLOT (color_nextServiceButton ()));
+
+	connect (techData. framedumpButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_framedumpButton (void)));
+	connect (techData. audiodumpButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_audiodumpButton (void)));
 //	display the version
 	copyrightLabel	-> setToolTip (footText ());
 
@@ -395,6 +456,18 @@
 	muting		= false;
 	muteDelay	= dabSettings -> value ("muteTime", 2). toInt ();
 
+	QPalette *lcdPalette	= new QPalette;
+	lcdPalette	-> setColor (QPalette::Background, Qt::white);
+	lcdPalette	-> setColor (QPalette::Base, Qt::black);
+	snrDisplay	-> setPalette (*lcdPalette);
+	snrDisplay	-> setAutoFillBackground (true);
+	frequencyDisplay	-> setPalette (*lcdPalette);
+	frequencyDisplay	-> setAutoFillBackground (true);
+	cpuMonitor	-> setPalette (*lcdPalette);
+	cpuMonitor	-> setAutoFillBackground (true);
+	correctorDisplay	-> setPalette (*lcdPalette);
+	correctorDisplay	-> setAutoFillBackground (true);
+
 	deviceSelector	-> addItem ("xml files");
 #ifdef	HAVE_SDRPLAY_V2
 	deviceSelector	-> addItem ("sdrplay");
@@ -420,9 +493,6 @@
 #ifdef	HAVE_PLUTO
 	deviceSelector	-> addItem ("pluto");
 #endif
-#ifdef	HAVE_PLUTO_2
-	deviceSelector	-> addItem ("pluto-2");
-#endif
 #ifdef  HAVE_EXTIO
 	deviceSelector	-> addItem ("extio");
 #endif
@@ -438,10 +508,22 @@
 	   deviceSelector       -> setCurrentIndex (k);
 	   inputDevice	= setDevice (deviceSelector -> currentText());

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/radio.h -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/radio.h Changed

@@ -116,7 +116,6 @@
 	dabService		currentService;
 	dabService		nextService;
 
-
 	bool			normalScan;
 	int16_t			tii_delay;
 	int32_t			dataPort;
@@ -151,6 +150,8 @@
 FILE *frameDumper;
 SNDFILE *audioDumper;
 
+	void			set_Colors		();
+	void			set_channelButton	(int);
 	QStandardItemModel	model;
 	std::vector<serviceId>	serviceList;
 	bool			isMember (std::vector<serviceId>,
@@ -174,6 +175,8 @@
 	void			connectGUI		();
 	void			disconnectGUI		();
 
+	void			set_buttonColors	(QPushButton *,
+	 const QString &);
 	QString			footText		();
 	void			cleanScreen		();
 	void			set_picturePath		();
@@ -183,7 +186,7 @@
 	deviceHandler		*setDevice		(const QString &);
 	historyHandler		*my_history;
 //
-	void			start_audioService	(const QString &);
+	void			start_audioService	(audiodata *);
 	void			start_packetService	(const QString &);
 	void			startScanning		();
 	FILE			*findScanDump_FileName	();
@@ -209,7 +212,9 @@
 QString);
 	void			show_MOTlabel		(QByteArray, int,
 QString);
+enum direction {FORWARD, BACKWARDS};
 
+	void			handle_serviceButton	(direction);
 	void			hide_for_safety		();
 	void			show_for_safety		();
 //
@@ -294,6 +299,26 @@
 	void			selectService		(QModelIndex);
 	void			setPresetStation	();
 	void			handle_muteButton	();
+
+//
+//	color handlers
+	void			color_contentButton	();
+	void			color_detailButton	();
+	void			color_resetButton	();
+	void			color_scanButton	();
+	void			color_tiiButton		();
+	void			color_correlationButton	();
+	void			color_spectrumButton	();
+	void			color_devicewidgetButton	();
+	void			color_historyButton	();
+	void			color_sourcedumpButton	();
+	void			color_muteButton	();
+	void			color_prevChannelButton	();
+	void			color_nextChannelButton	();
+	void			color_prevServiceButton	();
+	void			color_nextServiceButton	();
+	void			color_framedumpButton	();
+	void			color_audiodumpButton	();
 };
 #endif

_service:download_url:qt-dab-3.5.2.tar.gz/dab-mini/dab-mini.pro -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-mini/dab-mini.pro Changed

_service:download_url:qt-dab-3.5.2.tar.gz/dab-mini/devices-dab-mini/pluto-handler/pluto-handler.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-mini/devices-dab-mini/pluto-handler/pluto-handler.cpp Changed

@@ -23,7 +23,7 @@
 #include	<QThread>
 #include	<QDebug>
 #include	"pluto-handler.h"
-#include	"dabFilter.h"
+#include	"ad9361.h"
 
 static	bool	debugFlag	= true;
 
@@ -316,18 +316,15 @@
 }
 convIndex = 0;
 
-	int enabled;
-//	go for the filter
-	ad9361_get_trx_fir_enable (phys_dev, &enabled);
-	if (enabled)
-	 ad9361_set_trx_fir_enable (phys_dev, 0);
-	int ret = iio_device_attr_write_raw (phys_dev,
-	 "filter_fir_config",
-	 dabFilter, strlen (dabFilter));
-	if (ret < 0)
-	 fprintf (stderr, "filter mislukt");
-//	and enable it
-	ad9361_set_trx_fir_enable (phys_dev, 1);
+// go for the filter
+ int ret = ad9361_set_bb_rate_custom_filter_manual (phys_dev,
+ PLUTO_RATE,
+ 1540000 / 2,
+ 1.1 * 1540000 / 2,
+ 1536000,
+ 1536000);
+
+
 
 	running. store (false);
 	connected	= true;
@@ -492,8 +489,8 @@
 int	p_inc;
 int	nbytes_rx;
 std::complex<float> localBuf [DAB_RATE / DIVIDER];
-std::complex<int16_t> dumpBuf [DAB_RATE / DIVIDER];
 
+	fprintf (stderr, "we are running\n");
 	running. store (true);
 	while (running. load ()) {
 	 nbytes_rx	= iio_buffer_refill	(rxbuf);
@@ -504,8 +501,6 @@
 	 p_dat < p_end; p_dat += p_inc) {
 	 const int16_t i_p = ((int16_t *)p_dat) [0];
 	 const int16_t q_p = ((int16_t *)p_dat) [1];
-	 std::complex<int16_t>dumpS = std::complex<int16_t> (i_p, q_p);
-	 dumpBuf [convIndex] = dumpS;
 	 std::complex<float>sample = std::complex<float> (i_p / 2048.0,
 	 q_p / 2048.0);
 	 convBuffer [convIndex ++] = sample;
@@ -524,6 +519,7 @@
 	 }
 	 }
 	}
+	fprintf (stderr, "... and stopped\n");
 }
 
 int32_t	plutoHandler::getSamples (std::complex<float> *V, int32_t size) {

_service:download_url:qt-dab-3.5.2.tar.gz/dab-mini/radio.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-mini/radio.cpp Changed

@@ -833,8 +833,10 @@
 	signalTimer. stop ();
 	if (currentService. valid) {
 	   fprintf (stderr, "stopping service\n");
-//	   my_dabProcessor -> reset_Services ();
-	   my_dabProcessor -> stopService (currentService. serviceName);
+	   audiodata ad;
+	   my_dabProcessor -> dataforAudioService (currentService. serviceName,
+	                                                  &ad);
+	   my_dabProcessor -> stopService (&ad);
 	   usleep (1000);
 	   soundOut	-> stop ();
 	   QString serviceName = currentService. serviceName;
@@ -1070,6 +1072,7 @@
 void	RadioInterface::startChannel (const QString &channel) {
 int	tunedFrequency	=
 	         theBand. Frequency (channel);
+	inputDevice		-> restartReader (tunedFrequency);
 	my_dabProcessor		-> start (tunedFrequency);
 	show_for_safety	();
 }
@@ -1090,6 +1093,7 @@
 //
 //	The service(s) - if any - is stopped by halting the dabProcessor
 	my_dabProcessor		-> stop ();
+	inputDevice		-> stopReader ();
 	usleep (1000);
 	currentService. valid	= false;
 	nextService. valid	= false;
@@ -1253,7 +1257,10 @@
 	   return;
 	fprintf (stderr, "stopping second service %s\n",
 	                      secondService. serviceName.toLatin1 (). data ());
-	my_dabProcessor -> stopService (secondService. serviceName);
+	audiodata ad;
+	my_dabProcessor	-> dataforAudioService (secondService. serviceName,
+	                                                      &ad);
+	my_dabProcessor -> stopService (&ad);
 	fclose (frameDumper);
 	frameDumper = nullptr;
 }

_service:download_url:qt-dab-3.5.2.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-processor.cpp Changed

_service:download_url:qt-dab-3.5.2.tar.gz/dab-processor.h -> _service:download_url:qt-dab-3.5.3.tar.gz/dab-processor.h Changed

_service:download_url:qt-dab-3.5.2.tar.gz/docs/qt-dab.pdf -> _service:download_url:qt-dab-3.5.3.tar.gz/docs/qt-dab.pdf Changed

_service:download_url:qt-dab-3.5.2.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-3.5.3.tar.gz/forms/dabradio.ui Changed

@@ -17,7 +17,7 @@
 </sizepolicy>
 </property>
 <property name="windowTitle">
- <string>Qt-DAB-3.5</string>
+ <string>Qt-DAB-3.5.3</string>
 </property>
 <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>
@@ -728,7 +728,7 @@
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;history feature. The software maintains a list of all services encountered. Touching this button will show (hide) the list. By clicking with the left mouse button the software will try to select the service pointed to, by clicking with the ruight mouse button the lit will be deleted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>xx</string>
+ <string>list</string>
 </property>
 </widget>
 </item>
@@ -768,7 +768,7 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to save audio output into a file. First push will show a menu for file selection. Push again to stop recording.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>mute the sound with this button. The default period is 2 minutes, can be set in the &quot;.ini&quot; file</string>
 </property>
 <property name="text">
 <string>mute</string>
@@ -790,7 +790,7 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Decoding of DAB+ audio services results first in the extraction of AAC frames from the input, then conversion of the AAC frames to PCM frames, and then sending these PCM frames to the soundcard. It is possible, already for a long time, to save the PCM frames into a &amp;quot;.wav&amp;quot; file,&lt;/p&gt;&lt;p&gt;It is now also possible to save the AAC frames into a file. Writing AAC frames is under control of this button. Touching it will show a menu for file selection, after selecting a file, the AAC frames will be written to this file, until the button is touched again.&lt;/p&gt;&lt;p&gt;Code for converting the aac headers to ones that can be understood by e.g. VLC is from Stefan Poeschel. All rights gratefully acknowledged&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>This button is not used in this version</string>
 </property>
 <property name="text">
 <string>not used</string>

_service:download_url:qt-dab-3.5.2.tar.gz/forms/technical_data.ui -> _service:download_url:qt-dab-3.5.3.tar.gz/forms/technical_data.ui Changed

@@ -36,14 +36,25 @@
 <item>
 <layout class="QHBoxLayout" name="horizontalLayout_4">
 <item>
- <widget class="smallPushButton" name="frameDumpButton">
+ <widget class="smallPushButton" name="framedumpButton">
+ <property name="toolTip">
+ <string>DAB+ audio services are encoded in an AAC format. Touching this button will show a menu
+with which a file can be selected to store the AAC frames into.
+As usual, touching the button again will close the output file. Programs like vlc can handle such
+files</string>
+ </property>
 <property name="text">
 <string>frame dump</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="smallPushButton" name="audioDumpButton">
+ <widget class="smallPushButton" name="audiodumpButton">
+ <property name="toolTip">
+ <string>The audio output can be saved as a file in uncompressed PCM format. Touching this button
+will show a menu with which a file can be selected for storage of the PCM data.
+The output is a regular &quot;.wav&quot; file which can be handled by many other audio programs.</string>
+ </property>
 <property name="text">
 <string>dump audio</string>
 </property>

_service:download_url:qt-dab-3.5.2.tar.gz/includes/backend/backend.h -> _service:download_url:qt-dab-3.5.3.tar.gz/includes/backend/backend.h Changed

_service:download_url:qt-dab-3.5.2.tar.gz/includes/backend/msc-handler.h -> _service:download_url:qt-dab-3.5.3.tar.gz/includes/backend/msc-handler.h Changed

_service:download_url:qt-dab-3.5.2.tar.gz/includes/support/smallpushbutton.h -> _service:download_url:qt-dab-3.5.3.tar.gz/includes/support/smallpushbutton.h Changed

_service:download_url:qt-dab-3.5.2.tar.gz/includes/support/verysmallpushbutton.h -> _service:download_url:qt-dab-3.5.3.tar.gz/includes/support/verysmallpushbutton.h Changed

_service:download_url:qt-dab-3.5.2.tar.gz/qt-dab-1.png -> _service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-1.png Changed

_service:download_url:qt-dab-3.5.2.tar.gz/qt-dab-2.png -> _service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-2.png Changed

_service:download_url:qt-dab-3.5.2.tar.gz/qt-dab-buttons.png -> _service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-buttons.png Changed

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-colors.png Added

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-correlation-button.png Added

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-main-widget.png Added

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-scope-2.png Added

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-spectrum-button.png Added

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-tii-button.png Added

_service:download_url:qt-dab-3.5.2.tar.gz/spectrum-viewer/spectrum-viewer.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/spectrum-viewer/spectrum-viewer.cpp Changed

@@ -5,6 +5,7 @@
 * Lazy Chair Computing
 *
 * This file is part of Qt-DAB
+ *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -24,6 +25,7 @@
 #include	<QSettings>
 #include	"iqdisplay.h"
 #include	<QColor>
+#include	"color-selector.h"
 
 	spectrumViewer::spectrumViewer	(RadioInterface	*mr,
 	 QSettings	*dabSettings,
@@ -31,23 +33,26 @@
 	 RingBuffer<std::complex<float>>* ibuffer) {
 int16_t	i;
 QString	colorString	= "black";
-QColor	displayColor;
-QColor	gridColor;
-QColor	curveColor;
+bool	brush;
 
 	this	-> myRadioInterface	= mr;
 	this	-> dabSettings		= dabSettings;
 	this	-> spectrumBuffer	= sbuffer;
 	this	-> iqBuffer		= ibuffer;
 
-	colorString			= dabSettings -> value ("displaycolor", "black"). toString();
-	displayColor			= QColor (colorString);
-	colorString			= dabSettings -> value ("gridcolor", "white"). toString();
-	gridColor			= QColor (colorString);
-	colorString			= dabSettings -> value ("gridcolor", "white"). toString();
-	curveColor			= QColor (colorString);
-
-	displaySize			= dabSettings -> value ("displaySize", 1024).toInt();
+	dabSettings	-> beginGroup ("spectrumViewer");
+	colorString		= dabSettings -> value ("displayColor",
+	 "black"). toString();
+	displayColor		= QColor (colorString);
+	colorString		= dabSettings -> value ("gridColor",
+	 "white"). toString();
+	gridColor		= QColor (colorString);
+	colorString		= dabSettings -> value ("curveColor",
+	 "white"). toString();
+	curveColor		= QColor (colorString);
+	brush			= dabSettings -> value ("brush", 0). toInt () == 1;
+	displaySize		= dabSettings -> value ("displaySize", 1024).toInt();
+	dabSettings	-> endGroup ();
 	if ((displaySize & (displaySize - 1)) != 0)
 	 displaySize = 1024;
 	this	-> myFrame		= new QFrame (nullptr);
@@ -60,12 +65,12 @@
 	spectrum		= (std::complex<float> *)
 	 fftwf_malloc (sizeof (fftwf_complex) * spectrumSize);
 plan = fftwf_plan_dft_1d (spectrumSize,
- reinterpret_cast <fftwf_complex *>(spectrum),
- reinterpret_cast <fftwf_complex *>(spectrum),
- FFTW_FORWARD, FFTW_ESTIMATE);
+ reinterpret_cast <fftwf_complex *>(spectrum),
+ reinterpret_cast <fftwf_complex *>(spectrum),
+ FFTW_FORWARD, FFTW_ESTIMATE);
 	
 	plotgrid		= dabScope;
-	plotgrid	-> setCanvasBackground (displayColor);
+	plotgrid		-> setCanvasBackground (displayColor);
 	grid			= new QwtPlotGrid;
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
 	grid	-> setMajPen (QPen(gridColor, 0, Qt::DotLine));
@@ -81,15 +86,25 @@
 #endif
 	grid	-> attach (plotgrid);
 
+	lm_picker	= new QwtPlotPicker (dabScope -> canvas ());
+	QwtPickerMachine *lpickerMachine =
+ new QwtPickerClickPointMachine ();
+
+	lm_picker -> setStateMachine (lpickerMachine);
+ lm_picker -> setMousePattern (QwtPlotPicker::MouseSelect1,
+ Qt::RightButton);
+ connect (lm_picker, SIGNAL (selected (const QPointF&)),
+ this, SLOT (rightMouseClick (const QPointF &)));
+
 	spectrumCurve	= new QwtPlotCurve ("");
-//	spectrumCurve	-> setPen (QPen(Qt::white));
-	spectrumCurve	-> setPen (QPen(curveColor));
+	spectrumCurve -> setPen (QPen(curveColor, 2.0));
 	spectrumCurve	-> setOrientation (Qt::Horizontal);
 	spectrumCurve	-> setBaseline	(get_db (0));
-//	ourBrush	= new QBrush (Qt::white);
+
 	ourBrush	= new QBrush (curveColor);
 	ourBrush	-> setStyle (Qt::Dense3Pattern);
-	spectrumCurve	-> setBrush (*ourBrush);
+	if (brush)
+	 spectrumCurve	-> setBrush (*ourBrush);
 	spectrumCurve	-> attach (plotgrid);
 	
 	Marker		= new QwtPlotMarker();
@@ -270,3 +285,53 @@
 	 clockError -> display (e);
 }
 
+void	spectrumViewer::rightMouseClick	(const QPointF &point) {
+colorSelector *selector;
+int	index;
+	selector		= new colorSelector ("display color");
+	index			= selector -> QDialog::exec ();
+	QString displayColor	= selector -> getColor (index);
+	delete selector;
+	if (index == 0)
+	 return;
+	selector		= new colorSelector ("grid color");
+	index			= selector	-> QDialog::exec ();
+	QString gridColor	= selector	-> getColor (index);
+	delete selector;
+	if (index == 0)
+	 return;
+	selector		= new colorSelector ("curve color");
+	index			= selector	-> QDialog::exec ();
+	QString curveColor	= selector	-> getColor (index);
+	delete selector;
+	if (index == 0)
+	 return;
+
+	dabSettings	-> beginGroup ("spectrumViewer");
+	dabSettings	-> setValue ("displayColor", displayColor);
+	dabSettings	-> setValue ("gridColor", gridColor);
+	dabSettings	-> setValue ("curveColor", curveColor);
+	dabSettings	-> endGroup ();
+	this		-> displayColor	= QColor (displayColor);
+	this		-> gridColor	= QColor (gridColor);
+	this		-> curveColor	= QColor (curveColor);
+	spectrumCurve	-> setPen (QPen (this -> curveColor, 2.0));
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid		-> setMajPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#else
+	grid		-> setMajorPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#endif
+	grid		-> enableXMin (true);
+	grid		-> enableYMin (true);
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid		-> setMinPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#else
+	grid		-> setMinorPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#endif
+	plotgrid	-> setCanvasBackground (this -> displayColor);
+}
+

_service:download_url:qt-dab-3.5.2.tar.gz/spectrum-viewer/spectrum-viewer.h -> _service:download_url:qt-dab-3.5.3.tar.gz/spectrum-viewer/spectrum-viewer.h Changed

@@ -5,6 +5,7 @@
 * Lazy Chair Computing
 *
 * This file is part of the Qt-DAB.
+ *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -39,7 +40,16 @@
 #include	<qwt_plot_marker.h>
 #include	<qwt_plot_grid.h>
 #include	<qwt_plot_curve.h>
-#include	<qwt_plot_marker.h>
+#include <qwt_color_map.h>
+#include <qwt_plot_zoomer.h>
+#include <qwt_plot_textlabel.h>
+#include <qwt_plot_panner.h>
+#include <qwt_plot_layout.h>
+#include	<qwt_picker_machine.h>
+#include <qwt_scale_widget.h>
+#include <QBrush>
+#include <QTimer>
+
 
 class	RadioInterface;
 class	QSettings;
@@ -65,6 +75,11 @@
 	QSettings	*dabSettings;
 	RingBuffer<std::complex<float>>	*spectrumBuffer;
 	RingBuffer<std::complex<float>>	*iqBuffer;
+	QwtPlotPicker	*lm_picker;
+	QColor		displayColor;
+	QColor		gridColor;
+	QColor		curveColor;
+
 	int16_t		displaySize;
 	int16_t		spectrumSize;
 	std::complex<float>	*spectrum;
@@ -83,6 +98,8 @@
 	int32_t		normalizer;
 
 	IQDisplay	*myIQDisplay;
+private slots:
+	void		rightMouseClick		(const QPointF &);
 };
 
 #endif

_service:download_url:qt-dab-3.5.2.tar.gz/src/backend/backend.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/src/backend/backend.cpp Changed

_service:download_url:qt-dab-3.5.2.tar.gz/src/backend/data/epg/epgdec.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/src/backend/data/epg/epgdec.cpp Changed

_service:download_url:qt-dab-3.5.2.tar.gz/src/backend/data/mot/mot-handler.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/src/backend/data/mot/mot-handler.cpp Changed

@@ -109,7 +109,7 @@
 
 	uint32_t segmentSize = ((motVector [0] & 0x1F) << 8) |
 	 motVector [1];
-	
+
 	switch (groupType) {
 	 case 3:
 	 if (segmentNumber == 0) {
@@ -128,8 +128,19 @@
 
 	 case 4: {
 	 motObject *h = getHandle (transportId);
-	 if (h == nullptr)
+	 if ((h == nullptr) && (segmentNumber != 0))
+	 break;
+	 if ((h == nullptr) && (segmentNumber == 0)) {
+	 h = new motObject (myRadioInterface,
+ false, // not within a directory
+ transportId,
+ &motVector [2],
+ segmentSize,
+ lastFlag);
+ setHandle (h, transportId);
 	 break;
+	 }
+
 	 h -> addBodySegment (&motVector [2],
 	 segmentNumber,
 	 segmentSize,

_service:download_url:qt-dab-3.5.2.tar.gz/src/backend/data/mot/mot-object.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/src/backend/data/mot/mot-object.cpp Changed

_service:download_url:qt-dab-3.5.2.tar.gz/src/backend/msc-handler.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/src/backend/msc-handler.cpp Changed

_service:download_url:qt-dab-3.5.2.tar.gz/src/ofdm/phasereference.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/src/ofdm/phasereference.cpp Changed

_service:download_url:qt-dab-3.5.2.tar.gz/src/support/smallpushbutton.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/src/support/smallpushbutton.cpp Changed

_service:download_url:qt-dab-3.5.2.tar.gz/src/support/verysmallpushbutton.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/src/support/verysmallpushbutton.cpp Changed

@@ -1,4 +1,3 @@
-
 #
 /*
 * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
@@ -6,6 +5,7 @@
 * Lazy Chair Computing
 *
 * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
+ *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -20,7 +20,8 @@
 * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "verysmallpushbutton.h"
+#include	"verysmallpushbutton.h"
+#include	<QMouseEvent>
 
 	verySmallPushButton::verySmallPushButton (QWidget *parent):
 	 QPushButton (parent) {
@@ -34,3 +35,11 @@
 }
 
 
+void verySmallPushButton::mousePressEvent (QMouseEvent *e) {
+ if (e -> button () == Qt::RightButton) {
+ emit rightClicked ();
+ }
+ else
+ emit clicked ();
+}
+

_service:download_url:qt-dab-3.5.2.tar.gz/tii-viewer/tii-viewer.cpp -> _service:download_url:qt-dab-3.5.3.tar.gz/tii-viewer/tii-viewer.cpp Changed

@@ -24,31 +24,34 @@
 #include	"tii-viewer.h"
 #include	"iqdisplay.h"
 #include	<QColor>
+#include	"color-selector.h"
 
 	tiiViewer::tiiViewer	(RadioInterface	*mr,
 	 QSettings	*dabSettings,
 	 RingBuffer<std::complex<float>> *sbuffer) {
 int16_t	i;
 QString	colorString	= "black";
-QColor	displayColor;
-QColor	gridColor;
-QColor	curveColor;
+bool	brush;
 
 	this	-> myRadioInterface	= mr;
 	this	-> dabSettings		= dabSettings;
 	this	-> tiiBuffer		= sbuffer;
 
-	colorString			= dabSettings -> value ("displaycolor", "black"). toString();
-	displayColor			= QColor (colorString);
-	colorString			= dabSettings -> value ("gridcolor",
+	dabSettings	-> beginGroup ("tiiViewer");
+	colorString	= dabSettings -> value ("displayColor",
+	 "black"). toString();
+	displayColor	= QColor (colorString);
+	colorString	= dabSettings -> value ("gridColor",
+	 "black"). toString();
+	gridColor	= QColor (colorString);
+	colorString = dabSettings -> value ("curveColor",
 	 "white"). toString();
-	gridColor			= QColor (colorString);
-	colorString		 = dabSettings -> value ("gridcolor",
-	 "white"). toString();
-	curveColor			= QColor (colorString);
+	curveColor	= QColor (colorString);
 
-	displaySize			= dabSettings -> value ("displaySize",
+	brush		= dabSettings -> value ("brush", 0). toInt () == 1;
+	displaySize	= dabSettings -> value ("displaySize",
 	 1024).toInt();
+	dabSettings	-> endGroup ();
 	if ((displaySize & (displaySize - 1)) != 0)
 	 displaySize = 1024;
 
@@ -65,30 +68,41 @@
 reinterpret_cast <fftwf_complex *>(spectrum),
 FFTW_FORWARD, FFTW_ESTIMATE);
 	
-	plotgrid		= tiiGrid;
+	plotgrid	= tiiGrid;
 	plotgrid	-> setCanvasBackground (displayColor);
-	grid			= new QwtPlotGrid;
+	grid		= new QwtPlotGrid;
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid	-> setMajPen (QPen(gridColor, 0, Qt::DotLine));
+	grid		-> setMajPen (QPen(gridColor, 0, Qt::DotLine));
 #else
-	grid	-> setMajorPen (QPen(gridColor, 0, Qt::DotLine));
+	grid		-> setMajorPen (QPen(gridColor, 0, Qt::DotLine));
 #endif
-	grid	-> enableXMin (true);
-	grid	-> enableYMin (true);
+	grid		-> enableXMin (true);
+	grid		-> enableYMin (true);
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid	-> setMinPen (QPen(gridColor, 0, Qt::DotLine));
+	grid		-> setMinPen (QPen(gridColor, 0, Qt::DotLine));
 #else
-	grid	-> setMinorPen (QPen(gridColor, 0, Qt::DotLine));
+	grid		-> setMinorPen (QPen(gridColor, 0, Qt::DotLine));
 #endif
-	grid	-> attach (plotgrid);
+	grid		-> attach (plotgrid);
+
+	lm_picker = new QwtPlotPicker (plotgrid -> canvas ());
+ QwtPickerMachine *lpickerMachine =
+ new QwtPickerClickPointMachine ();
+
+ lm_picker -> setStateMachine (lpickerMachine);
+ lm_picker -> setMousePattern (QwtPlotPicker::MouseSelect1,
+ Qt::RightButton);
+ connect (lm_picker, SIGNAL (selected (const QPointF&)),
+ this, SLOT (rightMouseClick (const QPointF &)));
 
 	spectrumCurve	= new QwtPlotCurve ("");
- 	spectrumCurve	-> setPen (QPen(curveColor));
+ 	spectrumCurve	-> setPen (QPen(curveColor, 2.0));
 	spectrumCurve	-> setOrientation (Qt::Horizontal);
 	spectrumCurve	-> setBaseline	(get_db (0));
 	ourBrush	= new QBrush (curveColor);
 	ourBrush	-> setStyle (Qt::Dense3Pattern);
-	spectrumCurve	-> setBrush (*ourBrush);
+	if (brush)
+	 spectrumCurve	-> setBrush (*ourBrush);
 	spectrumCurve	-> attach (plotgrid);
 	
 	Marker		= new QwtPlotMarker();
@@ -253,5 +267,54 @@
 	return myFrame -> isHidden();
 }
 
+void	tiiViewer::rightMouseClick	(const QPointF &point) {
+colorSelector *selector;
+int	index;
+	(void)point;
+	selector		= new colorSelector ("display color");
+	index			= selector -> QDialog::exec ();
+	QString displayColor	= selector -> getColor (index);
+	delete selector;
+	if (index == 0)
+	 return;
+	selector		= new colorSelector ("grid color");
+	index			= selector	-> QDialog::exec ();
+	QString gridColor	= selector	-> getColor (index);
+	delete selector;
+	if (index == 0)
+	 return;
+	selector		= new colorSelector ("curve color");
+	index			= selector	-> QDialog::exec ();
+	QString curveColor	= selector	-> getColor (index);
+	delete selector;
+	if (index == 0)
+	 return;
 
+	dabSettings	-> beginGroup ("tiiViewer");
+	dabSettings	-> setValue ("displayColor", displayColor);
+	dabSettings	-> setValue ("gridColor", gridColor);
+	dabSettings	-> setValue ("curveColor", curveColor);
+	dabSettings	-> endGroup ();
+	this		-> displayColor	= QColor (displayColor);
+	this		-> gridColor	= QColor (gridColor);
+	this		-> curveColor	= QColor (curveColor);
+	spectrumCurve	-> setPen (QPen (this -> curveColor, 2.0));
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid		-> setMajPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#else
+	grid		-> setMajorPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#endif
+	grid		-> enableXMin (true);
+	grid		-> enableYMin (true);
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid		-> setMinPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#else
+	grid		-> setMinorPen (QPen(this -> gridColor, 0,
+	 Qt::DotLine));
+#endif
+	plotgrid	-> setCanvasBackground (this -> displayColor);
+}

_service:download_url:qt-dab-3.5.2.tar.gz/tii-viewer/tii-viewer.h -> _service:download_url:qt-dab-3.5.3.tar.gz/tii-viewer/tii-viewer.h Changed

Changes of Revision 26