jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-11 18:54:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: change type for mqtt port in settings

Browse Source
This commit is contained in:
Yurii
2023-12-18 08:05:13 +03:00
parent 2b5d66173e
commit e4e349ba15
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Settings.h
View File

@@ -17,7 +17,7 @@ struct Settings {
struct { struct {
char server[80]; char server[80];
unsigned int port = 1883; unsigned short port = 1883;
char user[32]; char user[32];
char password[32]; char password[32];
char prefix[80] = "opentherm"; char prefix[80] = "opentherm";

6
src/WifiManagerTask.h
View File

@@ -9,7 +9,7 @@
WiFiManager wm; WiFiManager wm;
WiFiManagerParameter* wmHostname; WiFiManagerParameter* wmHostname;
WiFiManagerParameter* wmMqttServer; WiFiManagerParameter* wmMqttServer;
UnsignedIntParameter* wmMqttPort; UnsignedShortParameter* wmMqttPort;
WiFiManagerParameter* wmMqttUser; WiFiManagerParameter* wmMqttUser;
WiFiManagerParameter* wmMqttPassword; WiFiManagerParameter* wmMqttPassword;
WiFiManagerParameter* wmMqttPrefix; WiFiManagerParameter* wmMqttPrefix;
@@ -66,7 +66,7 @@ public:
wmMqttServer = new WiFiManagerParameter("mqtt_server", "Server", settings.mqtt.server, 80); wmMqttServer = new WiFiManagerParameter("mqtt_server", "Server", settings.mqtt.server, 80);
wm.addParameter(wmMqttServer); wm.addParameter(wmMqttServer);
wmMqttPort = new UnsignedIntParameter("mqtt_port", "Port", settings.mqtt.port, 6); wmMqttPort = new UnsignedShortParameter("mqtt_port", "Port", settings.mqtt.port, 6);
wm.addParameter(wmMqttPort); wm.addParameter(wmMqttPort);
wmMqttUser = new WiFiManagerParameter("mqtt_user", "Username", settings.mqtt.user, 32); wmMqttUser = new WiFiManagerParameter("mqtt_user", "Username", settings.mqtt.user, 32);
@@ -303,7 +303,7 @@ protected:
changed = true; changed = true;
settings.mqtt.port = wmMqttPort->getValue(); settings.mqtt.port = wmMqttPort->getValue();
Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.port: %du"), settings.mqtt.port); Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.port: %hu"), settings.mqtt.port);
} }
if (strcmp(wmMqttUser->getValue(), settings.mqtt.user) != 0) { if (strcmp(wmMqttUser->getValue(), settings.mqtt.user) != 0) {