jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fix stm32 mqttClientID/http IP address

Browse Source
This commit is contained in:
arovak 2020-05-07 14:27:11 +02:00
parent a425d6400a
commit 4d905297cd
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lvgl

@ -1 +1 @@
Subproject commit 9f67a12548bf5e7a959b0e668a9f6f2c43f3e8e3 Subproject commit 5f739643f4b22254f5742504fcda3b7de50fb88b

8
src/hasp_http.cpp
View File

@ -1506,7 +1506,9 @@ void webStart()
Log.notice(F("HTTP: Server started @ http://%s"), Log.notice(F("HTTP: Server started @ http://%s"),
(WiFi.getMode() != WIFI_STA ? WiFi.softAPIP().toString().c_str() : WiFi.localIP().toString().c_str())); (WiFi.getMode() != WIFI_STA ? WiFi.softAPIP().toString().c_str() : WiFi.localIP().toString().c_str()));
#else #else
Log.notice(F("HTTP: Server started @ http://%s"), String(Ethernet.localIP()).c_str()); IPAddress ip;
ip = Ethernet.localIP();
Log.notice(F("HTTP: Server started @ http://%d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
#endif #endif
} }
@ -1691,8 +1693,8 @@ size_t httpClientWrite(const uint8_t * buf, size_t size)
size_t bytes_sent = 0; size_t bytes_sent = 0;
while(bytes_sent < size) { while(bytes_sent < size) {
if(!webServer.client()) return bytes_sent; if(!webServer.client()) return bytes_sent;
if(size - bytes_sent >= 4096) { if(size - bytes_sent >= 2048) {
bytes_sent += webServer.client().write(buf + bytes_sent, 4096); bytes_sent += webServer.client().write(buf + bytes_sent, 2048);
} else { } else {
bytes_sent += webServer.client().write(buf + bytes_sent, size - bytes_sent); bytes_sent += webServer.client().write(buf + bytes_sent, size - bytes_sent);
} }

3
src/hasp_mqtt.cpp
View File

@ -354,7 +354,8 @@ void mqttReconnect()
{ {
String mac = halGetMacAddress(3, ""); String mac = halGetMacAddress(3, "");
mac.toLowerCase(); mac.toLowerCase();
snprintf_P(mqttNodeName, sizeof(mqttNodeName), PSTR("plate_%s"), mac.c_str()); memset(mqttClientId, 0 ,sizeof(mqttClientId));
snprintf_P(mqttClientId, sizeof(mqttClientId), PSTR("plate_%s"), mac.c_str());
Log.verbose(mqttClientId); Log.verbose(mqttClientId);
} }