aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnavailableDev <69792062+UnavailableDev@users.noreply.github.com>2022-10-30 12:41:39 +0100
committerGitHub <noreply@github.com>2022-10-30 12:41:39 +0100
commit5bc4d10fc02cc71828a4a3602520a00b1ca08b8e (patch)
treee3814f1e180c28e52d3abf9cdb095c31213fd361
parent26564caa92d02a85a23fcd768a301fc76ec7c4cd (diff)
parent06eb7a6b4bf6169da2b68330adf9eeb64f081bbd (diff)
Merge branch 'lonkaars:master' into qt-settings
-rw-r--r--.gitignore1
-rw-r--r--client/consts.h2
-rw-r--r--client/dbconnector.h3
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index e4eb018..312a36e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ shared/main
copyright
temp/
**/.DS_Store
+
diff --git a/client/consts.h b/client/consts.h
index 7ee81c8..a73fea7 100644
--- a/client/consts.h
+++ b/client/consts.h
@@ -1,5 +1,7 @@
#pragma once
+#include "../shared/wifi.h"
+
// 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 5b9b1cf..73f4084 100644
--- a/client/dbconnector.h
+++ b/client/dbconnector.h
@@ -5,8 +5,7 @@
#include <QMessageBox>
//#include <QtSql>
//#include <QSqlDatabase>
-
-#define WS_ESP8266_WLAN_IP "129.168.0.1"
+#include "consts.h"
namespace Ui {
class dbConnector;