main loop; verbose flag

server/inputbusiness.cpp

@@ -12,12 +12,12 @@ InputBusiness::~InputBusiness()
 {
 }
 
-void InputBusiness::readAndSend()
+QList<QVariant> InputBusiness::readAndSend(quint64 timestamp)
 {
     QList<QVariant> values;
-    quint64 timestamp = time(nullptr);
     foreach (auto channel, m_channels)
         values.append(m_input->read(channel));
     m_server->sendData(values, timestamp);
+    return values;
 }
 

server/inputbusiness.h

@@ -13,7 +13,7 @@ public:
     virtual ~InputBusiness();
 
 public slots:
-    void readAndSend();
+    QList<QVariant> readAndSend(quint64 timestamp);
 
 private:
     InputManager* m_input;

server/mainclass.cpp

@@ -1,7 +1,10 @@
 #include <QCoreApplication>
 #include <QStringList>
+#include <QVariant>
 #include <iostream>
 #include <sysexits.h>
+#include <sys/time.h>
+#include <unistd.h>
 #include "qcommandlineparser.h"
 #include "mainclass.h"
 #include "gpiomanager.h"
@@ -13,6 +16,8 @@ MainClass::MainClass(QObject *parent)
     , m_device(Gpio)
     , m_address(QHostAddress::Any)
     , m_port(39415)
+    , m_verbose(false)
+    , m_lastTime(0)
 {
 }
 
@@ -41,7 +46,30 @@ void MainClass::main()
     }
 
     m_input = new InputBusiness(input, m_channels, server);
-    m_input->readAndSend();
+    m_timer = new QTimer(this);
+    m_timer->setSingleShot(false);
+    m_timer->setInterval(0);
+    connect(m_timer, SIGNAL(timeout()), this, SLOT(maySend()));
+    m_timer->start();
+}
+
+void MainClass::maySend()
+{
+    struct timeval time;
+    gettimeofday(&time, NULL);
+    if (time.tv_usec - m_lastTime < 100)
+        usleep(100 - (time.tv_usec - m_lastTime));
+    gettimeofday(&time, NULL);
+    m_lastTime = time.tv_usec;
+    auto values = m_input->readAndSend(time.tv_usec);
+    if (m_verbose)
+    {
+        std::cout << time.tv_usec << ":";
+        foreach (auto value, values) {
+            std::cout << " " << value.toInt();
+        }
+        std::cout << std::endl;
+    }
 }
 
 void MainClass::getOpts()
@@ -59,6 +87,8 @@ void MainClass::getOpts()
     parser.addOption(address);
     QCommandLineOption port((QStringList() << "p" << "port"), "port to bind socket [1-65535]", "PORT", QString::number(m_port));
     parser.addOption(port);
+    QCommandLineOption verbose((QStringList() << "verbose"), "enable verbose mode");
+    parser.addOption(verbose);
 
     parser.process(*qApp);
 
@@ -95,4 +125,6 @@ void MainClass::getOpts()
         std::cerr << "Invalid port" << std::endl;
         parser.showHelp(EX_USAGE);
     }
+
+    m_verbose = parser.isSet(verbose);
 }

server/mainclass.h

@@ -21,9 +21,13 @@ signals:
 public slots:
     void main();
 
+    void maySend();
+
 private:
     InputBusiness* m_input;
 
+    QTimer* m_timer;
+
     DeviceType m_device;
 
     QHostAddress m_address;
@@ -32,6 +36,10 @@ private:
 
     int m_port;
 
+    bool m_verbose;
+
+    __suseconds_t m_lastTime;
+
     void getOpts();
 };