Added suport for for different rig baud rates via the [Radio] preference

SerialPortBaud. Left unset, it defaults to 115200. Added support for
status bar text with memory presets.

commhandler.cpp

@@ -33,7 +33,7 @@ commHandler::commHandler()
     connect(pseudoterm, SIGNAL(readyRead()), this, SLOT(receiveDataInPt()));
 }
 
-commHandler::commHandler(QString portName)
+commHandler::commHandler(QString portName, quint32 baudRate)
 {
     //constructor
     // grab baud rate and other comm port details
@@ -45,7 +45,7 @@ commHandler::commHandler(QString portName)
     // TODO: The following should become arguments and/or functions
     // Add signal/slot everywhere for comm port setup.
     // Consider how to "re-setup" and how to save the state for next time.
-    baudrate = 115200;
+    baudrate = baudRate;
     stopbits = 1;
     this->portName = portName;
 

commhandler.h

@@ -16,7 +16,7 @@ class commHandler : public QObject
 
 public:
     commHandler();
-    commHandler(QString portName);
+    commHandler(QString portName, quint32 baudRate);
 
     ~commHandler();
 

rigcommander.cpp

@@ -27,7 +27,7 @@
 // Note: When sending \x00, must use QByteArray.setRawData()
 
 
-rigCommander::rigCommander(unsigned char rigCivAddr, QString rigSerialPort)
+rigCommander::rigCommander(unsigned char rigCivAddr, QString rigSerialPort, quint32 rigBaudRate)
 {
     // construct
     // TODO: Bring this parameter and the comm port from the UI.
@@ -52,7 +52,7 @@ rigCommander::rigCommander(unsigned char rigCivAddr, QString rigSerialPort)
     //    lrwxrwxrwx 1 root root 13 Nov 24 21:43 pci-0000:00:12.0-usb-0:2.1:1.0-port0 -> ../../ttyUSB0
 
     // comm = new commHandler("/dev/ttyUSB0");
-    comm = new commHandler(rigSerialPort);
+    comm = new commHandler(rigSerialPort, rigBaudRate);
 
     // data from the comm port to the program:
     connect(comm, SIGNAL(haveDataFromPort(QByteArray)), this, SLOT(handleNewData(QByteArray)));

rigcommander.h

@@ -19,7 +19,7 @@ class rigCommander : public QObject
     Q_OBJECT
 
 public:
-    rigCommander(unsigned char rigCivAddr, QString rigSerialPort);
+    rigCommander(unsigned char rigCivAddr, QString rigSerialPort, quint32 rigBaudRate);
     ~rigCommander();
 
 public slots:

wfmain.cpp

@@ -209,8 +209,7 @@ wfmain::wfmain(QWidget *parent) :
     ui->splitter->setHandleWidth(5);
     ui->statusBar->showMessage("Ready", 2000);
 
-    rig = new rigCommander(prefs.radioCIVAddr, serialPortRig  );
-    // rig = new rigCommander(0x94, serialPortRig  );
+    rig = new rigCommander(prefs.radioCIVAddr, serialPortRig, prefs.serialPortBaud);
 
     rigThread = new QThread(this);
 
@@ -363,6 +362,7 @@ void wfmain::setDefPrefs()
     defPrefs.stylesheetPath = QString("qdarkstyle/style.qss");
     defPrefs.radioCIVAddr = 0x94;
     defPrefs.serialPortRadio = QString("auto");
+    defPrefs.serialPortBaud = 115200;
     defPrefs.enablePTT = false;
     defPrefs.niceTS = true;
 }
@@ -384,6 +384,7 @@ void wfmain::loadSettings()
     settings.beginGroup("Radio");
     prefs.radioCIVAddr = (unsigned char) settings.value("RigCIVuInt", defPrefs.radioCIVAddr).toInt();
     prefs.serialPortRadio = settings.value("SerialPortRadio", defPrefs.serialPortRadio).toString();
+    prefs.serialPortBaud = (quint32) settings.value("SerialPortBaud", defPrefs.serialPortBaud).toInt();
     settings.endGroup();
 
     // Misc. user settings (enable PTT, draw peaks, etc)
@@ -445,6 +446,7 @@ void wfmain::saveSettings()
     settings.beginGroup("Radio");
     settings.setValue("RigCIVuInt", prefs.radioCIVAddr);
     settings.setValue("SerialPortRadio", prefs.serialPortRadio);
+    settings.setValue("SerialPortBaud", prefs.serialPortBaud);
     settings.endGroup();
 
     // Misc. user settings (enable PTT, draw peaks, etc)
@@ -1595,11 +1597,10 @@ void wfmain::on_fStoBtn_clicked()
     {
         // TODO: keep an enum around with the current mode
         mem.setPreset(preset_number, freqMhz, (mode_kind)ui->modeSelectCombo->currentIndex());
+        showStatusBarText( QString("Storing frequency %1 to memory location %2").arg( freqMhz ).arg(preset_number) );
     } else {
-        qDebug() << "Could not store preset. Valid presets are 0 through 99.";
+        showStatusBarText(QString("Could not store preset to %1. Valid preset numbers are 0 to 99").arg(preset_number));
     }
-
-
 }
 
 void wfmain::on_fRclBtn_clicked()

wfmain.h

@@ -349,6 +349,7 @@ private:
         QString stylesheetPath;
         unsigned char radioCIVAddr;
         QString serialPortRadio;
+        quint32 serialPortBaud;
         bool enablePTT;
         bool niceTS;