plugins/dmxusb: eurolite pro makes use of async tx

mcallegari · Aug 9, 2018 · 4cbacdd · 4cbacdd
1 parent 03ef9b2
commit 4cbacdd
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 21 deletions.
diff --git a/plugins/dmxusb/src/euroliteusbdmxpro.cpp b/plugins/dmxusb/src/euroliteusbdmxpro.cpp
@@ -24,11 +24,14 @@
 
 EuroliteUSBDMXPro::EuroliteUSBDMXPro(DMXInterface *interface, quint32 outputLine)
     : DMXUSBWidget(interface, outputLine)
+    , m_running(false)
 {
 }
 
 EuroliteUSBDMXPro::~EuroliteUSBDMXPro()
 {
+    stop();
+
 #ifdef QTSERIAL
     if (isOpen())
         DMXUSBWidget::close();
@@ -124,6 +127,10 @@ bool EuroliteUSBDMXPro::open(quint32 line, bool input)
         return false;
     }
 #endif
+
+    // start the output thread
+    start();
+
     return true;
 }
 
@@ -132,6 +139,8 @@ bool EuroliteUSBDMXPro::close(quint32 line, bool input)
     Q_UNUSED(line)
     Q_UNUSED(input)
 
+    stop();
+
 #ifdef QTSERIAL
     if (isOpen())
         return DMXUSBWidget::close();
@@ -190,30 +199,70 @@ bool EuroliteUSBDMXPro::writeUniverse(quint32 universe, quint32 output, const QB
         return false;
 #endif
 
-    QByteArray request(data);
-    request.prepend(char(EUROLITE_USB_DMX_PRO_DMX_ZERO)); // DMX start code (Which constitutes the + 1 below)
-    request.prepend(((data.size() + 1) >> 8) & 0xff); // Data length MSB
-    request.prepend((data.size() + 1) & 0xff); // Data length LSB
-    request.prepend(EUROLITE_USB_DMX_PRO_SEND_DMX_RQ); // Send request
-    request.prepend(EUROLITE_USB_DMX_PRO_START_OF_MSG); // Start byte
-    request.append(EUROLITE_USB_DMX_PRO_END_OF_MSG); // Stop byte
+    if (m_outputLines[0].m_universeData.size() == 0)
+        m_outputLines[0].m_universeData.append(data);
+    else
+        m_outputLines[0].m_universeData.replace(0, data.size(), data);
+
+    return true;
+}
+
+void EuroliteUSBDMXPro::stop()
+{
+    if (isRunning() == true)
+    {
+        m_running = false;
+        wait();
+    }
+}
+
+void EuroliteUSBDMXPro::run()
+{
+    qDebug() << "OUTPUT thread started";
+    QElapsedTimer timer;
+    QByteArray request;
+
+    // One "official" DMX frame can take (1s/44Hz) = 23ms
+    int frameTimeUs = (int) (floor(((double)1000 / m_frequency) + (double)0.5)) * 1000;
+
+    m_running = true;
+    while (m_running == true)
+    {
+        timer.restart();
+
+        int dataLen = m_outputLines[0].m_universeData.length();
+        if (dataLen == 0)
+            goto framesleep;
+
+        request.clear();
+        request.append(EUROLITE_USB_DMX_PRO_START_OF_MSG); // Start byte
+        request.append(EUROLITE_USB_DMX_PRO_SEND_DMX_RQ); // Send request
+        request.append((dataLen + 1) & 0xff); // Data length LSB
+        request.append(((dataLen + 1) >> 8) & 0xff); // Data length MSB
+        request.append(char(EUROLITE_USB_DMX_PRO_DMX_ZERO)); // DMX start code (Which constitutes the + 1 below)
+        request.append(m_outputLines[0].m_universeData);
+        request.append(EUROLITE_USB_DMX_PRO_END_OF_MSG); // Stop byte
 
 #ifdef QTSERIAL
-    if (interface()->write(request) == false)
+        if (interface()->write(request) == false)
 #else
-    if (m_file.write(request) == false)
+        if (m_file.write(request) == false)
 #endif
-    {
-        qWarning() << Q_FUNC_INFO << name() << "will not accept DMX data";
+        {
+            qWarning() << Q_FUNC_INFO << name() << "will not accept DMX data";
 #ifdef QTSERIAL
-        interface()->purgeBuffers();
+            interface()->purgeBuffers();
 #endif
-        return false;
-    }
-    else
-    {
-        return true;
+        }
+framesleep:
+        int timetoSleep = frameTimeUs - (timer.nsecsElapsed() / 1000);
+        if (timetoSleep < 0)
+            qWarning() << "DMX output is running late !";
+        else
+            usleep(timetoSleep);
     }
+
+    qDebug() << "OUTPUT thread terminated";
 }
 
 
diff --git a/plugins/dmxusb/src/euroliteusbdmxpro.h b/plugins/dmxusb/src/euroliteusbdmxpro.h
@@ -29,7 +29,7 @@
 #define EUROLITE_USB_DMX_PRO_START_OF_MSG  char(0x7E)
 #define EUROLITE_USB_DMX_PRO_END_OF_MSG    char(0xE7)
 
-class EuroliteUSBDMXPro : public DMXUSBWidget
+class EuroliteUSBDMXPro : public QThread, public DMXUSBWidget
 {
     /************************************************************************
      * Initialization
@@ -60,14 +60,20 @@ class EuroliteUSBDMXPro : public DMXUSBWidget
     /** @reimp */
     bool writeUniverse(quint32 universe, quint32 output, const QByteArray& data);
 
+protected:
+    /** Stop the writer thread */
+    void stop();
+
+    /** DMX writer thread worker method */
+    void run();
+
 private:
     QString getDeviceName();
 
 private:
     /** File handle for /dev/ttyACMx */
     QFile m_file;
-
-    QByteArray m_universe;
+    bool m_running;
 };
 
 #endif
diff --git a/plugins/dmxusb/src/nanodmx.cpp b/plugins/dmxusb/src/nanodmx.cpp
@@ -30,6 +30,8 @@ NanoDMX::NanoDMX(DMXInterface *interface, quint32 outputLine)
 
 NanoDMX::~NanoDMX()
 {
+    stop();
+
 #ifdef QTSERIAL
     if (isOpen())
         DMXUSBWidget::close();
@@ -212,7 +214,7 @@ bool NanoDMX::close(quint32 line, bool input)
         m_file.close();
 #endif
 
-    return DMXUSBWidget::close(line);
+    return true;
 }
 
 QString NanoDMX::uniqueName(ushort line, bool input) const