From 06eb7a6b4bf6169da2b68330adf9eeb64f081bbd Mon Sep 17 00:00:00 2001 From: lonkaars Date: Sun, 30 Oct 2022 12:20:27 +0100 Subject: finish merge of branch `qt-settings` --- .gitignore | 1 + client/consts.h | 2 ++ client/dbconnector.h | 3 +-- 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 //#include //#include - -#define WS_ESP8266_WLAN_IP "129.168.0.1" +#include "consts.h" namespace Ui { class dbConnector; -- cgit v1.2.3