Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 25

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.tar.gz/README.md -> _service:download_url:qt-dab-3.5.2.tar.gz/README.md Changed

@@ -1,17 +1,48 @@
 # Qt-DAB-3.5 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
 
-Qt-DAB-3.5 is software for Windows, Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little brother dabMini and the other brother dab-2, all built on the same set of sources.
+Qt-DAB-3.5 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini and the other brother dab-2, all built on the same set of sources.
+
+--------------------------------------------------------------------
+DISCLAIMER (for use on Windows)
+--------------------------------------------------------------------
+
+While Windows is probably a very good OS, it seems that my way of programming
+and Windows are incompatible. I develop under Linux and 
+cross-compile for windows. Linux development is simple: if something
+is wrong - and that happens from time to time - it is always relatively
+easy to detect what is wrong and fix it.
+
+The point is that things that run fine under Linux do not (always) run
+fine under Windows: same software, no changes. In case it does not run
+correctly under Windows, finding out what happens can be done, but finding
+the cause, i.e. why it happens is virtually impossible!
+
+So, yes, I am aware of the fact that sometime things do not go under Windows
+as under Linux.
+
+So, while I keep on cross compiling the software for windows, do not
+always expect the smooth behaviour as it is under Linux.
+
+---------------------------------------------------------------------
+Support for Adalm Pluto!
+---------------------------------------------------------------------
+
+I just got the Pluto!! and could work on the support for the
+pluto on both the Qt-DAB and dabMini. Support for the pluto is
+now standard part of the appImages for qt-dab and dabMini as well
+as for the Windows executables, packed into the Windows installer.
 
 ----------------------------------------------------------------------
-Differences 3.5 <-> 3.4
+Differences 3.5.2 <-> 3.4
 -----------------------------------------------------------------------
 
-	a. Support for pluto devices - experimental though,
+	a. Support for pluto devices,
 	b. saving gain settings for different channels when configured,
-	c. support for saving the ensemble data in detail when scanning,
-	d. improved algorithm for frequency synchronization,
-	e. for windows both 32 and 64 bit executables,
-	f. also for dabMini an appImage (x64) is availablce.
+	c. support for saving detailed output of the scan,
+	d. clock error counter and rs corrections counter
+	e. improved algorithm for frequency synchronization,
+	f. added a "mute" button (moved 2 buttons to technical data)
+	g. also for dabMini an appImage (x64) is availablce.
 
 ------------------------------------------------------------------------
 README FIRST === README FIRST === README FIRST === README FIRST
@@ -21,16 +52,13 @@
 different, versions of a DAB decoder:
 
 * first of all, there is Qt-DAB, a fairly complete DAB decoder,
-based on the idea that *the user is in full control* . For Qt-DAB
-an appImage is available for x64 Linux, and an installer is available
-for Windows. See the subdirectory *dab-maxi* for construction details.
+based on the idea that *the user is in full control* .
 
 ![Qt-DAB with xml input](/qt-dab-1.png?raw=true)
 
 * second, the *little* sister is *dabMini*, built using the same set
 of sources, but with an absolutely minimal GUI.
-For Windows an installer in available and for x64 Linux an appImage.
-For installing an
+To assist in creating and installing an
 executable on an *RPI* the documentation contains a script with
 which all required libraries will be installed, the sources
 will be downloaded and compiled into an executable.
@@ -76,9 +104,9 @@
 
 For DX purposes, a separate **dab-scanner** is implemented that allows
 for a continuous scanning of selected channels in a given band. Results are 
-written in a txt file, formatted for use with *LibreOffice Calc* and
-comparable programs. Note that **Qt-DAB-3.5** supports a scan function,
-scanning the whole band, and saving the data found in a text file,
+written in a text file, formatted for use with *LibreOffice Calc* and
+comparable programs. Note that in **Qt-DAB-3.5** the scan function
+is extended with an option to save detailed data in a text file,
 compatible with e.g. LibreOffice.
 
 Derived programs, such as the **dab-scanner** and the Qt-free versions **dab-cmdline** have their own repository on Github.
@@ -91,7 +119,7 @@
 --------------------------------------------------------------------
 
 An extensive "user's guide" - in pdf format - can be found in the "docs"
-section of the source tree. The documentation contains a fomplete
+section of the source tree. The documentation contains a complete
 description of the widgets, of the values in the ".ini" file,
 on configuring for creating an executable (Linux), and even a
 complete description on how to add a device to the configuration.
@@ -108,33 +136,31 @@
 * Both DAB bands supported): 
 	* VHF Band III (default),
 	* L-Band (obsolete now)
- * Modes I, II and IV (Mode I default, Modes II and IV obsolete, but can be set in the ".ini" file)
- * Spectrum view (incl. constellation diagram, correlation result, TII spectrum)
- * Detailed information for selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, 4 quality bars)
- * Detailed information for other services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type)
- * Automatic display of TII (Transmitter Identification Information) data when transmitted
- * *Presets* for easy switching of programs in different ensembles
-(see section *Presets*)
- * Dumping of the input data of the DAB channel (Warning: produces large raw files!) into \* sdr files and playing them again later
- * Dumping the input in xml format (see section on xml format)
- * Saving audio as uncompressed wave files
- * Saving aac frames from DAB+ services for processing by e.g. VLC
- * Saving the ensemble content (description of audio and data streams, including almost all technical data) into a text file readable by e.g *LibreOfficeCalc*
- * Scanning function (scan the band, show the results on the screen and save a
-detailed description of the services found in a file)
- * 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
+ * Modes I, II and IV (Mode I default, Modes II and IV obsolete, but can be set in the ".ini" file)m
+ * Views on the signal: spectrum view incl. constellation diagram, correlation result, TII spectrum,
+ * Detailed information for selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, 4 quality bars),
+ * Detailed information for *other* services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type),
+ * Automatic display of TII (Transmitter Identification Information) data when transmitted,
+ * *Presets* for easy switching of programs in different ensembles (see section *Presets*),
+ * Dumping of the input data of the DAB channel (Warning: produces large raw files!) into \* sdr files and playing them again later,
+ * Dumping the input in xml format (see section on xml format),
+ * Saving audio as uncompressed wave files,
+ * Saving aac frames from DAB+ services for processing by e.g. VLC,
+ * Saving the ensemble content description: audio and data streams, including almost all technical data) into a text file readable by e.g *LibreOfficeCalc*
+ * Scanning function (scan the band, show the results on the screen and save a detailed description of the services found in a file),
+ * 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 
- 	- SDRplay (both RSP I and RSP II), with separate entries for v2 and v3 library
- 	- Airspy, including Airspy mini,
+	- Adalm Pluto
 	- SDR DAB sticks (RTL2838U or similar), 
 	- HACKRF One, 
+ 	- Airspy, including Airspy mini,
+ 	- SDRplay ( RSP I, RSP II, RSP Duo and RSP Dx), with separate entries for v2 and v3 library
 	- limeSDR, 
-	- pluto (experimental),
 	- Soapy (experimental, Linux only), 
 	- prerecorded dump (*.raw, *.iq and *.sdr),
 	- xml format files, and
-	- rtl_tcp servers
+	- rtl_tcp servers.
 * Clean interface to add other devices, see below.
 
 Not yet or partly implemented:
@@ -190,9 +216,6 @@
 is available, now for selecting the previous resp. the next service 
 on the list.
 
-Different from previous versions is that now some information, previously
-shown on the "technical data" widget is now shown on the main widget.
-
 Some data on the selected service - if any - is to be found on
 a separate widget. This widget will show where the data for the
 service is to be found in the DAB frames, and how it is encoded.
@@ -207,8 +230,8 @@
 
 ![Qt-DAB scan result](/qt-dab-buttons.png?raw=true)
 
-During **scanning**, a separate window will be shown with the results
-of the scan as shown in the picture. Note that what is shown is a subset
+During *scanning*, a separate window will be shown with the results
+of the scan as shown in the picture. Note that what is shown is a *subset*
 of what will be recorded if a choice is made to save the output of the scan. 
 
 ![Qt-DAB with xml input](/qt-dab-scanner.png?raw=true)
@@ -217,10 +240,11 @@
 Presets for Qt-DAB, dabMini and dab-2
 ----------------------------------------------------------------------
 
-A **preset** selector is available to allow storing and selecting
+A *preset* selector is available to allow storing and selecting
 "favorit" services.
-Note that the services are encoded as "channel:serviceName" pair:
-it sometimes happens that a service appears in more than one ensemble
+Note that the services in the preset list are encoded as
+"channel:serviceName" pair: it sometimes happens that a
+service appears in more than one ensemble
 (as example the "Omroep West" service appears in channels 5B and 8A.)
 
 ![Qt-DAB with sdrplay input](/qt-dab-presets.png?raw=true)
@@ -289,8 +313,9 @@
 Installation on Windows
 ------------------------------------------------------------------
 
+Read carefully what I have said on Windows!
+
 For windows *two* **installers** can be found in the releases section, https://github.com/JvanKatwijk/qt-dab/releases. The installer will install the executable as well as required libraries.
-Since version 3.5 there are different installers for the 32 bit and the 64
 bit versions for both qt-dab-3.5 and dabMini.
 
 The installer will also call the official installer for the dll implementing the api for getting access to the SDRplay devices.

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

@@ -178,6 +178,7 @@
 	running. 		store (false);
 	scanning. 		store (false);
 	isSynced		= false;
+	stereoSetting		= false;
 
 //	"globals" is introduced to reduce the number of parameters
 //	for the dabProcessor
@@ -1394,19 +1395,16 @@
 }
 
 void	RadioInterface::setStereo	(int s) {
-	(void)s;
-//	if (!running. load())
-//	   return;
-//	if (s) { 
-//	   stereoLabel -> 
-//	               setStyleSheet ("QLabel {background-color : green; color: white}");
-//	   stereoLabel -> setText ("ST");
-//	}
-//	else {
-//	   stereoLabel ->
-//	               setStyleSheet ("QLabel {background-color : red}");
-//	   stereoLabel -> setText ("");
-//	}
+	if (!running. load ())
+           return;
+        if (stereoSetting == s)
+           return;
+
+        techData. stereoLabel   -> setStyleSheet (s ?
+                         "QLabel {background-color: green; color : black}":
+                         "QLabel {background-color: red; color : black}");
+        techData. stereoLabel   -> setText (s ? "stereo" : "mono");
+        stereoSetting = s;
 }
 
 void	RadioInterface::show_tii (QByteArray data) {
@@ -1449,6 +1447,11 @@
 	   my_correlationViewer. showCorrelation (amount, marker);
 }
 
+void	RadioInterface::show_rsCorrections (int e) {
+	if (running. load())
+	   techData. rsCorrections		-> display (e);
+}
+
 void	RadioInterface::showIndex (int ind) {
 	if (!running. load())
 	   return;
@@ -2056,6 +2059,12 @@
 	serviceLabel			-> setText ("");
 	dynamicLabel			-> setText ("");
 	presetSelector			-> setCurrentIndex (0);
+	techData. stereoLabel   -> setStyleSheet (
+                         "QLabel {background-color: white; color : black}");
+	techData. stereoLabel		-> setText ("");
+	stereoSetting                   = false;
+
+	techData. rsCorrections		-> display (0);
 	techData. frameError_display	-> setValue (0);
 	techData. rsError_display	-> setValue (0);
 	techData. aacError_display	-> setValue (0);

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

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

@@ -296,13 +296,12 @@
 CONFIG		+= sdrplay-v2
 CONFIG		+= sdrplay-v3		# pretty experimental
 CONFIG		+= dabstick
-#CONFIG		+= rtl_tcp
+CONFIG		+= rtl_tcp
 CONFIG		+= airspy
 CONFIG		+= hackrf
 CONFIG		+= lime
 #CONFIG		+= soapy
 CONFIG		+= pluto
-#CONFIG		+= pluto_2
 
 CONFIG		+= faad
 #CONFIG		+= fdk-aac
@@ -342,42 +341,40 @@
 }
 
 #for for 64 bit
