iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ver4dev' into ver4dev

Browse Source
This commit is contained in:
Ilya Belyakov
2022-10-14 18:01:46 +03:00
committed by GitHub
parent 9326cc0aff 0080854a53
commit 01ec7de9d2
19 changed files with 117 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Const.h
View File

@@ -23,6 +23,8 @@
#define JSON_BUFFER_SIZE 2048
#define WEB_SOCKETS_FRAME_SIZE 2048
//#define LOOP_DEBUG
//выбор сервера
//#define ASYNC_WEB_SERVER
//#define ASYNC_WEB_SOCKETS

2
include/Global.h
View File

@@ -137,6 +137,8 @@ extern Time_t _time_local;
extern Time_t _time_utc;
extern bool _time_isTrust;
extern unsigned long loopPeriod;
// extern DynamicJsonDocument settingsFlashJsonDoc;
// extern DynamicJsonDocument paramsFlashJsonDoc;
// extern DynamicJsonDocument paramsHeapJsonDoc;

3
include/PeriodicTasks.h
View File

@@ -10,8 +10,5 @@
extern void periodicTasksInit();
extern void printGlobalVarSize();
extern void handleError(String errorId, String errorValue);
extern void handleError(String errorId, int errorValue);
extern String ESP_getResetReason(void);
extern String ESP32GetResetReason(uint32_t cpu_no);

2
include/WsServer.h
View File

@@ -17,5 +17,5 @@ void publishStatusWs(const String& topic, const String& data);
void publishChartWs(int num, String& path);
void periodicWsSend();
void sendFileToWsByFrames(const String& filename, const String& header, const String& json, uint8_t client_id, size_t frameSize);
void sendFileToWsByFrames(const String& filename, const String& header, const String& json, int client_id, size_t frameSize);
void sendStringToWs(const String& header, String& payload, int client_id);