Upstream version 3.03AB

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

src/mfsk/mfsk-pic.cxx

@@ -349,9 +349,13 @@ void cb_picTxSPP( Fl_Widget *w, void *)
 	if (serviceme != active_modem) return;
 
 	Fl_Button *b = (Fl_Button *)w;
-	if (serviceme->TXspp == 8) serviceme->TXspp = 4;
-	else if (serviceme->TXspp == 4) serviceme->TXspp = 2;
-	else serviceme->TXspp = 8;
+	if (progdefaults.slowcpu == true)
+		serviceme->TXspp == 8;
+	else {
+		if (serviceme->TXspp == 8) serviceme->TXspp = 4;
+		else if (serviceme->TXspp == 4) serviceme->TXspp = 2;
+		else serviceme->TXspp = 8;
+	}
 	if (serviceme->TXspp == 8) b->label("X1");
 	else if (serviceme->TXspp == 4) b->label("X2");
 	else b->label("X4");

src/mfsk/mfsk.cxx

@@ -335,6 +335,9 @@ void mfsk::recvpic(complex z)
 	picf += (prevz % z).arg() * samplerate / TWOPI;
 	prevz = z;
 
+	if (RXspp < 8 && progdefaults.slowcpu == true)
+		return;
+		
 	if ((counter % RXspp) == 0) {
 		picf = 256 * (picf / RXspp - basefreq) / bandwidth;
 		byte = (int)CLAMP(picf, 0.0, 255.0);

src/rigcontrol/rigio.cxx

@@ -60,19 +60,21 @@ const string& printhex(const unsigned char* s, size_t len)
 {
 	static string hex;
 	hex.clear();
-	hex.resize(len * 3 - 1);
-	string::iterator i = hex.begin();
-	size_t j;
-	for (j = 0; j < len-1; j++) {
-		*i++ = hexsym[s[j] >> 4];
-		*i++ = hexsym[s[j] & 0xF];
+	if (len > 0) {
+		hex.resize(len * 3 - 1);
+		string::iterator i = hex.begin();
+		size_t j;
+		for (j = 0; j < len-1; j++) {
+			*i++ = hexsym[s[j] >> 4];
+			*i++ = hexsym[s[j] & 0xF];
 	        *i++ = ' ';
-	}
+		}
         *i++ = hexsym[s[j] >> 4];
-	*i = hexsym[s[j] & 0xF];
-
+		*i = hexsym[s[j] & 0xF];
+	}
 	return hex;
 }
+
 const string& printhex(const string& s)
 {
 	return printhex((const unsigned char*)s.data(), s.length());
@@ -123,7 +125,7 @@ bool hexout(const string& s, int retnbr)
 			while (readtimeout--)
 				MilliSleep(1);
 
-		LOG_DEBUG("reading %d", retnbr);
+		LOG_DEBUG("waiting for %d bytes", retnbr);
 
 		if (retnbr > 0) {
 			num = rigio.ReadBuffer (replybuff, retnbr > 200 ? 200 : retnbr);