-	TARGET		= qt-dab64-3.5
-	DEFINES		+= __BITS64__
-	DESTDIR		= /usr/shared/sdr-j-development/w64-programs/windows-dab64-qt
-	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
+#	TARGET		= qt-dab64-3.5
+#	DEFINES		+= __BITS64__
+#	DESTDIR		= /usr/shared/sdr-j-development/w64-programs/windows-dab64-qt
+#	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
+#	INCLUDEPATH	+= /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
+#	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
+##	#CONFIG		+= extio
+#	CONFIG		+= airspy
+#	CONFIG		+= rtl_tcp
+#	CONFIG		+= dabstick
+#	CONFIG		+= sdrplay-v2
+#	CONFIG		+= pluto
+##	CONFIG		+= sdrplay-v3
+##	CONFIG		+= hackrf
+##	CONFIG		+= lime
+#	CONFIG		+= NO_SSE
+#
+#for win32, comment out the lines above
+	TARGET		= qt-dab32-3.5
+	DESTDIR		= /usr/shared/sdr-j-development/w32-programs/windows-dab32-qt
+	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
 	INCLUDEPATH	+= /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
-	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
-	#CONFIG		+= extio
+	LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
+	CONFIG		+= extio
 	CONFIG		+= airspy
 	CONFIG		+= rtl_tcp
 	CONFIG		+= dabstick
 	CONFIG		+= sdrplay-v2
 	CONFIG		+= pluto
-#	#CONFIG		+= pluto_2
-#	CONFIG		+= sdrplay-v3
+	CONFIG		+= sdrplay-v3
 	CONFIG		+= hackrf
 	CONFIG		+= lime
 	CONFIG		+= NO_SSE
 #
-#for win32, comment out the lines above
-#	TARGET		= qt-dab32-3.5
-#	DESTDIR		= /usr/shared/sdr-j-development/w32-programs/windows-dab32-qt
-#	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
-#	INCLUDEPATH	+= /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
-#	LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
-#	CONFIG		+= extio
-#	CONFIG		+= airspy
-#	CONFIG		+= rtl_tcp
-#	CONFIG		+= dabstick
-#	CONFIG		+= sdrplay-v2
-#	CONFIG		+= pluto
-##	#CONFIG		+= pluto_2
-#	#CONFIG		+= sdrplay-v3
-#	CONFIG		+= hackrf
-#	CONFIG		+= lime
-#	CONFIG		+= NO_SSE
-#
 #	end of 32/64 specifics
 INCLUDEPATH	+= /usr/local/include
 LIBS		+= -lfftw3f -lfftw3
@@ -531,21 +528,13 @@
 	DEFINES		+= HAVE_PLUTO
 	QT		+= network
 	INCLUDEPATH	+= ./qt-devices/pluto-handler
+	HEADERS		+= ./qt-devices/pluto-handler/dabFilter.h
 	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 
 }
 
