Upstream version 2.11AS

configure.ac

@@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
 dnl contain other characters or be empty
 m4_define(FLDIGI_MAJOR, [2])
 m4_define(FLDIGI_MINOR, [11])
-m4_define(FLDIGI_PATCH, [AR])
+m4_define(FLDIGI_PATCH, [AS])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 

src/dialogs/fl_digi.cxx

@@ -1841,6 +1841,16 @@ void clear_status_cb(void *)
 	StatusBar->label("");
 }
 
+void clear_status1_cb(void *)
+{
+	Status1->label("");
+}
+
+void clear_status2_cb(void *)
+{
+	Status2->label("");
+}
+
 void put_status(const char *msg, double timeout)
 {
 	static char m[50];
@@ -1860,7 +1870,7 @@ void put_status(const char *msg, double timeout)
 	FL_AWAKE_D();
 }
 
-void put_Status2(const char *msg)
+void put_Status2(const char *msg, double timeout)
 {
 	static char m[60];
 	strncpy(m, msg, sizeof(m));
@@ -1868,11 +1878,15 @@ void put_Status2(const char *msg)
 
 	FL_LOCK_D();
 	REQ_DROP(static_cast<void (Fl_Box::*)(const char *)>(&Fl_Box::label), Status2, m);
+	if (timeout > 0 && !Fl::has_timeout(clear_status2_cb)) { // clear after timeout
+		Fl::remove_timeout(clear_status2_cb);
+		REQ(&Fl::add_timeout, timeout, clear_status2_cb, (void*)0);
+	}
 	FL_UNLOCK_D();
 	FL_AWAKE_D();
 }
 
-void put_Status1(const char *msg)
+void put_Status1(const char *msg, double timeout)
 {
 	static char m[60];
 	strncpy(m, msg, sizeof(m));
@@ -1880,6 +1894,10 @@ void put_Status1(const char *msg)
 
 	FL_LOCK_D();
 	REQ_DROP(static_cast<void (Fl_Box::*)(const char *)>(&Fl_Box::label), Status1, m);
+	if (timeout > 0 && !Fl::has_timeout(clear_status1_cb)) { // clear after timeout
+		Fl::remove_timeout(clear_status1_cb);
+		REQ(&Fl::add_timeout, timeout, clear_status1_cb, (void*)0);
+	}
 	FL_UNLOCK_D();
 	FL_AWAKE_D();
 }

src/include/fl_digi.h

@@ -120,10 +120,12 @@ extern void put_sec_char( char chr );
 
 extern void put_status(const char *msg, double timeout = 0);
 extern void clear_status_cb(void *);
+extern void clear_status1_cb(void *);
+extern void clear_status2_cb(void *);
 extern void clear_StatusMessages();
 extern void put_MODEstatus(trx_mode mode);
-extern void put_Status1(const char *msg);
-extern void put_Status2(const char *msg);
+extern void put_Status1(const char *msg, double timeout = 0);
+extern void put_Status2(const char *msg, double timeout = 0);
 
 extern void put_WARNstatus(double);
 

src/main.cxx

@@ -304,9 +304,6 @@ void generate_option_help(void) {
 	     << " or 0x" << hex << progdefaults.tx_msgid << dec << "\n\n"
 #endif
 
-	     << "  --resample CONVERTER  **DEPRECATED**\n"
-	     << "    This option has been deprecated and will be removed in a future release\n\n"
-
 	     << "  --xmlrpc-server\n"
 	     << "    Start the XML-RPC server\n\n"
 	     << "  --xmlrpc-server-address HOSTNAME\n"
@@ -373,8 +370,11 @@ void generate_option_help(void) {
 	     << "    The default is: " << Fl::get_font(FL_HELVETICA)
 	     << ':' << FL_NORMAL_SIZE << "\n\n"
 
-	     << "  --profile PROFILE  **DEPRECATED**\n"
-	     << "    This option has been deprecated and will be removed in a future release\n\n"
+	     << "  --wfall-width WIDTH\n"
+	     << "    WIDTH may be 2000 to 4000 in Hz, recommend 50 Hz increments.\n\n"
+
+	     << "  --wfall-height HEIGHT\n"
+	     << "    HEIGHT in pixels, ie 100 - 200, recommend 10 pixel increments.\n\n"
 
 	     << "  --twoscopes\n"
 	     << "    Dock a second digiscope adjacent to the waterfall\n\n"

src/misc/configuration.cxx

@@ -221,7 +221,7 @@ configuration progdefaults = {
 	true,			// bool	VIEWERshowfreq
 	500,			// int		VIEWERstart
 	20,				// int		VIEWERchannels
-	20.0,			// double	VIEWERsquelch
+	10.0,			// double	VIEWERsquelch
 	15,				// int  VIEWERtimeout
 	false,			// bool xmlrpc_server
 	"localhost",		// string xmlrpc_address

src/misc/status.cxx

@@ -56,7 +56,7 @@ status progStatus = {
 	50,					// uint	VIEWERypos
 	false,				// bool VIEWERvisible
 	false,				// bool LOGenabled
-	30.0,				// double sldrSquelchValue
+	5.0,				// double sldrSquelchValue
 	true,				// bool afconoff
 	true,				// bool sqlonoff
 	1.0,				// double	RcvMixer;

src/psk/psk.cxx

@@ -470,13 +470,12 @@ void psk::update_syncscope()
 	snprintf(msg2, sizeof(msg2), "imd %3d dB", (int)(floor(imd))); 
 
 	if (imdValid) {
-		put_Status1(msg1);
-	    put_Status2(msg2);
-	} else {
+		put_Status1(msg1, 10.0);
+	    put_Status2(msg2, 10.0);
+	} else if (metric < progStatus.sldrSquelchValue) {
 		put_Status1("");
 		put_Status2("");
 	}
-
 }
 
 char bitstatus[100];

src/waterfall/waterfall.cxx

@@ -420,7 +420,8 @@ FL_UNLOCK_D();
 
 void WFdisp::redrawCursor()
 {
-	cursormoved = true;
+	redraw();
+//	cursormoved = true;
 }
 
 void WFdisp::sig_data( double *sig, int len, int sr ) {