Upstream version 3.0preC

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, [3])
 m4_define(FLDIGI_MINOR, [0])
-m4_define(FLDIGI_PATCH, [preB])
+m4_define(FLDIGI_PATCH, [preC])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 

src/misc/configuration.cxx

@@ -21,7 +21,7 @@ configuration progdefaults = {
 	false,			// bool		TransmitRSid;
 	true,			// bool		slowcpu;
 	false,			// bool		changed;
-	0.0,			// double	wfRefLevel;
+	-20.0,			// double	wfRefLevel;
 	70.0,			// double	wfAmpSpan;
 	300,			// int		LowFreqCutoff;
 	1000,			// int		CWsweetspot;

src/rigcontrol/rigio.cxx

@@ -426,9 +426,24 @@ void rigCAT_setfreq(long long f)
 	if (modeCmd.str2.empty() == false)
 		strCmd.append(modeCmd.str2);
 
-	fl_lock(&rigCAT_mutex);
-		hexout(strCmd, 0);
-	fl_unlock(&rigCAT_mutex);
+	if (modeCmd.ok.size()) {
+		list<XMLIOS>::iterator preply = reply.begin();
+		while (preply != reply.end()) {
+			if (preply->SYMBOL == modeCmd.ok) {
+				XMLIOS  rTemp = *preply;
+// send the command
+				fl_lock(&rigCAT_mutex);
+					hexout(strCmd, rTemp.size);
+				fl_unlock(&rigCAT_mutex);
+				return;
+			}
+			preply++;
+		}
+	} else {
+		fl_lock(&rigCAT_mutex);
+			hexout(strCmd, 0);
+		fl_unlock(&rigCAT_mutex);
+	}
 }
 
 string rigCAT_getmode()
@@ -565,9 +580,24 @@ void rigCAT_setmode(string md)
 	if (modeCmd.str2.empty() == false)
 		strCmd.append(modeCmd.str2);
 
-	fl_lock(&rigCAT_mutex);
-		hexout(strCmd, 0);
-	fl_unlock(&rigCAT_mutex);
+	if (modeCmd.ok.size()) {
+		list<XMLIOS>::iterator preply = reply.begin();
+		while (preply != reply.end()) {
+			if (preply->SYMBOL == modeCmd.ok) {
+				XMLIOS  rTemp = *preply;
+// send the command
+				fl_lock(&rigCAT_mutex);
+					hexout(strCmd, rTemp.size);
+				fl_unlock(&rigCAT_mutex);
+				return;
+			}
+			preply++;
+		}
+	} else {
+		fl_lock(&rigCAT_mutex);
+			hexout(strCmd, 0);
+		fl_unlock(&rigCAT_mutex);
+	}
 }
 
 string rigCAT_getwidth()
@@ -704,9 +734,25 @@ void rigCAT_setwidth(string w)
 	}
 	if (modeCmd.str2.empty() == false)
 		strCmd.append(modeCmd.str2);
-	fl_lock(&rigCAT_mutex);
-		hexout(strCmd, 0);
-	fl_unlock(&rigCAT_mutex);
+		
+	if (modeCmd.ok.size()) {
+		list<XMLIOS>::iterator preply = reply.begin();
+		while (preply != reply.end()) {
+			if (preply->SYMBOL == modeCmd.ok) {
+				XMLIOS  rTemp = *preply;
+// send the command
+				fl_lock(&rigCAT_mutex);
+					hexout(strCmd, rTemp.size);
+				fl_unlock(&rigCAT_mutex);
+				return;
+			}
+			preply++;
+		}
+	} else {
+		fl_lock(&rigCAT_mutex);
+			hexout(strCmd, 0);
+		fl_unlock(&rigCAT_mutex);
+	}
 }
 
 void rigCAT_pttON()

src/waterfall/waterfall.cxx

@@ -1341,8 +1341,8 @@ waterfall::waterfall(int x0, int y0, int w0, int h0, char *lbl) :
 	wfRefLevel->step(1.0);
 	wfRefLevel->precision(0);
 	wfRefLevel->range(-40.0, 0.0);
-	wfRefLevel->value(0.0);
-	wfdisp->Reflevel(0.0);
+	wfRefLevel->value(-20.0);
+	wfdisp->Reflevel(-20.0);
 	wfRefLevel->tooltip("Upper signal limit in dB");
 	wfRefLevel->type(FL_SIMPLE_COUNTER);
 
@@ -1352,8 +1352,8 @@ waterfall::waterfall(int x0, int y0, int w0, int h0, char *lbl) :
 	wfAmpSpan->step(1.0);
 	wfAmpSpan->precision(0);
 	wfAmpSpan->range(6.0, 90.0);
-	wfAmpSpan->value(80.0);
-	wfdisp->Ampspan(80.0);
+	wfAmpSpan->value(70.0);
+	wfdisp->Ampspan(70.0);
 	wfAmpSpan->tooltip("Signal range in dB");
 	wfAmpSpan->type(FL_SIMPLE_COUNTER);