diff options
| author | lonkaars <loek@pipeframe.xyz> | 2022-10-30 12:20:27 +0100 |
|---|---|---|
| committer | lonkaars <loek@pipeframe.xyz> | 2022-10-30 12:20:27 +0100 |
| commit | 06eb7a6b4bf6169da2b68330adf9eeb64f081bbd (patch) | |
| tree | b8df35bc7a7bfe46c3a25a7b6e1bb3abbe4e53f4 | |
| parent | 75064a08587bc960c06d2324a0334ee88441fb35 (diff) | |
finish merge of branch `qt-settings`stable-0.2.0
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | client/consts.h | 2 | ||||
| -rw-r--r-- | client/dbconnector.h | 3 |
3 files changed, 4 insertions, 2 deletions
@@ -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; |