Fixed WPM and removed some extra debug.

cwsender.cpp

@@ -16,7 +16,7 @@ cwSender::cwSender(QWidget *parent) :
 
 cwSender::~cwSender()
 {
-    qInfo(logCW()) << "Running CW Sender destructor.";
+    qDebug(logCW()) << "Running CW Sender destructor.";
     delete ui;
 }
 
@@ -28,10 +28,10 @@ void cwSender::showEvent(QShowEvent *event)
 
 void cwSender::handleKeySpeed(unsigned char wpm)
 {
-    qInfo(logCW()) << "Told that current WPM is" << wpm;
+    //qDebug(logCW()) << "Told that current WPM is" << wpm;
     if((wpm >= 6) && (wpm <=48))
     {
-        qInfo(logCW()) << "Setting WPM UI control to" << wpm;
+        //qDebug(logCW()) << "Setting WPM UI control to" << wpm;
         ui->wpmSpin->blockSignals(true);
         ui->wpmSpin->setValue(wpm);
         ui->wpmSpin->blockSignals(false);
@@ -159,8 +159,17 @@ void cwSender::editMacroButton(int buttonNumber)
     QLineEdit::Normal, macroText[buttonNumber], &ok);
     if(!ok)
         return;
+
     if(newMacroText.length() > 30)
+    {
+        QMessageBox msgBox;
+        msgBox.setText(QString("The text entered was too long \n"
+                       "(max length is 30 characters).\n"
+                       "Your input was %1 characters.").arg(newMacroText.length()));
+        msgBox.exec();
+        this->raise();
         return;
+    }
 
     macroText[buttonNumber] = newMacroText;
 }

cwsender.h

@@ -5,6 +5,7 @@
 #include <QString>
 #include <QFont>
 #include <QInputDialog>
+#include <QMessageBox>
 #include "wfviewtypes.h"
 #include "logcategories.h"
 

rigcommander.cpp

@@ -1586,8 +1586,8 @@ void rigCommander::parseLevels()
                 break;
             case '\x0C':
                 state.set(KEYSPD, level, false);
-                qInfo(logRig()) << "Have received key speed in RC, raw level: " << level << ", WPM: " << (level/6.071)+6;
-                emit haveKeySpeed((level/6.071)+6);
+                //qInfo(logRig()) << "Have received key speed in RC, raw level: " << level << ", WPM: " << (level/6.071)+6 << ", rounded: " << round((level/6.071)+6);
+                emit haveKeySpeed(round((level/6.071)+6));
                 break;
             case '\x0D':
                 // Notch filder setting - ignore for now
@@ -4611,19 +4611,16 @@ void rigCommander::setKeySpeed(unsigned char wpm)
     // 0 = 6 WPM
     // 255 = 48 WPM
 
-    unsigned char wpmRadioSend = (wpm-6) * (6.071);
-
-    qInfo(logRig()) << "Setting keyspeed to " << wpm << "WPM, via command value" << wpmRadioSend;
-
+    unsigned char wpmRadioSend = round((wpm-6) * (6.071));
+    //qInfo(logRig()) << "Setting keyspeed to " << wpm << "WPM, via command value" << wpmRadioSend;
     QByteArray payload;
     payload.setRawData("\x14\x0C", 2);
-    payload.append(wpmRadioSend);
+    payload.append(bcdEncodeInt(wpmRadioSend));
     prepDataAndSend(payload);
 }
 
 void rigCommander::getKeySpeed()
 {
-    qInfo(logRig()) << "Getting key speed from radio...";
     QByteArray payload;
     payload.setRawData("\x14\x0C", 2);
     prepDataAndSend(payload);