diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/Client.cpp | 26 | ||||
| -rw-r--r-- | client/Client.h | 15 | ||||
| -rw-r--r-- | client/HandleMessage.h | 2 | ||||
| -rw-r--r-- | client/client.pro | 1 | ||||
| -rw-r--r-- | client/consts.h | 5 | ||||
| -rw-r--r-- | client/dbconnector.h | 1 | ||||
| -rw-r--r-- | client/dbconnector.ui | 4 |
7 files changed, 26 insertions, 28 deletions
diff --git a/client/Client.cpp b/client/Client.cpp index 46952b6..4d948fa 100644 --- a/client/Client.cpp +++ b/client/Client.cpp @@ -1,5 +1,8 @@ -#include "Client.h" +#include <stdio.h> +#include "Client.h" +#include "consts.h" +#include "../shared/util.h" Client::Client(QObject *parent) : QObject(parent) @@ -17,8 +20,6 @@ Client::~Client() void Client::ClientEcho() { - QTime time1 = QTime::currentTime(); - NextMinute = time1.minute()+1; connect(timer, SIGNAL(timeout()),this,SLOT(timeFunction())); // connect timer to time every minute @@ -36,22 +37,19 @@ void Client::ClientEcho() void Client::timeFunction() { - if(_missingRecords>1){ - totalRecords = _missingRecords; - } - else{ - totalRecords=1; - } - QByteArray msgToSend= (msg.toUtf8() + totalRecords + offsetRecords +'\n'); + totalRecords = WS_MAX(1, _missingRecords); + + char* msg = NULL; + asprintf(&msg, "last-records %x %x\n", totalRecords, offsetRecords); + QByteArray msgToSend = msg; + free(msg); QTime time = QTime::currentTime(); - qint16 currentMinute = time.minute(); + qint16 currentSeconds = time.second(); + if((currentSeconds % WS_CLIENT_STATION_POLL_INTERVAL) == 1){ - if(currentMinute==NextMinute){ socket->connectToHost(networkAddress, tcpPortAddress); - socket->write(msgToSend); - NextMinute++; } } diff --git a/client/Client.h b/client/Client.h index 10af3e1..b90e5e9 100644 --- a/client/Client.h +++ b/client/Client.h @@ -1,5 +1,6 @@ #ifndef CLIENT_H #define CLIENT_H + #include <QTcpSocket> #include <QTextStream> #include <QTimer> @@ -7,6 +8,7 @@ #include <QSqlQuery> #include "HandleMessage.h" +#include "../shared/wifi.h" // class client for wheather station class Client : public QObject @@ -27,19 +29,14 @@ private: QTcpSocket *socket; // tcpsocket for communicating QTimer *timer; // timer to read every second what time it curruntly is. - qint16 NextMinute; // timing for next minute // qint16 currentMinute; // timing for currentMinute HandleMessage Handlemsg; // add HandleMessage to Client.h - int tcpPortAddress = 80; // port of communication via tcp - QString networkAddress = "192.168.137.76"; // network address for commincation via tcp - - QString msg = "last-records "; // part of mesage to send to wheather staion - char totalRecords = '1'; // total records to ask wheather station - char offsetRecords = '0'; // offset from reqeusting records - - + int tcpPortAddress = WS_SERVER_PORT; // port of communication via tcp + QString networkAddress = WS_ESP8266_WLAN_IP; // network address for commincation via tcp + uint8_t totalRecords = 1; // total records to ask wheather station + uint8_t offsetRecords = 0; // offset from reqeusting records }; #endif // CLIENT_H diff --git a/client/HandleMessage.h b/client/HandleMessage.h index bfc5063..f228633 100644 --- a/client/HandleMessage.h +++ b/client/HandleMessage.h @@ -16,8 +16,6 @@ public: QString ParseMessage(const QString , int); void ParseToSQL(QString); - - private: }; diff --git a/client/client.pro b/client/client.pro index 76f2b56..8305949 100644 --- a/client/client.pro +++ b/client/client.pro @@ -3,6 +3,7 @@ QT += core gui sql charts network HEADERS += \ Client.h \ HandleMessage.h \ + consts.h \ dbconnector.h \ main.h \ mainwindow.h diff --git a/client/consts.h b/client/consts.h new file mode 100644 index 0000000..7ee81c8 --- /dev/null +++ b/client/consts.h @@ -0,0 +1,5 @@ +#pragma once + +// delay between new record request in seconds +#define WS_CLIENT_STATION_POLL_INTERVAL 10 + diff --git a/client/dbconnector.h b/client/dbconnector.h index 4737d6f..5b9b1cf 100644 --- a/client/dbconnector.h +++ b/client/dbconnector.h @@ -8,7 +8,6 @@ #define WS_ESP8266_WLAN_IP "129.168.0.1" - namespace Ui { class dbConnector; } diff --git a/client/dbconnector.ui b/client/dbconnector.ui index 22e0a64..fe9c05e 100644 --- a/client/dbconnector.ui +++ b/client/dbconnector.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>362</width> - <height>273</height> + <width>401</width> + <height>288</height> </rect> </property> <property name="windowTitle"> |