-pluto_2	{
-	DEFINES		+= HAVE_PLUTO_2
-	QT		+= network
-	INCLUDEPATH	+= ./qt-devices/pluto-2
-	HEADERS		+= ./qt-devices/pluto-2/pluto-2.h
-	SOURCES		+= ./qt-devices/pluto-2/pluto-2.cpp
-	FORMS		+= ./qt-devices/pluto-2/pluto-2.ui
-	LIBS		+= -liio
-}
 send_datagram {
 	DEFINES		+= _SEND_DATAGRAM_
 	QT		+= network

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

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

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

@@ -0,0 +1,130 @@
+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";

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/pluto-handler/dabFilter.h-xx 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 -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.tar.gz/dab-maxi/qt-devices/pluto-handler/functions -> _service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/pluto-handler/functions Changed

@@ -1,30 +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 void iio_context_destroy(struct iio_context *ctx);
-__api int iio_context_get_version(const struct iio_context *ctx,
-                unsigned int *major, unsigned int *minor, char git_tag[8]);
 __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 __pure const char * iio_device_get_name(const struct iio_device *dev);
-
-__api ssize_t iio_device_attr_write(const struct iio_device *dev,
-                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 __pure struct iio_channel * iio_device_get_channel(
-                const struct iio_device *dev, unsigned int index);
 __api ssize_t iio_channel_attr_write(const struct iio_channel *chn,
                 const char *attr, const char *src);
-__api int iio_channel_attr_write_longlong(const struct iio_channel *chn,
+__api int iio_device_attr_write_longlong(const struct iio_device *dev,
                 const char *attr, long long val);
-__api void iio_channel_enable(struct iio_channel *chn);
 __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.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-handler.cpp -> _service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-handler.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2020
+ * Copyright (C) 2020
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -22,6 +22,7 @@
 
 #include	<QThread>
 #include	<QSettings>
+#include	<QFileDialog>
 #include	<QTime>
 #include	<QDate>
 #include	<QLabel>
@@ -29,6 +30,10 @@
 #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];
 
@@ -46,109 +51,42 @@
 	return result;
 }
 
-static
-bool	debugFlag	= false;
-
-/* 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");
-	if (dev == nullptr) {
-	 fprintf (stderr, "No ad9361-phy found, fatal\n");
-	 throw (21);
-	}
- return dev;
+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;
 }
 
-/* applies streaming configuration through IIO */
-static
-bool	cfg_ad9361_streaming_ch (struct iio_context *ctx,
-	 struct stream_cfg *cfg, int chid) {
-struct iio_channel *chn = nullptr;
+int	ad9361_get_trx_fir_enable (struct iio_device *dev, int *enable) {
+bool value;
 
-// Configure phy and lo channels
-	if (debugFlag)
-	 fprintf (stderr, "* Acquiring AD9361 phy channel %d\n", chid);
-	try {
-	 chn = iio_device_find_channel (get_ad9361_phy (ctx),
- get_ch_name (QString ("voltage"), chid).
-	 toLatin1 (). data (),
- false);
-	} catch (int e) {
-	 if (debugFlag)
-	 fprintf (stderr, "cannot acquire phy channel %d\n", chid);
-	 return false;
-	}
-
-	int res = iio_channel_attr_write (chn, "rf_port_select",
-	 cfg -> rfport);
-	if (res < 0) {
-	 char error [255];
-	 iio_strerror (res, error, 255); 
-	 if (debugFlag)
-	 fprintf (stderr, "error in port selection %s\n", error);
-	 return false;
-	}
-
-	res = iio_channel_attr_write_longlong (chn, "rf_bandwidth",
-	 cfg -> bw_hz);
-	if (res < 0) {
-	 char error [255];
-	 iio_strerror (res, error, 255); 
-	 if (debugFlag)
-	 fprintf (stderr, "cannot select bandwidth %s\n", error);
-	 return false;
-	}
-
-	res = iio_channel_attr_write_longlong (chn,
-	 "sampling_frequency",
-	 cfg -> fs_hz);
-	if (res < 0) {
-	 char error [255];
-	 iio_strerror (res, error, 255); 
-	 if (debugFlag)
-	 fprintf (stderr, "cannot set sampling frequency %s\n", error);
-	 return false;
-	}
+	int ret = iio_device_attr_read_bool (dev,
+	 "in_out_voltage_filter_fir_en",
+	 &value);
 
-	cfg	-> gain_channel = chn;
-// Configure LO channel
-	if (debugFlag)
-	 fprintf (stderr, "* Acquiring AD9361 %s lo channel\n", "RX");
-	cfg -> lo_channel = nullptr;
-	try {
-	 cfg -> lo_channel =
-	 iio_device_find_channel (get_ad9361_phy (ctx),
- get_ch_name ("altvoltage", 0),
- true);
-	} catch (int e) {}
-	if (cfg -> lo_channel == nullptr) {
-	 if (debugFlag)
-	 fprintf (stderr, "cannot find lo for channel\n");
-	 return false;
-	}
+	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;
 
-	res = iio_channel_attr_write_longlong (cfg -> lo_channel,
-	 "frequency",
-	 cfg -> lo_hz);
-	if (res < 0 ) {
-	 char error [255];
-	 iio_strerror (res, error, 255); 
-	 if (debugFlag)
-	 fprintf (stderr, "cannot set local oscillator frequency %s\n",
-	 error);
-	 return false;
-	}
-	return true;
+	return ret;
 }
 
 /* finds AD9361 streaming IIO channels */
-static
-bool get_ad9361_stream_ch (__notused struct iio_context *ctx,
-	 struct iio_device *dev,
-	 int chid, struct iio_channel **chn) {
- *chn = iio_device_find_channel (dev,
-	 get_ch_name ("voltage", chid), false);
+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),
@@ -160,20 +98,25 @@
 	 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);
 	myFrame. show	();
 
-	ctx				= nullptr;
-	rxbuf				= nullptr;
-	rx0_i				= nullptr;
-	rx0_q				= nullptr;
+	this	-> ctx			= nullptr;
+	this	-> rxbuf		= nullptr;
+	this	-> rx0_i		= nullptr;
+	this	-> rx0_q		= nullptr;
 
-	rxcfg. bw_hz			= PLUTO_RATE;
-	rxcfg. fs_hz			= PLUTO_RATE;
-	rxcfg. lo_hz			= 220000000;
-	rxcfg. rfport			= "A_BALANCED";
+	this	-> bw_hz		= PLUTO_RATE;
+	this	-> fs_hz		= PLUTO_RATE;
+	this	-> lo_hz		= 220000000;
+	this	-> rfport		= "A_BALANCED";
 
 	plutoSettings	-> beginGroup ("plutoSettings");
 	bool agcMode	=
@@ -182,9 +125,11 @@

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2017 .. 2018
+ * Copyright (C) 2020
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -37,15 +37,7 @@
 #include	"device-handler.h"
 #include	"ui_pluto-widget.h"
 
-/* common RX and TX streaming params */
-struct stream_cfg {
- long long	bw_hz; // Analog banwidth in Hz
- long long	fs_hz; // Baseband sample rate in Hz
- long long	lo_hz; // Local oscillator frequency in Hz
- const char* rfport; // Port name
-	struct	iio_channel	*lo_channel;
-	struct	iio_channel	*gain_channel;
-};
+class	xml_fileWriter;
 
 #ifndef	PLUTO_RATE
 #define	PLUTO_RATE	2100000
@@ -54,7 +46,6 @@
 #define	CONV_SIZE	(PLUTO_RATE / DIVIDER)
 #endif
 
-class	xml_fileWriter;
 class	plutoHandler: public deviceHandler, public Ui_plutoWidget {
 Q_OBJECT
 public:
@@ -62,7 +53,6 @@
 		~plutoHandler		();
 	void		setVFOFrequency		(int32_t);
 	int32_t		getVFOFrequency		();
-
 	bool		restartReader		(int32_t);
 	void		stopReader		();
 	int32_t		getSamples		(std::complex<float> *,
@@ -78,24 +68,37 @@
 private:
 	QFrame			myFrame;
 	RingBuffer<std::complex<float>>	_I_Buffer;
-	void			run		();
 	QSettings		*plutoSettings;
 	QString			recorderVersion;
 	FILE			*xmlDumper;
- xml_fileWriter		*xmlWriter;
- bool			setup_xmlDump ();
- void			close_xmlDump ();
- std::atomic<bool> dumping;
-
+	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 *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	rxcfg;
 	bool			connected;
 	std::complex<float>	convBuffer	[CONV_SIZE + 1];
 	int			convIndex;
@@ -105,13 +108,15 @@
 	void			record_gainSettings	(int);
 	void			update_gainSettings	(int);
 	bool			save_gainSettings;
+//
 signals:
-	void			new_gainValue	(int);
-	void			new_agcValue	(bool);
+	void		new_gainValue		(int);
+	void		new_agcValue		(bool);
 private slots:
 	void		set_gainControl		(int);
 	void		set_agcControl		(int);
 	void		toggle_debugButton	();
+	void		set_filter		();
 	void		set_xmlDump		();
 };
 #endif

_service:download_url:qt-dab-3.5.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-widget.ui -> _service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-widget.ui Changed

@@ -51,27 +51,39 @@
 <string>Experimental interface for Adalm Pluto. No garantees!!</string>
 </property>
 <property name="text">
- <string>experimental Pluto interface</string>
+ <string>Pluto interface</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="usb_board_id_display">
+ <widget class="QLabel" name="contextName">
 <property name="text">
- <string>usb board display</string>
+ <string>context name</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="serialNumber">
+ <widget class="QLabel" name="name_of_device">
 <property name="text">
- <string>serial number</string>
+ <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>

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig Added

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtl-dongleselect.cpp Added

@@ -0,0 +1,64 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * 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
+ * (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	"rtl-dongleselect.h"
+#include	<cstdio>
+#include	<QVBoxLayout>
+//
+//	Whenever there are two or more RT2832 based sticks connected
+//	to the computer, the user is asked to make a choice.
+
+	rtl_dongleSelect::rtl_dongleSelect() {
+	toptext		= new QLabel (this);
+	toptext		-> setText ("Select a dongle");
+	selectorDisplay	= new QListView (this);
+	QVBoxLayout	*layOut = new QVBoxLayout;
+	layOut		-> addWidget (selectorDisplay);
+	layOut		-> addWidget (toptext);
+	setWindowTitle (tr("dongle select"));
+	setLayout (layOut);
+
+	dongleList. setStringList (Dongles);
+	Dongles = QStringList();
+	dongleList. setStringList (Dongles);
+	selectorDisplay	-> setModel (&dongleList);
+	connect (selectorDisplay, SIGNAL (clicked (QModelIndex)),
+	 this, SLOT (selectDongle (QModelIndex)));
+	selectedItem	= -1;
+}
+
+	rtl_dongleSelect::~rtl_dongleSelect() {
+}
+
+void	rtl_dongleSelect::addtoDongleList (const char *v) {
+QString s (v);
+
+	Dongles << s;
+	dongleList. setStringList (Dongles);
+	selectorDisplay	-> setModel (&dongleList);
+	selectorDisplay	-> adjustSize();
+	adjustSize();
+}
+
+void	rtl_dongleSelect::selectDongle (QModelIndex s) {
+	QDialog::done (s. row());
+}
+

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtl-dongleselect.h Added

@@ -0,0 +1,51 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * 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	__DONGLE_SELECT__
+#define	__DONGLE_SELECT__
+#
+#include	<QDialog>
+#include	<QLabel>
+#include	<QListView>
+#include	<QStringListModel>
+#include	<QStringList>
+#include	<cstdint>
+
+class	rtl_dongleSelect: public QDialog {
+Q_OBJECT
+public:
+			rtl_dongleSelect();
+			~rtl_dongleSelect();
+	void		addtoDongleList		(const char *);
+private:
+	QLabel		*toptext;
+	QListView	*selectorDisplay;
+	QStringListModel	dongleList;
+	QStringList	Dongles;
+	int16_t		selectedItem;
+private slots:
+	void		selectDongle	(QModelIndex);
+};
+
+#endif
+

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtl-sdr.h Added

@@ -0,0 +1,368 @@
+#
+/*
+ * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+ * Copyright (C) 2012-2013 by Steve Markgraf <steve@steve-m.de>
+ * Copyright (C) 2012 by Dimitri Stolnikov <horiz0n@gmx.net>
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RTL_SDR_H
+#define __RTL_SDR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <cstdint>
+#include <rtl-sdr_export.h>
+
+typedef struct rtlsdr_dev rtlsdr_dev_t;
+
+RTLSDR_API uint32_t rtlsdr_get_device_count(void);
+
+RTLSDR_API const char* rtlsdr_get_device_name(uint32_t index);
+
+/*!
+ * Get USB device strings.
+ *
+ * NOTE: The string arguments must provide space for up to 256 bytes.
+ *
+ * \param index the device index
+ * \param manufact manufacturer name, may be NULL
+ * \param product product name, may be NULL
+ * \param serial serial number, may be NULL
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_get_device_usb_strings(uint32_t index,
+					 char *manufact,
+					 char *product,
+					 char *serial);
+
+/*!
+ * Get device index by USB serial string descriptor.
+ *
+ * \param serial serial string of the device
+ * \return device index of first device where the name matched
+ * \return -1 if name is NULL
+ * \return -2 if no devices were found at all
+ * \return -3 if devices were found, but none with matching name
+ */
+RTLSDR_API int rtlsdr_get_index_by_serial(const char *serial);
+
+RTLSDR_API int rtlsdr_open(rtlsdr_dev_t **dev, uint32_t index);
+
+RTLSDR_API int rtlsdr_close(rtlsdr_dev_t *dev);
+
+/* configuration functions */
+
+/*!
+ * Set crystal oscillator frequencies used for the RTL2832 and the tuner IC.
+ *
+ * Usually both ICs use the same clock. Changing the clock may make sense if
+ * you are applying an external clock to the tuner or to compensate the
+ * frequency (and samplerate) error caused by the original (cheap) crystal.
+ *
+ * NOTE: Call this function only if you fully understand the implications.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param rtl_freq frequency value used to clock the RTL2832 in Hz
+ * \param tuner_freq frequency value used to clock the tuner IC in Hz
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_set_xtal_freq(rtlsdr_dev_t *dev, uint32_t rtl_freq,
+				 uint32_t tuner_freq);
+
+/*!
+ * Get crystal oscillator frequencies used for the RTL2832 and the tuner IC.
+ *
+ * Usually both ICs use the same clock.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param rtl_freq frequency value used to clock the RTL2832 in Hz
+ * \param tuner_freq frequency value used to clock the tuner IC in Hz
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_get_xtal_freq(rtlsdr_dev_t *dev, uint32_t *rtl_freq,
+				 uint32_t *tuner_freq);
+
+/*!
+ * Get USB device strings.
+ *
+ * NOTE: The string arguments must provide space for up to 256 bytes.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param manufact manufacturer name, may be NULL
+ * \param product product name, may be NULL
+ * \param serial serial number, may be NULL
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact,
+				 char *product, char *serial);
+
+/*!
+ * Write the device EEPROM
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param data buffer of data to be written
+ * \param offset address where the data should be written
+ * \param len length of the data
+ * \return 0 on success
+ * \return -1 if device handle is invalid
+ * \return -2 if EEPROM size is exceeded
+ * \return -3 if no EEPROM was found
+ */
+
+RTLSDR_API int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data,
+				 uint8_t offset, uint16_t len);
+
+/*!
+ * Read the device EEPROM
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param data buffer where the data should be written
+ * \param offset address where the data should be read from
+ * \param len length of the data
+ * \return 0 on success
+ * \return -1 if device handle is invalid
+ * \return -2 if EEPROM size is exceeded
+ * \return -3 if no EEPROM was found
+ */
+
+RTLSDR_API int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data,
+				 uint8_t offset, uint16_t len);
+
+RTLSDR_API int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq);
+
+/*!
+ * Get actual frequency the device is tuned to.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \return 0 on error, frequency in Hz otherwise
+ */
+RTLSDR_API uint32_t rtlsdr_get_center_freq(rtlsdr_dev_t *dev);
+
+/*!
+ * Set the frequency correction value for the device.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param ppm correction value in parts per million (ppm)
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_set_freq_correction(rtlsdr_dev_t *dev, int ppm);
+
+/*!
+ * Get actual frequency correction value of the device.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \return correction value in parts per million (ppm)
+ */
+RTLSDR_API int rtlsdr_get_freq_correction(rtlsdr_dev_t *dev);
+
+enum rtlsdr_tuner {
+	RTLSDR_TUNER_UNKNOWN = 0,
+	RTLSDR_TUNER_E4000,
+	RTLSDR_TUNER_FC0012,
+	RTLSDR_TUNER_FC0013,
+	RTLSDR_TUNER_FC2580,
+	RTLSDR_TUNER_R820T,
+	RTLSDR_TUNER_R828D
+};
+
+/*!
+ * Get the tuner type.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \return RTLSDR_TUNER_UNKNOWN on error, tuner type otherwise
+ */
+RTLSDR_API enum rtlsdr_tuner rtlsdr_get_tuner_type(rtlsdr_dev_t *dev);
+
+/*!
+ * Get a list of gains supported by the tuner.
+ *
+ * NOTE: The gains argument must be preallocated by the caller. If NULL is
+ * being given instead, the number of available gain values will be returned.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param gains array of gain values. In tenths of a dB, 115 means 11.5 dB.
+ * \return <= 0 on error, number of available (returned) gain values otherwise

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtl-sdr_export.h Added

@@ -0,0 +1,47 @@
+/*
+ * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+ * Copyright (C) 2012 by Hoernchen <la@tfc-server.de>
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RTLSDR_EXPORT_H
+#define RTLSDR_EXPORT_H
+
+#if defined __GNUC__
+# if __GNUC__ >= 4
+# define __SDR_EXPORT __attribute__((visibility("default")))
+# define __SDR_IMPORT __attribute__((visibility("default")))
+# else
+# define __SDR_EXPORT
+# define __SDR_IMPORT
+# endif
+#elif _MSC_VER
+# define __SDR_EXPORT __declspec(dllexport)
+# define __SDR_IMPORT __declspec(dllimport)
+#else
+# define __SDR_EXPORT
+# define __SDR_IMPORT
+#endif
+
+#ifndef rtlsdr_STATIC
+#	ifdef rtlsdr_EXPORTS
+#	define RTLSDR_API __SDR_EXPORT
+#	else
+#	define RTLSDR_API __SDR_IMPORT
+#	endif
+#else
+#define RTLSDR_API
+#endif
+#endif /* RTLSDR_EXPORT_H */

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtlsdr-handler.cpp Added

@@ -0,0 +1,720 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * 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
+ * (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-SDR; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 	This particular driver is a very simple wrapper around the
+ * 	librtlsdr. In order to keep things simple, we dynamically
+ * 	load the dll (or .so). The librtlsdr is osmocom software and all rights
+ * 	are greatly acknowledged
+ */
+
+#include	<QThread>
+#include	<QFileDialog>
+#include	<QTime>
+#include	<QDate>
+#include	<QDir>
+#include	"rtlsdr-handler.h"
+#include	"rtl-dongleselect.h"
+#include	"rtl-sdr.h"
+#include	"xml-filewriter.h"
+
+#ifdef	__MINGW32__
+#define	GETPROCADDRESS	GetProcAddress
+#else
+#define	GETPROCADDRESS	dlsym
+#endif
+
+#define	READLEN_DEFAULT	8192
+//
+//	For the callback, we do need some environment which
+//	is passed through the ctx parameter
+//
+//	This is the user-side call back function
+//	ctx is the calling task
+
+static 
+float mapTable [] = {
+ -128 / 128.0 , -127 / 128.0 , -126 / 128.0 , -125 / 128.0 , -124 / 128.0 , -123 / 128.0 , -122 / 128.0 , -121 / 128.0 , -120 / 128.0 , -119 / 128.0 , -118 / 128.0 , -117 / 128.0 , -116 / 128.0 , -115 / 128.0 , -114 / 128.0 , -113 / 128.0 
+, -112 / 128.0 , -111 / 128.0 , -110 / 128.0 , -109 / 128.0 , -108 / 128.0 , -107 / 128.0 , -106 / 128.0 , -105 / 128.0 , -104 / 128.0 , -103 / 128.0 , -102 / 128.0 , -101 / 128.0 , -100 / 128.0 , -99 / 128.0 , -98 / 128.0 , -97 / 128.0 
+, -96 / 128.0 , -95 / 128.0 , -94 / 128.0 , -93 / 128.0 , -92 / 128.0 , -91 / 128.0 , -90 / 128.0 , -89 / 128.0 , -88 / 128.0 , -87 / 128.0 , -86 / 128.0 , -85 / 128.0 , -84 / 128.0 , -83 / 128.0 , -82 / 128.0 , -81 / 128.0 
+, -80 / 128.0 , -79 / 128.0 , -78 / 128.0 , -77 / 128.0 , -76 / 128.0 , -75 / 128.0 , -74 / 128.0 , -73 / 128.0 , -72 / 128.0 , -71 / 128.0 , -70 / 128.0 , -69 / 128.0 , -68 / 128.0 , -67 / 128.0 , -66 / 128.0 , -65 / 128.0 
+, -64 / 128.0 , -63 / 128.0 , -62 / 128.0 , -61 / 128.0 , -60 / 128.0 , -59 / 128.0 , -58 / 128.0 , -57 / 128.0 , -56 / 128.0 , -55 / 128.0 , -54 / 128.0 , -53 / 128.0 , -52 / 128.0 , -51 / 128.0 , -50 / 128.0 , -49 / 128.0 
+, -48 / 128.0 , -47 / 128.0 , -46 / 128.0 , -45 / 128.0 , -44 / 128.0 , -43 / 128.0 , -42 / 128.0 , -41 / 128.0 , -40 / 128.0 , -39 / 128.0 , -38 / 128.0 , -37 / 128.0 , -36 / 128.0 , -35 / 128.0 , -34 / 128.0 , -33 / 128.0 
+, -32 / 128.0 , -31 / 128.0 , -30 / 128.0 , -29 / 128.0 , -28 / 128.0 , -27 / 128.0 , -26 / 128.0 , -25 / 128.0 , -24 / 128.0 , -23 / 128.0 , -22 / 128.0 , -21 / 128.0 , -20 / 128.0 , -19 / 128.0 , -18 / 128.0 , -17 / 128.0 
+, -16 / 128.0 , -15 / 128.0 , -14 / 128.0 , -13 / 128.0 , -12 / 128.0 , -11 / 128.0 , -10 / 128.0 , -9 / 128.0 , -8 / 128.0 , -7 / 128.0 , -6 / 128.0 , -5 / 128.0 , -4 / 128.0 , -3 / 128.0 , -2 / 128.0 , -1 / 128.0 
+, 0 / 128.0 , 1 / 128.0 , 2 / 128.0 , 3 / 128.0 , 4 / 128.0 , 5 / 128.0 , 6 / 128.0 , 7 / 128.0 , 8 / 128.0 , 9 / 128.0 , 10 / 128.0 , 11 / 128.0 , 12 / 128.0 , 13 / 128.0 , 14 / 128.0 , 15 / 128.0 
+, 16 / 128.0 , 17 / 128.0 , 18 / 128.0 , 19 / 128.0 , 20 / 128.0 , 21 / 128.0 , 22 / 128.0 , 23 / 128.0 , 24 / 128.0 , 25 / 128.0 , 26 / 128.0 , 27 / 128.0 , 28 / 128.0 , 29 / 128.0 , 30 / 128.0 , 31 / 128.0 
+, 32 / 128.0 , 33 / 128.0 , 34 / 128.0 , 35 / 128.0 , 36 / 128.0 , 37 / 128.0 , 38 / 128.0 , 39 / 128.0 , 40 / 128.0 , 41 / 128.0 , 42 / 128.0 , 43 / 128.0 , 44 / 128.0 , 45 / 128.0 , 46 / 128.0 , 47 / 128.0 
+, 48 / 128.0 , 49 / 128.0 , 50 / 128.0 , 51 / 128.0 , 52 / 128.0 , 53 / 128.0 , 54 / 128.0 , 55 / 128.0 , 56 / 128.0 , 57 / 128.0 , 58 / 128.0 , 59 / 128.0 , 60 / 128.0 , 61 / 128.0 , 62 / 128.0 , 63 / 128.0 
+, 64 / 128.0 , 65 / 128.0 , 66 / 128.0 , 67 / 128.0 , 68 / 128.0 , 69 / 128.0 , 70 / 128.0 , 71 / 128.0 , 72 / 128.0 , 73 / 128.0 , 74 / 128.0 , 75 / 128.0 , 76 / 128.0 , 77 / 128.0 , 78 / 128.0 , 79 / 128.0 
+, 80 / 128.0 , 81 / 128.0 , 82 / 128.0 , 83 / 128.0 , 84 / 128.0 , 85 / 128.0 , 86 / 128.0 , 87 / 128.0 , 88 / 128.0 , 89 / 128.0 , 90 / 128.0 , 91 / 128.0 , 92 / 128.0 , 93 / 128.0 , 94 / 128.0 , 95 / 128.0 
+, 96 / 128.0 , 97 / 128.0 , 98 / 128.0 , 99 / 128.0 , 100 / 128.0 , 101 / 128.0 , 102 / 128.0 , 103 / 128.0 , 104 / 128.0 , 105 / 128.0 , 106 / 128.0 , 107 / 128.0 , 108 / 128.0 , 109 / 128.0 , 110 / 128.0 , 111 / 128.0 
+, 112 / 128.0 , 113 / 128.0 , 114 / 128.0 , 115 / 128.0 , 116 / 128.0 , 117 / 128.0 , 118 / 128.0 , 119 / 128.0 , 120 / 128.0 , 121 / 128.0 , 122 / 128.0 , 123 / 128.0 , 124 / 128.0 , 125 / 128.0 , 126 / 128.0 , 127 / 128.0 };
+
+static
+void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
+rtlsdrHandler	*theStick	= (rtlsdrHandler *)ctx;
+
+	if ((theStick == nullptr) || (len != READLEN_DEFAULT))
+	 return;
+
+	(void)theStick -> _I_Buffer.
+	 putDataIntoBuffer ((std::complex<uint8_t> *)buf, len / 2);
+}
+//
+//	for handling the events in libusb, we need a controlthread
+//	whose sole purpose is to process the rtlsdr_read_async function
+//	from the lib.
+class	dll_driver : public QThread {
+private:
+	rtlsdrHandler	*theStick;
+public:
+
+	dll_driver (rtlsdrHandler *d) {
+	theStick	= d;
+	start();
+}
+
+	~dll_driver() {
+}
+
+private:
+void	run () {
+	(theStick -> rtlsdr_read_async) (theStick -> device,
+	 (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
+	 (void *)theStick,
+	 0,
+	 READLEN_DEFAULT);
+	}
+};
+//
+//	Our wrapper is a simple classs
+	rtlsdrHandler::rtlsdrHandler (QSettings *s,
+	 QString &recorderVersion):
+	 _I_Buffer (4 * 1024 * 1024),
+	 myFrame (nullptr) {
+int16_t	deviceCount;
+int32_t	r;
+int16_t	deviceIndex;
+int16_t	i;
+QString	temp;
+int	k;
+char	manufac [256], product [256], serial [256];
+
+	rtlsdrSettings			= s;
+	this	-> recorderVersion	= recorderVersion;
+	setupUi (&myFrame);
+	myFrame. show();
+	inputRate			= 2048000;
+	workerHandle		= nullptr;
+	const char *libraryString = "rtlsdr.dll";
+
+#ifdef	__MINGW32__
+	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
+	if (Handle == nullptr) {
+	 fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
+	 throw (20);
+	}
+#else
+	Handle		= dlopen ("librtlsdr.so", RTLD_NOW);
+
+	if (Handle == nullptr) {
+	 fprintf (stderr, "failed to open %s (%s)\n", libraryString, dlerror());
+	 throw (20);
+	}
+#endif
+	if (!load_rtlFunctions()) {
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (21);
+	}
+//
+//	Ok, from here we have the library functions accessible
+	deviceCount 		= this -> rtlsdr_get_device_count();
+	if (deviceCount == 0) {
+	 fprintf (stderr, "No devices found\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (22);
+	}
+
+	deviceIndex = 0;	// default
+	if (deviceCount > 1) {
+	 rtl_dongleSelect dongleSelector;
+	 for (deviceIndex = 0; deviceIndex < deviceCount; deviceIndex ++) {
+	 dongleSelector.
+	 addtoDongleList (rtlsdr_get_device_name (deviceIndex));
+	 }
+	 deviceIndex = dongleSelector. QDialog::exec();
+	}
+//
+//	OK, now open the hardware
+	r			= this -> rtlsdr_open (&device, deviceIndex);
+	if (r < 0) {
+	 fprintf (stderr, "Opening rtlsdr device failed\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (23);
+	}
+
+	deviceModel	= rtlsdr_get_device_name (deviceIndex);
+	deviceVersion	-> setText (deviceModel);
+	r		= this -> rtlsdr_set_sample_rate (device, inputRate);
+	if (r < 0) {
+	 fprintf (stderr, "Setting samplerate failed\n");
+	 rtlsdr_close (device);
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (24);
+	}

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtlsdr-handler.h Added

@@ -0,0 +1,155 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB
+ *
+ * Many of the ideas as implemented in Qt-DAB are derived from
+ * other work, made available through the GNU general Public License. 
+ * All copyrights of the original authors are recognized.
+ *
+ * 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 __RTLSDR_HANDLER__
+#define	__RTLSDR_HANDLER__
+
+#include	<QObject>
+#include	<QSettings>
+#include	<QString>
+#include	<cstdio>
+#include	<atomic>
+#include	"dab-constants.h"
+#include	"device-handler.h"
+#include	"ringbuffer.h"
+#include	"ui_rtlsdr-widget.h"
+class	dll_driver;
+class	xml_fileWriter;
+//
+//	create typedefs for the library functions
+typedef	struct rtlsdr_dev rtlsdr_dev_t;
+extern "C" {
+typedef	void (*rtlsdr_read_async_cb_t) (uint8_t *buf, uint32_t len, void *ctx);
+typedef	 int (* pfnrtlsdr_open )(rtlsdr_dev_t **, uint32_t);
+typedef	int (* pfnrtlsdr_close) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_get_usb_strings) (rtlsdr_dev_t *, char *, char *, char *);
+typedef	int (* pfnrtlsdr_set_center_freq) (rtlsdr_dev_t *, uint32_t);
+typedef uint32_t (* pfnrtlsdr_get_center_freq) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_get_tuner_gains) (rtlsdr_dev_t *, int *);
+typedef	int (* pfnrtlsdr_set_tuner_gain_mode) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_agc_mode) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_sample_rate) (rtlsdr_dev_t *, uint32_t);
+typedef	int (* pfnrtlsdr_get_sample_rate) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_set_tuner_gain) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_get_tuner_gain) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_reset_buffer) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_read_async) (rtlsdr_dev_t *,
+	 rtlsdr_read_async_cb_t,
+	 void *,
+	 uint32_t,
+	 uint32_t);
+typedef int (* pfnrtlsdr_cancel_async) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
+typedef uint32_t (* pfnrtlsdr_get_device_count)();
+typedef	int (* pfnrtlsdr_set_freq_correction)(rtlsdr_dev_t *, int);
+typedef	char *(* pfnrtlsdr_get_device_name)(int);
+}
+//	This class is a simple wrapper around the
+//	rtlsdr library that is read in as dll (or .so file in linux)
+//	It does not do any processing
+class	rtlsdrHandler: public deviceHandler, public Ui_dabstickWidget {
+Q_OBJECT
+public:
+			rtlsdrHandler	(QSettings *, QString &);
+			~rtlsdrHandler();
+	void		setVFOFrequency	(int32_t);
+	int32_t		getVFOFrequency	();
+//	interface to the reader
+	bool		restartReader	(int32_t);
+	void		stopReader	();
+	int32_t		getSamples	(std::complex<float> *, int32_t);
+	int32_t		Samples		();
+	void		resetBuffer	();
+	int16_t		maxGain		();
+	int16_t		bitDepth	();
+	QString		deviceName	();
+	void		show		();
+	void		hide		();
+	bool		isHidden	();
+
+//	These need to be visible for the separate usb handling thread
+	RingBuffer<std::complex<uint8_t>> _I_Buffer;
+	pfnrtlsdr_read_async	rtlsdr_read_async;
+	struct rtlsdr_dev	*device;
+private:
+	QFrame		myFrame;
+	QSettings	*rtlsdrSettings;
+	int32_t		inputRate;
+	int32_t		deviceCount;
+	HINSTANCE	Handle;
+	dll_driver	*workerHandle;
+	int32_t		lastFrequency;
+	int16_t		gainsCount;
+	QString		deviceModel;
+	QString		recorderVersion;
+	FILE *xmlDumper;
+ xml_fileWriter *xmlWriter;
+ bool setup_xmlDump		();
+ void close_xmlDump		();
+ std::atomic<bool> xml_dumping;
+	FILE		*iqDumper;
+ bool setup_iqDump		();
+ void close_iqDump		();
+ std::atomic<bool> iq_dumping;
+
+	void		record_gainSettings	(int);
+	void		update_gainSettings	(int);
+	bool		save_gainSettings;
+//	here we need to load functions from the dll
+	bool		load_rtlFunctions	();
+	pfnrtlsdr_open	rtlsdr_open;
+	pfnrtlsdr_close	rtlsdr_close;
+	pfnrtlsdr_get_usb_strings rtlsdr_get_usb_strings;
+
+	pfnrtlsdr_set_center_freq rtlsdr_set_center_freq;
+	pfnrtlsdr_get_center_freq rtlsdr_get_center_freq;
+	pfnrtlsdr_get_tuner_gains rtlsdr_get_tuner_gains;
+	pfnrtlsdr_set_tuner_gain_mode rtlsdr_set_tuner_gain_mode;
+	pfnrtlsdr_set_agc_mode rtlsdr_set_agc_mode;
+	pfnrtlsdr_set_sample_rate rtlsdr_set_sample_rate;
+	pfnrtlsdr_get_sample_rate rtlsdr_get_sample_rate;
+	pfnrtlsdr_set_tuner_gain rtlsdr_set_tuner_gain;
+	pfnrtlsdr_get_tuner_gain rtlsdr_get_tuner_gain;
+	pfnrtlsdr_reset_buffer rtlsdr_reset_buffer;
+	pfnrtlsdr_cancel_async rtlsdr_cancel_async;
+	pfnrtlsdr_set_direct_sampling	rtlsdr_set_direct_sampling;
+	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
+	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
+	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
+signals:
+	void		new_gainIndex		(int);
+	void		new_agcSetting		(bool);
+private slots:
+	void		set_ExternalGain	(const QString &);
+	void		set_autogain		(int);
+	void		set_ppmCorrection	(int);
+	void		set_xmlDump		();
+	void		set_iqDump		();
+};
+#endif
+

