Changed connection delay to something non-blocking

Author: poljvd

deploy/hyperion.tar.gz

@@ -13,15 +13,14 @@ include_directories(
 
 # Group the headers that go through the MOC compiler
 SET(Leddevice_QT_HEADERS
+		${CURRENT_SOURCE_DIR}/LedRs232Device.h
 		${CURRENT_SOURCE_DIR}/LedDeviceAdalight.h
 )
 
 SET(Leddevice_HEADERS
 		${CURRENT_HEADER_DIR}/LedDevice.h
 		${CURRENT_HEADER_DIR}/LedDeviceFactory.h
 
-		${CURRENT_SOURCE_DIR}/LedRs232Device.h
-
 		${CURRENT_SOURCE_DIR}/LedDeviceLightpack.h
 		${CURRENT_SOURCE_DIR}/LedDeviceMultiLightpack.h
 		${CURRENT_SOURCE_DIR}/LedDevicePaintpack.h

libsrc/leddevice/CMakeLists.txt

@@ -12,7 +12,7 @@
 ///
 /// Implementation of the LedDevice interface for writing to an Adalight led device.
 ///
-class LedDeviceAdalight : public QObject, public LedRs232Device
+class LedDeviceAdalight : public LedRs232Device
 {
 	Q_OBJECT
 

libsrc/leddevice/LedDeviceAdalight.h

@@ -4,19 +4,21 @@
 #include <cstdio>
 #include <iostream>
 
+// Qt includes
+#include <QTimer>
+
 // Serial includes
 #include <serial/serial.h>
 
 // Local Hyperion includes
 #include "LedRs232Device.h"
-#include "utils/Sleep.h"
-
 
 LedRs232Device::LedRs232Device(const std::string& outputDevice, const unsigned baudrate, int delayAfterConnect_ms) :
 	_deviceName(outputDevice),
 	_baudRate_Hz(baudrate),
 	_delayAfterConnect_ms(delayAfterConnect_ms),
-	_rs232Port()
+	_rs232Port(),
+	_blockedForDelay(false)
 {
 	// empty
 }
@@ -40,7 +42,9 @@ int LedRs232Device::open()
 
 		if (_delayAfterConnect_ms > 0)
 		{
-			Sleep::msleep(_delayAfterConnect_ms);
+			_blockedForDelay = true;
+			QTimer::singleShot(_delayAfterConnect_ms, this, SLOT(unblockAfterDelay()));
+			std::cout << "Device blocked for " << _delayAfterConnect_ms << " ms" << std::endl;
 		}
 	}
 	catch (const std::exception& e)
@@ -54,6 +58,11 @@ int LedRs232Device::open()
 
 int LedRs232Device::writeBytes(const unsigned size, const uint8_t * data)
 {
+	if (_blockedForDelay)
+	{
+		return 0;
+	}
+
 	if (!_rs232Port.isOpen())
 	{
 		return -1;
@@ -102,3 +111,9 @@ int LedRs232Device::writeBytes(const unsigned size, const uint8_t * data)
 
 	return 0;
 }
+
+void LedRs232Device::unblockAfterDelay()
+{
+	std::cout << "Device unblocked" << std::endl;
+	_blockedForDelay = false;
+}

libsrc/leddevice/LedRs232Device.cpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <QObject>
+
 // Serial includes
 #include <serial/serial.h>
 
@@ -9,8 +11,10 @@
 ///
 /// The LedRs232Device implements an abstract base-class for LedDevices using a RS232-device.
 ///
-class LedRs232Device : public LedDevice
+class LedRs232Device : public QObject, public LedDevice
 {
+	Q_OBJECT
+
 public:
 	///
 	/// Constructs the LedDevice attached to a RS232-device
@@ -43,6 +47,10 @@ class LedRs232Device : public LedDevice
 	 */
 	int writeBytes(const unsigned size, const uint8_t *data);
 
+private slots:
+	/// Unblock the device after a connection delay
+	void unblockAfterDelay();
+
 private:
 	/// The name of the output device
 	const std::string _deviceName;
@@ -55,4 +63,6 @@ class LedRs232Device : public LedDevice
 
 	/// The RS232 serial-device
 	serial::Serial _rs232Port;
+
+	bool _blockedForDelay;
 };