Merge branch 'dev' into qt-settings

1 files changed, 6 insertions, 9 deletions

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