_service:download_url:qt-dab-3.5.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtlsdr-widget.ui Added

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dabstickWidget</class>
+ <widget class="QWidget" name="dabstickWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>203</width>
+ <height>330</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>RT2832 dabstick</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>ppm</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="ppm_correction">
+ <property name="minimum">
+ <number>-500</number>
+ </property>
+ <property name="maximum">
+ <number>500</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QComboBox" name="gainControl">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set gain in dB, only possible values are displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>gain</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="text">
+ <string>autogain</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="xml_dumpButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>dump to xml file</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="iq_dumpButton">
+ <property name="text">
+ <string>dump to raw file</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>dabstick</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="product_display">
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="deviceVersion">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Device name&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

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

@@ -76,7 +76,8 @@
 	if ((theStick == nullptr) || (len != READLEN_DEFAULT))
 	 return;
 
-	(void)theStick -> _I_Buffer.
+	if (theStick -> isActive)
+	 (void)theStick -> _I_Buffer.
 	 putDataIntoBuffer ((std::complex<uint8_t> *)buf, len / 2);
 }
 //
@@ -126,7 +127,7 @@
 	inputRate			= 2048000;
 	workerHandle		= nullptr;
 	const char *libraryString = "rtlsdr.dll";
-
+	isActive		= false;
 #ifdef	__MINGW32__
 	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
 	if (Handle == nullptr) {
@@ -271,7 +272,12 @@
 	if (Handle == nullptr) {	// nothing achieved earlier on
 	 return;
 	}
-	
+	this -> rtlsdr_cancel_async (device);
+	while (!workerHandle -> isFinished()) 
+	 usleep (100);
+	_I_Buffer. FlushRingBuffer();
+	delete	workerHandle;
+	workerHandle = nullptr;
 	stopReader	();
 	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
 	rtlsdrSettings	-> setValue ("externalGain",
@@ -299,17 +305,9 @@
 	return (int32_t)(this -> rtlsdr_get_center_freq (device));
 }
 //
-//
 bool	rtlsdrHandler::restartReader	(int32_t freq) {
 int32_t	r;
 
-	if (workerHandle != nullptr)
-	 return true;
-
-	_I_Buffer. FlushRingBuffer();
-	r = this -> rtlsdr_reset_buffer (device);
-	if (r < 0)
-	 return false;
 	(void)(this -> rtlsdr_set_center_freq (device, freq));
 	if (save_gainSettings)
 	 update_gainSettings (freq / MHz (1));
@@ -317,23 +315,20 @@
 	rtlsdr_set_agc_mode (device, agcControl -> isChecked () ? 1 : 0);
 	rtlsdr_set_tuner_gain (device,
 	 gainControl -> currentText (). toInt ());
-	workerHandle	= new dll_driver (this);
+	if (workerHandle == nullptr) {
+	 r = this -> rtlsdr_reset_buffer (device);
+	 workerHandle	= new dll_driver (this);
+	}
+	isActive	= true;
 	return true;
 }
 
 void	rtlsdrHandler::stopReader () {
-	if (workerHandle == nullptr)
-	 return;
+	isActive	= false;
+	_I_Buffer. FlushRingBuffer();
 	close_xmlDump ();
 	if (save_gainSettings)
 	 record_gainSettings	((int32_t)(this -> rtlsdr_get_center_freq (device)) / MHz (1));
-
-	this -> rtlsdr_cancel_async (device);
-	while (!workerHandle -> isFinished()) 
-	 usleep (100);
-	_I_Buffer. FlushRingBuffer();
-	delete	workerHandle;
-	workerHandle = nullptr;
 }
 //
 //	when selecting the gain from a table, use the table value

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

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

@@ -20,6 +20,7 @@
 * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
+#include	<QCoreApplication>
 #include	<QSettings>
 #include	<QMessageBox>
 #include	<QFileDialog>
@@ -190,6 +191,7 @@
 	scanning. 		store (false);
 	my_dabProcessor		= nullptr;
 	isSynced		= false;
+	stereoSetting		= false;
 //
 //	"globals" is introduced to reduce the number of parameters
 //	for the dabProcessor
@@ -248,8 +250,6 @@
 	 epgPath = epgPath + "/";
 	if ((filePath != "") && (!filePath. endsWith ("/")))
 	 filePath = filePath + "/";
-
-
 /*
 * Experimental:
 *	lots of people seem to want the scan to continue, rather than
@@ -289,11 +289,11 @@
 
 //	Where do we leave the audio out?
 	streamoutSelector	-> hide();
-#ifdef	TCP_STREAMER
-	soundOut		= new tcpStreamer	(20040);
-#elif	QT_AUDIO
-	soundOut		= new Qt_Audio();
-#else
+//#ifdef	TCP_STREAMER
+//	soundOut		= new tcpStreamer	(20040);
+//#elif	QT_AUDIO
+//	soundOut		= new Qt_Audio();
+//#else
 // just sound out
 	soundOut		= new audioSink		(latency);
 
@@ -309,7 +309,7 @@
 
 	if ((k == -1) || err)
 	 ((audioSink *)soundOut)	-> selectDefaultDevice();
-#endif
+//#endif
 //
 	QString historyFile = QDir::homePath () + "/.qt-history.xml";
 historyFile =
@@ -321,6 +321,10 @@
 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)));
 
 //	restore some settings from previous incarnations
 	QString t =
@@ -332,6 +336,8 @@
 	QPalette p	= ficError_display -> palette();
 	p. setColor (QPalette::Highlight, Qt::green);
 	ficError_display		-> setPalette (p);
+	techData. stereoLabel		->
+	 setStyleSheet ("QLabel {background-color : red}");
 	techData. frameError_display	-> setPalette (p);
 	techData. rsError_display	-> setPalette (p);
 	techData. aacError_display	-> setPalette (p);
@@ -387,9 +393,7 @@
 //	timer for muting
 	muteTimer. setSingleShot (true);
 	muting		= false;
-	muteDelay	= dabSettings -> value ("muteTime", 10). toInt ();
-//	connect (muteButtton, SIGNAL (timeout (void)),
-//	 this, SLOT (handle_muteButton ()));
+	muteDelay	= dabSettings -> value ("muteTime", 2). toInt ();
 
 	deviceSelector	-> addItem ("xml files");
 #ifdef	HAVE_SDRPLAY_V2
@@ -820,6 +824,7 @@
 
 	QPixmap p;
 	p. loadFromData (data, type);
+
 	if (saveSlides) {
 	 QString pict = QDir::toNativeSeparators (picturesPath + pictureName);
 	 checkDir (pict);
@@ -834,8 +839,10 @@
 	 fclose (x);
 	 }
 	}
+	
 	if (!currentService. is_audio)
 	 return;
+
 	if (motSlides == nullptr) {
 	 int w = techData. pictureLabel -> width ();
 int h = 2 * w / 3;
@@ -959,7 +966,8 @@
 	 int16_t vec [amount];
 	 while (audioBuffer. GetRingBufferReadAvailable() > amount) {
 	 audioBuffer. getDataFromBuffer (vec, amount);
-	 soundOut	-> audioOut (vec, amount, rate);
+	 if (!muting)
+	 soundOut	-> audioOut (vec, amount, rate);
 	 }
 	}
 }
@@ -1444,8 +1452,17 @@
 	 dynamicLabel	-> setText (s);
 }
 
-void	RadioInterface::setStereo	(int s) {
-	(void)s;
+void	RadioInterface::setStereo	(bool s) {
+	if (!running. load ())
+	 return;
+	if (stereoSetting == s)
+	 return;
+	
+	techData. stereoLabel	-> setStyleSheet (s ?
+	 	 "QLabel {background-color: green; color : white}":
+	 	 "QLabel {background-color: red; color : white}");
+	techData. stereoLabel	-> setText (s ? "stereo" : "mono");
+	stereoSetting = s;
 }
 
 void	RadioInterface::show_tii	(QByteArray data) {
@@ -1486,6 +1503,18 @@
 	my_spectrumViewer. showQuality (q);
 }
 
+void	RadioInterface::show_rsCorrections	(int c) {
+	if (!running)
+	 return;
+	techData. rsCorrections	-> display (c);
+}
+
+void	RadioInterface::show_clockError	(int e) {
+	if (!running. load ())
+	 return;
+	my_spectrumViewer. show_clockErr (e);
+}
+
 void	RadioInterface::showCorrelation	(int amount, int marker) {
 	if (!running. load())
 	 return;
@@ -1675,9 +1704,9 @@
 	soundOut	-> stopDumping();
 	sf_close (audioDumper);
 	audioDumper = nullptr;
-	colorButton (audioDumpButton, Qt::white, 10);
-	audioDumpButton	-> setText ("audio dump");
-	audioDumpButton	-> update ();
+	colorButton (techData. audioDumpButton, Qt::white, 10);
+	techData. audioDumpButton	-> setText ("audio dump");
+	techData. audioDumpButton	-> update ();
 }
 
 void	RadioInterface::start_audioDumping () {
@@ -1721,9 +1750,9 @@
 	saveDir		= dumper. remove (x, dumper. count () - x);
 	dabSettings	-> setValue ("saveDir_audioDump", saveDir);
 
-	colorButton (audioDumpButton, Qt::red, 12);
-	audioDumpButton		-> setText ("WRITING");
-	audioDumpButton		-> update ();
+	colorButton (techData. audioDumpButton, Qt::red, 12);
+	techData. audioDumpButton		-> setText ("WRITING");
+	techData. audioDumpButton		-> update ();
 	soundOut		-> startDumping (audioDumper);
 }
 
@@ -1741,9 +1770,9 @@
 	if (frameDumper == nullptr)
 	 return;
 	fclose (frameDumper);
-	colorButton (frameDumpButton, Qt::white, 10);
-	frameDumpButton	-> setText ("frame dump");
-	frameDumpButton	-> update ();
+	colorButton (techData. frameDumpButton, Qt::white, 10);
+	techData. frameDumpButton	-> setText ("frame dump");
+	techData. frameDumpButton	-> update ();
 	frameDumper	= nullptr;
 }
 
@@ -1783,9 +1812,9 @@
 	saveDir		= dumper. remove (x, dumper. count () - x);
 	dabSettings	-> setValue ("saveDir_frameDump", saveDir);
 
-	colorButton (frameDumpButton, Qt::red, 12);
-	frameDumpButton		-> setText ("recording");
-	frameDumpButton		-> update ();
+	colorButton (techData. frameDumpButton, Qt::red, 12);
+	techData. frameDumpButton		-> setText ("recording");
+	techData. frameDumpButton		-> update ();
 }

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

@@ -124,6 +124,7 @@
 	QLabel			*motSlides;
 	std::vector<int>	secondariesVector;
 	bool			isSynced;
+	bool			stereoSetting;
 	std::atomic<bool>	running;
 	std::atomic<bool>	scanning;
 	deviceHandler		*inputDevice;
@@ -211,6 +212,15 @@
 
 	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);
@@ -229,7 +239,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);
@@ -239,6 +249,7 @@
 	void			showSpectrum		(int);
 	void			showIQ			(int);
 	void			showQuality		(float);
+	void			show_rsCorrections	(int);
 	void			show_tii		(QByteArray);
 	void			closeEvent		(QCloseEvent *event);
 	void			showTime		(const QString &);
@@ -246,6 +257,8 @@
 	void			stopAnnouncement	(const QString &, int);
 	void			newFrame		(int);
 
+	void			show_clockError		(int);
+
 //	Somehow, these must be connected to the GUI
 private slots:
 	void			handle_contentButton	();

_service:download_url:qt-dab-3.5.tar.gz/dab-mini.png -> _service:download_url:qt-dab-3.5.2.tar.gz/dab-mini.png Changed

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

_service:download_url:qt-dab-3.5.tar.gz/dab-mini/dab-mini.ui -> _service:download_url:qt-dab-3.5.2.tar.gz/dab-mini/dab-mini.ui Changed

_service:download_url:qt-dab-3.5.2.tar.gz/dab-mini/devices-dab-mini/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
+
+const char * dabFilter = "RX 3 GAIN -12 DEC 4\n"
+"BWRX 1536000\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.tar.gz/dab-mini/devices-dab-mini/pluto-handler/functions -> _service:download_url:qt-dab-3.5.2.tar.gz/dab-mini/devices-dab-mini/pluto-handler/functions Changed

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2020
+ * Copyright (C) 2020
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -21,12 +21,11 @@
 */
 
 #include	<QThread>
-#include	<QSettings>
-#include	<QTime>
-#include	<QDate>
-#include	<QLabel>
 #include	<QDebug>
 #include	"pluto-handler.h"
+#include	"dabFilter.h"
+
+static	bool	debugFlag	= true;
 
 /* static scratch mem for strings */
 static char tmpstr[64];
@@ -44,99 +43,43 @@
 	result. append (QString::number (id));
 	return result;
 }
