some mods to Beta files

JvanKatwijk · Feb 1, 2024 · 157732f · 157732f
1 parent 5493116
commit 157732f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/docs/manual-6.pdf b/docs/manual-6.pdf
diff --git a/qt-dab-RC/qt-dab-RC.pro b/qt-dab-RC/qt-dab-RC.pro
@@ -10,8 +10,8 @@ QT		+= widgets xml
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++14
 win32 {
-QMAKE_CFLAGS	+=  -O3 -ffast-math
-QMAKE_CXXFLAGS	+=  -O3 -ffast-math
+#QMAKE_CFLAGS	+=  -O3 -ffast-math
+#QMAKE_CXXFLAGS	+=  -O3 -ffast-math
 }
 unix {
 QMAKE_CXXFLAGS	+=  -ffast-math -flto
@@ -487,10 +487,10 @@ isEmpty(GITHASHSTRING) {
 #	DEFINES		+= __THREADED_BACKEND
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-6.5V3
-	CONFIG		+= dabstick-win-v3
-#	TARGET		= qt-dab32-6.5Beta
-#	CONFIG		+= dabstick-win-v4
+#	TARGET		= qt-dab32-6.5V3
+#	CONFIG		+= dabstick-win-v3
+	TARGET		= qt-dab32-6.5Beta
+	CONFIG		+= dabstick-win-v4
 	CONFIG		+= airspy
 	CONFIG		+= spyServer-16
 	CONFIG		+= spyServer-8

diff --git a/qt-dab-RC/radio.cpp b/qt-dab-RC/radio.cpp
@@ -319,7 +319,7 @@ QString h;
 	         if (the_ensembleHandler -> hasFavorite (ss. at (1))) {
 	            the_ensembleHandler -> set_showMode (SHOW_PRESETS);
 	            presetButton -> setText ("ensemble");
-	            fprintf (stderr, "Set view to presets\n");
+//	            fprintf (stderr, "Set view to presets\n");
 	         }
 	      }
 	      else {
@@ -2715,16 +2715,16 @@ void	RadioInterface::set_channelButton (int currentChannel) {
 void	RadioInterface::handle_scanButton () {
 	if (!running. load ())
 	   return;
-	if (the_ensembleHandler -> get_showMode () != SHOW_ENSEMBLE)
-	   return;
 	if (scanMonitor. isVisible ())
 	   scanMonitor. hide ();
 	else
 	   scanMonitor. show ();
 }
 
 void	RadioInterface::startScanning	() {
-//	presetButton	-> setEnabled (false);
+	the_ensembleHandler	-> set_showMode (SHOW_ENSEMBLE);
+	presetButton		-> setText ("not in use");
+	presetButton	-> setEnabled (false);
 	stopChannel     ();
 	presetTimer. stop ();
 	channelTimer. stop ();
@@ -2837,6 +2837,8 @@ void	RadioInterface::stopScanning	() {
 	            this, SLOT (no_signal_found ()));
 	if (!scanMonitor. active ())
 	   return;
+	presetButton	-> setText ("favorites");
+	presetButton	-> setEnabled (true);
 	LOG ("scanning stops ", "");
 	if (scanMonitor. scan_to_data ())
 	   stop_scan_to_data ();

diff --git a/qt-dab-RC/support/ensemble-handler.cpp b/qt-dab-RC/support/ensemble-handler.cpp
@@ -621,7 +621,6 @@ int	ensembleHandler::get_showMode	() {
 void	ensembleHandler::set_showMode	(int m) {
 	if (!handlePresets)
 	   return;
-	fprintf (stderr, "setting showMode %d\n", m);
 	if (ensembleMode == m)
 	   return;
 	ensembleMode	= m == SHOW_ENSEMBLE ? SHOW_ENSEMBLE : SHOW_PRESETS;

diff --git a/qt-dab-RC/support/scan-handler.cpp b/qt-dab-RC/support/scan-handler.cpp
@@ -103,7 +103,8 @@ QString scanmodeText (int e) {
 }
 
 	scanHandler::scanHandler (RadioInterface *theRadio,
-	                                         QSettings *s, const QString &extFile):
+	                                         QSettings *s,
+	                                         const QString &extFile):
 	                                             myWidget (nullptr),
 	                                             skipTable (s),
 	                                             filenameFinder (s) {

diff --git a/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp b/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp
@@ -43,6 +43,7 @@
 #define SDRPLAY_RSP2_   2
 #define SDRPLAY_RSPduo_ 3
 #define SDRPLAY_RSPdx_  4
+#define SDRPLAY_RSP1B_  6
 
 #include	"device-exceptions.h"
 
@@ -618,6 +619,7 @@ uint32_t                ndev;
 	         break;
 
 	      case SDRPLAY_RSP1A_ :
+	      case SDRPLAY_RSP1B_ :
 	         theRsp	= new Rsp1A_handler (this,
 	                                     chosenDevice,
 	                                     inputRate,