Fixed BSR mode and filter selection.

rigcommander.cpp

@@ -675,9 +675,11 @@ void rigCommander::setMode(unsigned char mode, unsigned char modeFilter)
         } else {
             payload.append(modeFilter);
         }
+
         prepDataAndSend(payload);
         rigState.mode = mode;
         rigState.filter = modeFilter;
+
     }
 }
 
@@ -2133,8 +2135,8 @@ void rigCommander::parseRegister16()
 
 void rigCommander::parseBandStackReg()
 {
-    qDebug(logRig()) << "Band stacking register response received: ";
-    printHex(payloadIn, false, true);
+    //qDebug(logRig()) << "Band stacking register response received: ";
+    //printHex(payloadIn, false, true);
 
     // Reference output, 20 meters, regCode 01 (latest):
     // "INDEX: 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 "

wfmain.cpp

@@ -1923,9 +1923,11 @@ void wfmain::runDelayedCommand()
                 emit getMode();
                 break;
             case cmdGetDataMode:
-                // qDebug(logSystem()) << "Sending query for data mode";
                 emit getDataMode();
                 break;
+            case cmdSetModeFilter:
+                emit setMode(setModeVal, setFilterVal);
+                break;
             case cmdSetDataModeOff:
                 emit setDataMode(false);
                 break;
@@ -2903,24 +2905,23 @@ void wfmain::receiveBandStackReg(freqt freq, char mode, char filter, bool dataOn
 {
     // read the band stack and apply by sending out commands
 
-    //freqt f;
-    //f.Hz = freq * 1E6;
-    setFrequency(freq);
-    //int filterSelection = ui->modeFilterCombo->currentData().toInt();
-    setMode((unsigned char)mode, (unsigned char)filter); // make sure this is what you think it is
+    emit setFrequency(freq);
+    setModeVal = (unsigned char) mode;
+    setFilterVal = (unsigned char) filter;
+
+    issueDelayedCommand(cmdSetModeFilter);
 
-    // setDataMode(dataOn); // signal out
     if(dataOn)
     {
-        cmdOutQue.append(cmdSetDataModeOn);
+        issueDelayedCommand(cmdSetDataModeOn);
     } else {
-        cmdOutQue.append(cmdSetDataModeOff);
+        issueDelayedCommand(cmdSetDataModeOff);
     }
-    cmdOutQue.append(cmdGetFreq);
-    cmdOutQue.append(cmdGetMode);
+    issueDelayedCommand(cmdGetFreq);
+    issueDelayedCommand(cmdGetMode);
     ui->tabWidget->setCurrentIndex(0);
 
-    delayedCommand->start();
+    receiveMode((unsigned char) mode, (unsigned char) filter); // update UI
 }
 
 void wfmain::bandStackBtnClick()
@@ -4146,7 +4147,6 @@ void wfmain::setBandButtons()
 void wfmain::on_debugBtn_clicked()
 {
     qDebug(logSystem()) << "Debug button pressed.";
-
-    qDebug(logSystem()) << "Changing band buttons: ";
-    setBandButtons();
+    qDebug(logSystem()) << "getting mode.";
+    getMode();
 }

wfmain.h

@@ -541,7 +541,10 @@ private:
     freqt freq;
     float tsKnobMHz;
 
-    enum cmds {cmdNone, cmdGetRigID, cmdGetRigCIV, cmdGetFreq, cmdGetMode, cmdGetDataMode,
+    unsigned char setModeVal=0;
+    unsigned char setFilterVal=0;
+
+    enum cmds {cmdNone, cmdGetRigID, cmdGetRigCIV, cmdGetFreq, cmdGetMode, cmdGetDataMode, cmdSetModeFilter,
               cmdSetDataModeOn, cmdSetDataModeOff, cmdGetRitEnabled, cmdGetRitValue,
               cmdSpecOn, cmdSpecOff, cmdDispEnable, cmdDispDisable, cmdGetRxGain, cmdGetAfGain,
               cmdGetSql, cmdGetATUStatus, cmdGetSpectrumMode, cmdGetSpectrumSpan, cmdScopeCenterMode, cmdScopeFixedMode, cmdGetPTT,