-
-/* 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");
-	if (dev == nullptr) {
-	 fprintf (stderr, "No ad9361-phy found, fatal\n");
-	 throw (21);
-	}
- return dev;
+//
+//	Functions from the libad9361, needed here
+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;
 }
 
-/* applies streaming configuration through IIO */
-static
-bool	cfg_ad9361_streaming_ch (struct iio_context *ctx,
-	 struct stream_cfg *cfg, int chid) {
-struct iio_channel *chn = nullptr;
+int	ad9361_get_trx_fir_enable (struct iio_device *dev, int *enable) {
+bool value;
 
-// Configure phy and lo channels
-	fprintf (stderr, "* Acquiring AD9361 phy channel %d\n", chid);
-	try {
-	 chn = iio_device_find_channel (get_ad9361_phy (ctx),
- get_ch_name (QString ("voltage"), chid).
-	 toLatin1 (). data (),
- false);
-	} catch (int e) {
-	 fprintf (stderr, "cannot acquire phy channel %d\n", chid);
-	 return false;
-	}
+	int ret = iio_device_attr_read_bool (dev,
+	 "in_out_voltage_filter_fir_en",
+	 &value);
 
-	int res = iio_channel_attr_write (chn, "rf_port_select",
-	 cfg -> rfport);
-	if (res < 0) {
-	 char error [255];
-	 iio_strerror (res, error, 255); 
-	 fprintf (stderr, "error in port selection %s\n", error);
-	 return false;
-	}
+	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;
 
-	res = iio_channel_attr_write_longlong (chn, "rf_bandwidth",
-	 cfg -> bw_hz);
-	if (res < 0) {
-	 char error [255];
-	 iio_strerror (res, error, 255); 
-	 fprintf (stderr, "cannot select bandwidth %s\n", error);
-	 return false;
-	}
-
-	res = iio_channel_attr_write_longlong (chn,
-	 "sampling_frequency",
-	 cfg -> fs_hz);
-	if (res < 0) {
-	 char error [255];
-	 iio_strerror (res, error, 255); 
-	 fprintf (stderr, "cannot set sampling frequency %s\n", error);
-	 return false;
-	}
-
-	cfg	-> gain_channel = chn;
-// Configure LO channel
-	fprintf (stderr, "* Acquiring AD9361 %s lo channel\n", "RX");
-	cfg -> lo_channel = nullptr;
-	try {
-	 cfg -> lo_channel =
-	 iio_device_find_channel (get_ad9361_phy (ctx),
- get_ch_name ("altvoltage", 0),
- true);
-	} catch (int e) {}
-	if (cfg -> lo_channel == nullptr) {
-	 fprintf (stderr, "cannot find lo for channel\n");
-	 return false;
-	}
-
-	res = iio_channel_attr_write_longlong (cfg -> lo_channel,
-	 "frequency",
-	 cfg -> lo_hz);
-	if (res < 0 ) {
-	 char error [255];
-	 iio_strerror (res, error, 255); 
-	 fprintf (stderr, "cannot set local oscillator frequency %s\n",
-	 error);
-	 return false;
-	}
-	return true;
+	return ret;
 }
-
 /* finds AD9361 streaming IIO channels */
-static
-bool get_ad9361_stream_ch (__notused struct iio_context *ctx,
-	 struct iio_device *dev,
-	 int chid, struct iio_channel **chn) {
- *chn = iio_device_find_channel (dev,
-	 get_ch_name ("voltage", chid), false);
+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),
@@ -144,47 +87,58 @@
 return *chn != nullptr;
 }
 
