aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2026-04-20 11:02:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge conflicts from 05.04

Browse source
This commit is contained in:
Shailen Sobhee 2026-04-05 19:08:01 +02:00
commit 3271327208
7 changed files with 59 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ESPNetwork.h
View file

@ -7,7 +7,7 @@
//enum class conn_types_t : byte;
#define CONNECT_TIMEOUT 20000
#define SSID_SCAN_INTERVAL 60000
#define SSID_SCAN_INTERVAL 600000
class ESPNetwork {
protected:
unsigned long lastEmit = 0;

2
src/Web.cpp
View file

@ -2115,8 +2115,10 @@ void Web::begin() {
AsyncJsonResp resp;
resp.beginResponse(request, g_async_content, sizeof(g_async_content));
resp.beginObject();
resp.beginObject("config");
serializeTransceiverConfig(resp);
resp.endObject();
resp.endObject();
resp.endResponse();
}));