Fixed #711 - Winkey supports HW Button - pressing a HWbutton during keying will call the Halt method

Author: foldynl

cwkey/CWKeyer.cpp

@@ -159,6 +159,7 @@ void CWKeyer::__openCWKey()
     connect(cwKey, &CWKey::keyHWButton2Pressed, this, &CWKeyer::cwKeyHWButton2PressedHandler);
     connect(cwKey, &CWKey::keyHWButton3Pressed, this, &CWKeyer::cwKeyHWButton3PressedHandler);
     connect(cwKey, &CWKey::keyHWButton4Pressed, this, &CWKeyer::cwKeyHWButton4PressedHandler);
+    connect(cwKey, &CWKey::keyHWButtonHaltPressed, this, &CWKeyer::cwKeyHWButtonHaltHandler);
 
     connectedCWKeyProfile = newProfile;
 
@@ -404,6 +405,11 @@ void CWKeyer::cwKeyHWButton4PressedHandler()
     emit cwKeyHWButton4Pressed();
 }
 
+void CWKeyer::cwKeyHWButtonHaltHandler()
+{
+    emit cwKeyHWHaltPressed();
+}
+
 CWKeyer::CWKeyer(QObject *parent ) :
     QObject(parent),
     cwKey(nullptr),

cwkey/CWKeyer.h

@@ -28,6 +28,7 @@ class CWKeyer : public QObject
     void cwKeyHWButton2Pressed();
     void cwKeyHWButton3Pressed();
     void cwKeyHWButton4Pressed();
+    void cwKeyHWHaltPressed();
 
 public slots:
     void start();
@@ -57,6 +58,7 @@ private slots:
     void cwKeyHWButton2PressedHandler();
     void cwKeyHWButton3PressedHandler();
     void cwKeyHWButton4PressedHandler();
+    void cwKeyHWButtonHaltHandler();
 
 private:
     explicit CWKeyer(QObject *parent = nullptr);

cwkey/drivers/CWKey.h

@@ -85,6 +85,7 @@ class CWKey : public QObject
     void keyHWButton2Pressed();
     void keyHWButton3Pressed();
     void keyHWButton4Pressed();
+    void keyHWButtonHaltPressed();
 
 public:
     explicit CWKey(CWKeyModeID mode, qint32 defaultWPM, QObject *parent = nullptr);

cwkey/drivers/CWWinKey.cpp

@@ -19,6 +19,7 @@ CWWinKey::CWWinKey(const QString &portName,
       CWKeySerialInterface(portName, baudrate, 5000),
       isInHostMode(false),
       xoff(false),
+      isBusy(false),
       paddleSwap(paddleSwap),
       version(0)
 {
@@ -324,46 +325,52 @@ void CWWinKey::handleReadyRead()
         qCDebug(runtime) << "\tStatus Information Message:";
         xoff = false;
 
-        if ( rcvByte == 0xC0 ) qCDebug(runtime) << "\t\tIdle";
+        if ( rcvByte == 0xC0 )
+        {
+            qCDebug(runtime) << "\t\tIdle";
+            isBusy = false;
+        }
         else
         {
             if ( version >= 20 && rcvByte & 0x08 )
             {
                 qCDebug(runtime) << "\tPushButton Status Byte";
-                if ( rcvByte & 0x01 )
-                {
-                    qCDebug(runtime) << "\t\tButton1 pressed";
-                    emit keyHWButton1Pressed();
-                }
-                if ( rcvByte & 0x02 )
-                {
-                    qCDebug(runtime) << "\t\tButton2 pressed";
-                    emit keyHWButton2Pressed();
-                }
-                if ( rcvByte & 0x04 )
-                {
-                    qCDebug(runtime) << "\t\tButton3 pressed";
-                    emit keyHWButton3Pressed();
-                }
-                if ( rcvByte & 0x10 )
+
+                auto handleButton = [&](quint8 mask, const char *text, const std::function<void()> &signalFn)
                 {
-                    qCDebug(runtime) << "\t\tButton4 pressed";
-                    emit keyHWButton4Pressed();
-                }
+                    if ( rcvByte & mask )
+                    {
+                        qCDebug(runtime) << "\t\t" << text;
+                        if ( isBusy )
+                            emit keyHWButtonHaltPressed();
+                        else
+                            signalFn();
+                    }
+                };
+
+                handleButton(0x01, "Button1 pressed", [this]{ emit keyHWButton1Pressed(); });
+                handleButton(0x02, "Button2 pressed", [this]{ emit keyHWButton2Pressed(); });
+                handleButton(0x04, "Button3 pressed", [this]{ emit keyHWButton3Pressed(); });
+                handleButton(0x10, "Button4 pressed", [this]{ emit keyHWButton4Pressed(); });
             }
             else
             {
                 qCDebug(runtime) << "\tStatus Byte";
 
-                if ( rcvByte & 0x01 )
+                auto handleFlag = [&](quint8 mask, const char *text, const std::function<void()> &action = nullptr)
                 {
-                    qCDebug(runtime) << "\t\tBuffer 2/3 full";
-                    xoff = true; //slow down in sending Write Buffer - to block tryAsyncWrite
-                }
-                if ( rcvByte & 0x02 ) qCDebug(runtime) << "\t\tBrk-in";
-                if ( rcvByte & 0x04 ) qCDebug(runtime) << "\t\tKey Busy";
-                if ( rcvByte & 0x08 ) qCDebug(runtime) << "\t\tTunning";
-                if ( rcvByte & 0x0F ) qCDebug(runtime) << "\t\tWaiting";
+                    if ( rcvByte & mask )
+                    {
+                        qCDebug(runtime) << "\t\t" << text;
+                        if (action) action();
+                    }
+                };
+
+                handleFlag(0x01, "Buffer 2/3 full", [&]{xoff = true; isBusy = true;});
+                handleFlag(0x02, "Brk-in");
+                handleFlag(0x04, "Key Busy", [&]{ isBusy = true; });
+                handleFlag(0x08, "Tunning");
+                handleFlag(0x0F, "Waiting");
             }
         }
     }

cwkey/drivers/CWWinKey.h

@@ -30,6 +30,7 @@ class CWWinKey : public CWKey,
 
     bool isInHostMode;
     bool xoff;
+    bool isBusy;
     bool paddleSwap;
 
     QMutex writeBufferMutex;

ui/MainWindow.cpp

@@ -233,6 +233,7 @@ MainWindow::MainWindow(QWidget* parent) :
     connect(CWKeyer::instance(), &CWKeyer::cwKeyHWButton2Pressed, ui->cwconsoleWidget, &CWConsoleWidget::cwKeyMacroF2);
     connect(CWKeyer::instance(), &CWKeyer::cwKeyHWButton3Pressed, ui->cwconsoleWidget, &CWConsoleWidget::cwKeyMacroF3);
     connect(CWKeyer::instance(), &CWKeyer::cwKeyHWButton4Pressed, ui->cwconsoleWidget, &CWConsoleWidget::cwKeyMacroF4);
+    connect(CWKeyer::instance(), &CWKeyer::cwKeyHWHaltPressed, ui->cwconsoleWidget, &CWConsoleWidget::haltButtonPressed);
 
     FldigiTCPServer* fldigi = new FldigiTCPServer(this);
     connect(fldigi, &FldigiTCPServer::addContact, ui->newContactWidget, &NewContactWidget::saveExternalContact);