-	plutoHandler::plutoHandler (QSettings *s,
+	plutoHandler::plutoHandler (QSettings	*s,
 	 QSpinBox	*gainControl,
 	 QCheckBox	*agcControl):
 	 _I_Buffer (4 * 1024 * 1024) {
-	plutoSettings			= s;
-
-	ctx				= nullptr;
-	rxbuf				= nullptr;
-	rx0_i				= nullptr;
-	rx0_q				= nullptr;
-
-	rxcfg. bw_hz			= PLUTO_RATE;
-	rxcfg. fs_hz			= PLUTO_RATE;
-	rxcfg. lo_hz			= 220000000;
-	rxcfg. rfport			= "A_BALANCED";
+struct iio_channel *chn		= nullptr;
 
+	phys_dev			= nullptr;
+	plutoSettings			= s;
+	this	-> gainControl		= gainControl;
+	this	-> agcControl		= agcControl;
+	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";
+
+	gainControl	-> setRange	(20, 59);
 	plutoSettings	-> beginGroup ("plutoSettings");
 	bool agcMode	=
 	 plutoSettings -> value ("pluto-agc", 0). toInt () == 1;
 	int gainValue	=
 	 plutoSettings -> value ("pluto-gain", 50). toInt ();
+	save_gainSettings =
+	 plutoSettings -> value ("save_gainSettings", 1). toInt () != 0;
 	plutoSettings	-> endGroup ();
+

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

@@ -1,10 +1,10 @@
 #
 /*
- * Copyright (C) 2017 .. 2018
+ * Copyright (C) 2020
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
- * This file is part of the dabMini
+ * This file is part of dabMini
 *
 * dabMini is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,25 +24,16 @@
 #ifndef __PLUTO_HANDLER__
 #define	__PLUTO_HANDLER__
 
-#include <QByteArray>
-#include	<QSpinBox>
-#include	<QCheckBox>
+#include	<QtNetwork>
 #include	<QSettings>
+#include <QCheckBox>
+#include <QSpinBox>
 #include	<atomic>
 #include	<iio.h>
 #include	"dab-constants.h"
 #include	"ringbuffer.h"
 #include	"device-handler.h"
 
-/* common RX and TX streaming params */
-struct stream_cfg {
- long long	bw_hz; // Analog banwidth in Hz
- long long	fs_hz; // Baseband sample rate in Hz
- long long	lo_hz; // Local oscillator frequency in Hz
- const char* rfport; // Port name
-	struct	iio_channel	*lo_channel;
-	struct	iio_channel	*gain_channel;
-};
 
 #ifndef	PLUTO_RATE
 #define	PLUTO_RATE	2100000
@@ -50,12 +41,12 @@
 #define	DIVIDER		1000
 #define	CONV_SIZE	(PLUTO_RATE / DIVIDER)
 #endif
+
 class	plutoHandler: public deviceHandler {
 Q_OBJECT
 public:
-			plutoHandler		(QSettings *, 
-	 QSpinBox *,
-	 QCheckBox *);
+			plutoHandler		(QSettings *,
+	 QSpinBox *, QCheckBox *);
 		~plutoHandler		();
 	bool		restartReader		(int32_t);
 	void		stopReader		();
@@ -67,20 +58,33 @@
 
 private:
 	RingBuffer<std::complex<float>>	_I_Buffer;
+	QSettings		*plutoSettings;
 	QSpinBox		*gainControl;
 	QCheckBox		*agcControl;
+
 	void			run		();
-	QSettings		*plutoSettings;
 	int32_t			inputRate;
 	int32_t			vfoFrequency;
 	std::atomic<bool>	running;
+// 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	rxcfg;
 	bool			connected;
 	std::complex<float>	convBuffer	[CONV_SIZE + 1];
 	int			convIndex;
@@ -89,9 +93,11 @@
 
 	void			record_gainSettings	(int);
 	void			update_gainSettings	(int);
+	bool			save_gainSettings;
+//
 signals:
-	void			new_gainValue	(int);
-	void			new_agcValue	(bool);
+	void		new_gainValue		(int);
+	void		new_agcValue		(bool);
 private slots:
 	void		set_gainControl		(int);
 	void		set_agcControl		(int);

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

@@ -0,0 +1,106 @@
+<?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>experimental 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="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.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler/sdrplay-handler.cpp -> _service:download_url:qt-dab-3.5.2.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler/sdrplay-handler.cpp Changed

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

@@ -56,6 +56,9 @@
 #ifdef	HAVE_LIME
 #include	"lime-handler.h"
 #endif
+#ifdef	HAVE_PLUTO
+#include	"pluto-handler.h"
+#endif
 //
 //	approach: if a preset is called for, the "nextService"
 //	is set,
@@ -123,7 +126,7 @@
 	latency			=
 	                  dabSettings -> value ("latency", 5). toInt();
 
-
+	stereoSetting		= false;
 	my_dabProcessor		= nullptr;
 //
 //	as with many of the buffers, picturesPath is not used
@@ -536,6 +539,16 @@
 	   return inputDevice;
 	} catch (int e) {}
 #endif
+#ifdef	HAVE_PLUTO
+	try {
+	   inputDevice = new plutoHandler (dabSettings,
+	                                   gainSelector,
+	                                   agcControl);
+	   gainSelector	-> show ();
+	   agcControl	-> show ();
+	   return inputDevice;
+	} catch (int e) {}
+#endif
 #ifdef	HAVE_HACKRF
 	try {
 	   inputDevice	= new hackrfHandler (dabSettings,
@@ -607,8 +620,18 @@
 	}
 }
 
-void	RadioInterface::setStereo	(int s) {
-	(void)s;
+void	RadioInterface::setStereo	(bool s) {
+	if (!running. load ())
+           return;
+        if (stereoSetting == s)
+           return;
+
+        stereoLabel   -> setStyleSheet (s ?
+                         "QLabel {background-color: green; color : white}":
+                         "QLabel {background-color: red; color : white}");
+        stereoLabel   -> setText (s ? "stereo" : "mono");
+        stereoSetting = s;
+
 }
 
 void	RadioInterface::show_tii	(QByteArray data) {
@@ -627,6 +650,14 @@
 	(void)q;
 }
 
+void	RadioInterface::show_rsCorrections	(int c) {
+	(void)c;
+}
+
+void	RadioInterface::show_clockError	(int e) {
+	(void)e;
+}
+
 void	RadioInterface::showCorrelation	(int amount, int marker) {
 	(void)amount; (void)marker;
 }
@@ -883,6 +914,10 @@
 	serviceLabel		-> setText ("");
 	dynamicLabel		-> setText ("");
 	presetSelector		-> setCurrentIndex (0);
+	stereoLabel	-> setStyleSheet (
+                         "QLabel {background-color: white; color : black}");
+        stereoLabel	-> setText ("");
+	stereoSetting		= false;
 }
 
 void	RadioInterface::start_audioService (const QString &serviceName) {

_service:download_url:qt-dab-3.5.tar.gz/dab-mini/radio.h -> _service:download_url:qt-dab-3.5.2.tar.gz/dab-mini/radio.h Changed

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

@@ -93,6 +93,8 @@
 	 myRadioInterface, SLOT (show_tii (QByteArray)));
 	connect (this, SIGNAL (show_snr (int)),
 	 mr, SLOT (show_snr (int)));
+	connect (this, SIGNAL (show_clockErr (int)),
+	 mr, SLOT (show_clockError (int)));
 	my_TII_Detector. reset();
 }
 
@@ -137,6 +139,9 @@
 timeSyncer	myTimeSyncer (&myReader);
 int		attempts;
 std::vector<int16_t> ibits;
+int	frameCount	= 0;
+int	sampleCount	= 0;
+int	totalSamples	= 0;
 
 	inputDevice	-> resetBuffer ();
 	inputDevice	-> restartReader (frequency);
@@ -155,6 +160,10 @@
 //Initing:
 notSynced:
 	 totalFrames ++;
+	 totalSamples	= 0;
+	 frameCount	= 0;
+	 sampleCount	= 0;
+
 	 setSynced (false);
 	 my_TII_Detector. reset ();
 	 switch (myTimeSyncer. sync (T_null, T_F)) {
@@ -187,10 +196,18 @@
 	 badFrames ++;
 	 goto notSynced;
 	 }
+	 sampleCount	= startIndex;
 	 goto SyncOnPhase;
 //
 Check_endofNULL:
 	 totalFrames ++;
+	 frameCount ++;
+	 totalSamples	+= sampleCount;
+	 if (frameCount > 10) {
+	 show_clockErr (totalSamples - frameCount * 196608);
+	 totalSamples = 0;
+	 frameCount = 0;
+	 }
 	 myReader. getSamples (ofdmBuffer. data(),
 	 T_u, coarseOffset + fineOffset);
 /**
@@ -208,6 +225,7 @@
 	 goto notSynced;
 	 }
 
+	 sampleCount = startIndex;
 SyncOnPhase:
 	 goodFrames ++;
 /**
@@ -231,6 +249,7 @@
 	 myReader. getSamples (&((ofdmBuffer. data()) [ofdmBufferIndex]),
 	 T_u - ofdmBufferIndex,
 	 coarseOffset + fineOffset);
+	 sampleCount += T_u;
 	 my_ofdmDecoder. processBlock_0 (ofdmBuffer);
 	 if (!scanMode)
 	 my_mscHandler. processBlock_0 (ofdmBuffer. data());
@@ -265,6 +284,7 @@
 	 ofdmSymbolCount < nrBlocks; ofdmSymbolCount ++) {
 	 myReader. getSamples (ofdmBuffer. data(),
 	 T_s, coarseOffset + fineOffset);
+	 sampleCount += T_s;
 	 for (i = (int)T_u; i < (int)T_s; i ++) 
 	 FreqCorr += ofdmBuffer [i] * conj (ofdmBuffer [i - T_u]);
 
@@ -284,6 +304,7 @@
 */
 	 myReader. getSamples (ofdmBuffer. data(),
 	 T_null, coarseOffset + fineOffset);
+	 sampleCount += T_null;
 	 float sum	= 0;
 	 for (i = 0; i < T_null; i ++)
 	 sum += abs (ofdmBuffer [i]);
@@ -339,7 +360,7 @@
 	 goto Check_endofNULL;
 	}
 	catch (int e) {
-	 fprintf (stderr, "dabProcessor is stopping\n");
+//	 fprintf (stderr, "dabProcessor is stopping\n");
 	 ;
 	}
 	inputDevice	-> stopReader ();

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

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

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

@@ -754,7 +754,7 @@
 </widget>
 </item>
 <item row="3" column="6" colspan="2">
- <widget class="smallPushButton" name="audioDumpButton">
+ <widget class="smallPushButton" name="muteButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -771,12 +771,12 @@
 <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>
 </property>
 <property name="text">
- <string>audio dump</string>
+ <string>mute</string>
 </property>
 </widget>
 </item>
 <item row="3" column="4" colspan="2">
- <widget class="smallPushButton" name="frameDumpButton">
+ <widget class="smallPushButton" name="notUsedButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -793,7 +793,7 @@
 <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>
 </property>
 <property name="text">
- <string>frame dump</string>
+ <string>not used</string>
 </property>
 </widget>
 </item>

_service:download_url:qt-dab-3.5.2.tar.gz/forms/dabradio.ui-old Added

@@ -0,0 +1,858 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dabradio</class>
+ <widget class="QWidget" name="dabradio">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>642</width>
+ <height>407</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle">
+ <string>Qt-DAB-3.5</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QWidget" name="leftPane" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>3</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="smallQListView" name="ensembleDisplay">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>10</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecting a service is by clicking with the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;left &lt;/span&gt;mouse button on the name of the service.&lt;/p&gt;&lt;p&gt;Clicking with the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;right mouse button on the name of the selected service &lt;/span&gt;in this list will add the service to the presets.&lt;/p&gt;&lt;p&gt;Clicking with the right mouse button on the name of any other of the listed services will show some data on that service.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="presetComboBox" name="presetSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Presets are short cuts to services - possibly in ensembles in different channels - that are obtained by clicking with the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;right &lt;/span&gt;mouse button on the name of the service &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;in the list of services when selected&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;Removing a name from the presets is by selecting the service in this combobox and pressing the shift+delete combination.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>Presets</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="smallPushButton" name="prevServiceButton">
+ <property name="toolTip">
+ <string>Select the previous service on the list of services (the previous one of the first element is the last element of the list).</string>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="smallPushButton" name="nextServiceButton">
+ <property name="toolTip">
+ <string>Select the next service on the list of services (the next of the last element is the first element).</string>
+ </property>
+ <property name="text">
+ <string>+</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="smallComboBox" name="channelSelector">
+ <property name="toolTip">
+ <string>Channel selector.</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>channels</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="smallPushButton" name="prevChannelButton">
+ <property name="toolTip">
+ <string>Select the previous channel.</string>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="smallPushButton" name="nextChannelButton">
+ <property name="toolTip">
+ <string>Select the next channel of the list maintained in the channel selector.</string>
+ </property>
+ <property name="text">
+ <string>+</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="rightPane" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <item>
+ <widget class="QLabel" name="runtimeDisplay">
+ <property name="frameShape">
+ <enum>QFrame::Panel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="text">
+ <string>run-time</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="localTimeDisplay">
+ <property name="toolTip">
+ <string>Local time is the time as received from the transmission. If you are running recordings, then
+it is definitely not the time on your clock.</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Panel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="text">
+ <string>localTime</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="copyrightLabel">
+ <property name="font">
+ 
+ <pointsize>14</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Qt-DAB copyright:&lt;/p&gt;&lt;p&gt;J van Katwijk, Lazy Chair Computing. J.vanKatwijk@gmail.com&lt;/p&gt;&lt;p&gt;Copyright of the Qt toolkit used: the Qt Company&lt;/p&gt;&lt;p&gt;Copyright of the libraries used for SDRplay, rtl-sdr based sticks, AIRspy, portaudio, libsndfile and libsamplerate and libfftw3 to their developers&lt;/p&gt;&lt;p&gt;Copyright of the MP2 library used Martin J Fiedler&lt;/p&gt;&lt;p&gt;Copyright of the firecode checker: Gnu Radio&lt;/p&gt;&lt;p&gt;Copyright of the Reed Solomon Decoder software: Phil Karns&lt;/p&gt;&lt;p&gt;Copyright of the code to create a correct header for the AAC files: Stefan Poeschel&lt;/p&gt;&lt;p&gt;All copyrights gratefully acknowledged&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;The current layout of the GUI is based on a design of Luo Zhang, Thanks&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Qt-DAB (an SDR-J program) 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.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>©</string>
+ </property>
+ <property name="alignment">

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

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>224</width>
- <height>569</height>
+ <width>229</width>
+ <height>570</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -15,19 +15,41 @@
 </property>
 <layout class="QVBoxLayout" name="verticalLayout">
 <item>
- <widget class="QLabel" name="programName">
- <property name="font">
- 
- <pointsize>16</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;Service long label&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>programName</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="programName">
+ <property name="font">
+ 
+ <pointsize>14</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;Service long label&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>programName</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="smallPushButton" name="frameDumpButton">
+ <property name="text">
+ <string>frame dump</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="smallPushButton" name="audioDumpButton">
+ <property name="text">
+ <string>dump audio</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 <item>
 <layout class="QFormLayout" name="formLayout">
@@ -102,14 +124,27 @@
 </property>
 </widget>
 </item>
- <item row="4" column="0">
+ <item row="4" column="1">
+ <widget class="QLCDNumber" name="rsCorrections">
+ <property name="toolTip">
+ <string>The number of corrections made by the reed-solomon algorithm over 10 DAB+ frames (so the number does not relate to the classic DAB/MP2 frames)</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
 <widget class="QLabel" name="l6">
 <property name="text">
 <string>Bitrate in kBit/s</string>
 </property>
 </widget>
 </item>
- <item row="4" column="1">
+ <item row="5" column="1">
 <widget class="QLCDNumber" name="bitrateDisplay">
 <property name="frameShape">
 <enum>QFrame::NoFrame</enum>
@@ -119,6 +154,13 @@
 </property>
 </widget>
 </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>rs corrections/100</string>
+ </property>
+ </widget>
+ </item>
 </layout>
 </item>
 <item>
@@ -212,6 +254,20 @@
 </property>
 </widget>
 </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_11">
+ <property name="text">
+ <string>audio:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLabel" name="stereoLabel">
+ <property name="text">
+ <string>mono</string>
+ </property>
+ </widget>
+ </item>
 </layout>
 </item>
 <item>
@@ -329,6 +385,13 @@
 </item>
 </layout>
 </widget>
+ <customwidgets>
+ <customwidget>
+ <class>smallPushButton</class>
+ <extends>QPushButton</extends>
+ <header location="global">smallpushbutton.h</header>
+ </customwidget>
+ </customwidgets>
 <resources/>
 <connections/>
 </ui>

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

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

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

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

_service:download_url:qt-dab-3.5.tar.gz/qt-dab-presets.png -> _service:download_url:qt-dab-3.5.2.tar.gz/qt-dab-presets.png Changed

_service:download_url:qt-dab-3.5.tar.gz/qt-usersguide.png -> _service:download_url:qt-dab-3.5.2.tar.gz/qt-usersguide.png Changed

_service:download_url:qt-dab-3.5.tar.gz/sound-client/audiosink.cpp -> _service:download_url:qt-dab-3.5.2.tar.gz/sound-client/audiosink.cpp Changed

@@ -2,27 +2,23 @@
 /*
 * Copyright (C) 2011, 2012, 2013
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Programming
+ * Lazy Chair Computing
 *
- * This file is part of the SDR-J.
- * Many of the ideas as implemented in SDR-J are derived from
- * other work, made available through the GNU general Public License. 
- * All copyrights of the original authors are recognized.
+ * This file is part of Qt-DAB
 *
- * SDR-J is free software; you can redistribute it and/or modify
+ * 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.
 *
- * SDR-J is distributed in the hope that it will be useful,
+ * 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 SDR-J; if not, write to the Free Software
+ * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
 */
 
 #include	"audiosink.h"
@@ -40,7 +36,6 @@
 	_O_Buffer		= new RingBuffer<float>(2 * 32768);
 	portAudio		= false;
 	writerRunning		= false;
-
 	if (Pa_Initialize () != paNoError) {
 	 fprintf (stderr, "Initializing Pa for output failed\n");
 	 return;
@@ -201,11 +196,11 @@
 //
 //	putSample output comes from the FM receiver
 
-int32_t	audioSink::putSample	(DSPCOMPLEX v) {
+int32_t	audioSink::putSample	(std::complex<float> v) {
 	return putSamples (&v, 1);
 }
 
-int32_t	audioSink::putSamples		(DSPCOMPLEX *V, int32_t n) {
+int32_t	audioSink::putSamples		(std::complex<float> *V, int32_t n) {
 float	*buffer = (float *)alloca (2 * n * sizeof (float));
 int32_t	i;
 int32_t	available = _O_Buffer -> GetRingBufferWriteAvailable ();

_service:download_url:qt-dab-3.5.tar.gz/sound-client/audiosink.h -> _service:download_url:qt-dab-3.5.2.tar.gz/sound-client/audiosink.h Changed

@@ -2,31 +2,27 @@
 /*
 * Copyright (C) 2009, 2010, 2011
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Programming
+ * Lazy Chair Computing
 *
- * This file is part of the SDR-J.
- * Many of the ideas as implemented in ESDR are derived from
- * other work, made available through the GNU general Public License. 
- * All copyrights of the original authors are recognized.
+ * This file is part of Qt-DAB and friends
 *
- * SDR-J is free software; you can redistribute it and/or modify
+ * 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.
 *
- * SDR-J is distributed in the hope that it will be useful,
+ * 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 SDR-J; if not, write to the Free Software
+ * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
 */
 
-#ifndef __AUDIO_SINK
-#define	__AUDIO_SINK
+#ifndef __AUDIO_SINK__
+#define	__AUDIO_SINK__
 #include	"sound-constants.h"
 #include	<QString>
 #include	<portaudio.h>
@@ -46,8 +42,8 @@
 	QString		outputChannelwithRate	(int16_t, int32_t);
 	void		stop			(void);
 	void		restart			(void);
-	int32_t		putSample		(DSPCOMPLEX);
-	int32_t		putSamples		(DSPCOMPLEX *, int32_t);
+	int32_t		putSample		(std::complex<float>);
+	int32_t		putSamples		(std::complex<float> *, int32_t);
 	int16_t		invalidDevice		(void);
 	bool		isValidDevice		(int16_t);

_service:download_url:qt-dab-3.5.tar.gz/sound-client/sound-client.cpp -> _service:download_url:qt-dab-3.5.2.tar.gz/sound-client/sound-client.cpp Changed

@@ -4,20 +4,20 @@
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
- *    This file is part of the SDR-J.
+ *    This file is part of Qt-DAB
  *
- *    SDR-J is free software; you can redistribute it and/or modify
+ *    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.
  *
- *    SDR-J is distributed in the hope that it will be useful,
+ *    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 SDR-J; if not, write to the Free Software
+ *    along with Qt-DAB; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *     Communication via network to a DAB receiver to

_service:download_url:qt-dab-3.5.tar.gz/spectrum-viewer/scopewidget.ui -> _service:download_url:qt-dab-3.5.2.tar.gz/spectrum-viewer/scopewidget.ui Changed

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

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

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

@@ -60,10 +60,12 @@
 	 mr, SLOT (show_rsErrors (int)));
 	connect (this, SIGNAL (show_aacErrors (int)),
 	 mr, SLOT (show_aacErrors (int)));
-	connect (this, SIGNAL (isStereo (int)),
-	 mr, SLOT (setStereo (int)));
+	connect (this, SIGNAL (isStereo (bool)),
+	 mr, SLOT (setStereo (bool)));
 	connect (this, SIGNAL (newFrame (int)),
 	 mr, SLOT (newFrame (int)));
+	connect (this, SIGNAL (show_rsCorrections (int)),
+	 mr, SLOT (show_rsCorrections (int)));
 #ifdef	__WITH_FDK_AAC__
 	aacDecoder		= new fdkAAC (mr, b);
 #else
@@ -83,6 +85,8 @@
 	aacFrames	= 0;
 	successFrames	= 0;
 	rsErrors	= 0;
+	totalCorrections	= 0;
+	goodFrames		= 0;
 }
 
 	mp4Processor::~mp4Processor() {
@@ -182,6 +186,14 @@
 //	 fprintf (stderr, "RS failure\n");
 	 return false;
 	 }
+	 totalCorrections += ler;
+	 goodFrames ++;
+	 if (goodFrames >= 100) {
+	 show_rsCorrections (totalCorrections);
+	 totalCorrections = 0;
+	 goodFrames = 0;
+	 }
+
 	 for (k = 0; k < 110; k ++) 
 	 outVector [j + k * RSDims] = rsOut [k];
 	}
@@ -318,7 +330,8 @@
 	 theAudioUnit,
 	 aac_frame_length);
 #endif
-	 emit isStereo (streamParameters. aacChannelMode);
+	 emit isStereo ((streamParameters. aacChannelMode == 1) ||
+	 (streamParameters. psFlag == 1));
 	 if (tmp <= 0) 
 	 aacErrors ++;
 	 if (++aacFrames > 25) {

_service:download_url:qt-dab-3.5.2.tar.gz/version-v4 Added

_service:download_url:qt-dab-3.5.tar.gz/dab-2/linux-bin Deleted

_service:download_url:qt-dab-3.5.tar.gz/dab-2/linux-bin/dab-2 Deleted

_service:download_url:qt-dab-3.5.tar.gz/dab-maxi/qt-devices/pluto-xxx Deleted

_service:download_url:qt-dab-3.5.tar.gz/dab-maxi/qt-devices/pluto-xxx/functions Deleted

@@ -1,25 +0,0 @@
-__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.tar.gz/dab-maxi/qt-devices/pluto-xxx/iio.h Deleted

@@ -1,1777 +0,0 @@
-/*
- * 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.tar.gz/dab-maxi/qt-devices/pluto-xxx/pluto-handler.cpp Deleted

@@ -1,831 +0,0 @@
-#
-/*
- * 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"
-
-#ifdef __MINGW32__
-#define GETPROCADDRESS GetProcAddress
-#else
-#define GETPROCADDRESS dlsym
-#endif
-
-/* 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;
-}
-
-/* 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 = this -> iio_device_find_channel (dev,
-	 get_ch_name ("voltage", chid),
-	 false);
- if (*chn == nullptr)
-	 *chn = this -> iio_device_find_channel (dev,
-	 get_ch_name ("altvoltage", chid),
-	 false);
- return *chn != nullptr;
-}
-
-	plutoHandler::plutoHandler (QSettings *s,
-	 QString &recorderVersion):
-	 myFrame (nullptr),
-	 _I_Buffer (4 * 1024 * 1024) {
-struct iio_channel *chn		= nullptr;
-struct iio_device *phys_dev	= nullptr;
-
-	plutoSettings			= s;
-	this	-> recorderVersion	= recorderVersion;
-	setupUi (&myFrame);
-	myFrame. show	();
-
-#ifdef	__MINGW32__
-	const char *libraryString = "libiio.dll";
-	Handle		= LoadLibrary ((wchar_t *)L"libiio.dll");
-	if (Handle == nullptr) {
-	 fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
-//	 delete myFrame;
-	 throw (20);
-	}
-#else
-	const char *libraryString = "libiio.so";
-	Handle		= dlopen ("libiio.so", RTLD_NOW);
-
-	if (Handle == nullptr) {
-	 fprintf (stderr, "failed to open %s (%s)\n", libraryString, dlerror());
-//	 delete myFrame;
-	 throw (20);
-	}
-#endif
-	if (!load_plutoFunctions()) {
-#ifdef __MINGW32__
-	 FreeLibrary (Handle);
-#else
-	 dlclose (Handle);
-#endif
-//	 delete myFrame;
-	 throw (21);
-	}
-
-	fprintf (stderr, "functions are loaded\n");
-	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	= this -> iio_create_default_context ();
-	if (ctx == nullptr) {
-	 if (debugFlag)
-	 fprintf (stderr, "default context failed\n");
-	 ctx = this -> iio_create_local_context ();
-	}
-
-	if (ctx == nullptr) {
-	 if (debugFlag)
-	 fprintf (stderr, "creating local context failed\n");
-	 ctx = this -> iio_create_network_context ("pluto.local");
-	}
-
-	if (ctx == nullptr) {
-	 if (debugFlag)
-	 fprintf (stderr, "creating network context with pluto.local failed\n");
-	 ctx = this -> 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",
-	 this -> iio_context_get_name (ctx));
-
-	state	-> setText ("Context created,\n looking for devices");
-	if (this -> iio_context_get_devices_count (ctx) <= 0) {
-	 state -> setText ("no devices found, fatal");
-	 this -> iio_context_destroy	(ctx);
-	 throw (25);
-	}
-
-	rx = this -> iio_context_find_device (ctx, "cf-ad9361-lpc");
-	if (rx == nullptr) {
-	 state -> setText ("No device found");
-	 this -> iio_context_destroy (ctx);
-	 throw (26);
-	}
-
- 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 = this -> iio_context_find_device (ctx, "ad9361-phy");
-	if (phys_dev == nullptr) {
-	 if (debugFlag) 
-	 fprintf (stderr, "no ad9361 found\n");
-	 this -> iio_context_destroy (ctx);
-	 throw (27);
-	}
-
-	chn = this -> iio_device_find_channel (phys_dev,
- get_ch_name (QString ("voltage"), 0).
-	 toLatin1 (). data (),

_service:download_url:qt-dab-3.5.tar.gz/dab-maxi/qt-devices/pluto-xxx/pluto-handler.h Deleted

@@ -1,181 +0,0 @@
-#
-/*
- * 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"
-
-class	xml_fileWriter;
-
-#ifndef	PLUTO_RATE
-#define	PLUTO_RATE	2100000
-#define	DAB_RATE	2048000
-#define	DIVIDER		1000
-#define	CONV_SIZE	(PLUTO_RATE / DIVIDER)
-#endif
-
-extern "C" {
-typedef struct iio_channel * (*p_iio_device_find_channel)(
- const struct iio_device *dev, const char *name, bool output);
-typedef struct iio_context * (*p_iio_create_default_context)(void);
-typedef struct iio_context * (*p_iio_create_local_context)(void);
-typedef struct iio_context * (*p_iio_create_network_context)(const char *host);
-typedef const char * (*p_iio_context_get_name)(const struct iio_context *ctx);
-typedef unsigned int (*p_iio_context_get_devices_count)(
- const struct iio_context *ctx);
-typedef struct iio_device * (*p_iio_context_find_device)(
- const struct iio_context *ctx, const char *name);
-typedef size_t (*p_iio_device_attr_write)(const struct iio_device *dev,
- const char *attr, const char *src);
-typedef int (*p_iio_device_attr_write_longlong)(const struct iio_device *dev,
- const char *attr, long long val);
-typedef ssize_t (*p_iio_channel_attr_write)(const struct iio_channel *chn,
- const char *attr, const char *src);
-typedef int (*p_iio_channel_attr_write_longlong)(const struct iio_channel *chn,
- const char *attr, long long val);
-
-typedef void (*p_iio_channel_enable)(struct iio_channel *chn);
-
-typedef struct iio_buffer * (*p_iio_device_create_buffer)(const struct iio_device *dev,
- size_t samples_count, bool cyclic);
-typedef int (*p_iio_buffer_set_blocking_mode)(struct iio_buffer *buf, bool blocking);
-typedef void (*p_iio_buffer_destroy) (struct iio_buffer *buf);
-typedef void (*p_iio_context_destroy)(struct iio_context *ctx);
-typedef ssize_t (*p_iio_buffer_refill)(struct iio_buffer *buf);
-typedef ptrdiff_t (*p_iio_buffer_step)(const struct iio_buffer *buf);
-typedef void * (*p_iio_buffer_end)(const struct iio_buffer *buf);
-typedef void * (*p_iio_buffer_first)(const struct iio_buffer *buf,
- const struct iio_channel *chn);
-typedef void (*p_iio_strerror)(int err, char *dst, size_t len);
-
-}
-
-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:
-	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;
-
-	HINSTANCE		Handle;
-	bool			load_plutoFunctions	();
-	void			run		();
-	int32_t			inputRate;
-	int32_t			vfoFrequency;
-	std::atomic<bool>	running;
-	bool			debugFlag;
-// configuration items
- 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];
-
-	void			record_gainSettings	(int);
-	void			update_gainSettings	(int);
-//
-//	and the functions from the library
-	
-	p_iio_device_find_channel	iio_device_find_channel;
-	p_iio_create_default_context	iio_create_default_context;
-	p_iio_create_local_context	iio_create_local_context;
-	p_iio_create_network_context	iio_create_network_context;
-	p_iio_context_get_name		iio_context_get_name;
-	p_iio_context_get_devices_count	iio_context_get_devices_count;
-	p_iio_context_find_device	iio_context_find_device;
-	p_iio_device_attr_write		iio_device_attr_write;
-	p_iio_device_attr_write_longlong iio_device_attr_write_longlong;
-	p_iio_channel_attr_write	iio_channel_attr_write;
-	p_iio_channel_attr_write_longlong iio_channel_attr_write_longlong;
-	p_iio_channel_enable		iio_channel_enable;
-	p_iio_device_create_buffer	iio_device_create_buffer;
-	p_iio_buffer_set_blocking_mode	iio_buffer_set_blocking_mode;
-	p_iio_buffer_destroy		iio_buffer_destroy;
-	p_iio_context_destroy		iio_context_destroy;
-	p_iio_buffer_refill		iio_buffer_refill;
-	p_iio_buffer_step		iio_buffer_step;
-	p_iio_buffer_end		iio_buffer_end;
-	p_iio_buffer_first		iio_buffer_first;
-	p_iio_strerror			iio_strerror;
-signals:
-	void		new_gainValue		(int);
-	void		new_agcValue		(bool);
-private slots:
-	void		set_gainControl		(int);
-	void		set_agcControl		(int);
-	void		toggle_debugButton	();
-	void		set_xmlDump		();
-};
-#endif
-

_service:download_url:qt-dab-3.5.tar.gz/dab-maxi/qt-devices/pluto-xxx/pluto-widget.ui Deleted

@@ -1,106 +0,0 @@
-<?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>experimental Pluto interface</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="usb_board_id_display">
- <property name="text">
- <string>usb board display</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="serialNumber">
- <property name="text">
- <string>serial number</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <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>