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

добавил новые json утилиты

Browse Source
This commit is contained in:
Dmitry Borisenko
2021-12-24 22:49:06 +01:00
parent dbe11162e5
commit 875f5009c2
10 changed files with 79 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/AsyncWebServer.h
View File

@@ -1,9 +1,12 @@
#pragma once
#include "Global.h"
#ifdef ASYNC_WEB_SERVER
void asyncWebServerInit();
#endif
#ifdef ASYNC_WEB_SOCKETS
extern AsyncWebSocket ws;
extern AsyncEventSource events;
void asyncWebServerInit();
void asyncWebSocketsInit();
void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len);
#endif

10
include/Const.h
View File

@@ -4,17 +4,13 @@
#define FIRMWARE_VERSION 400
//Размер буфера json
#define JSON_BUFFER_SIZE 4096
#define JSON_BUFFER_SIZE 1024
//выбор сервера (или асинхронный, или обычный)
//выбор сервера
//#define ASYNC_WEB_SERVER
//#define ASYNC_WEB_SOCKETS
#define STANDARD_WEB_SERVER
//если мы используем стандартный веб сервер то нужна библиотека веб сокетов
//если асинхронный то плагин сокетов включен в него
#ifdef STANDARD_WEB_SERVER
#define STANDARD_WEB_SOCKETS
#endif
#ifdef esp8266_4mb
#define USE_LITTLEFS true

7
include/Global.h
View File

@@ -11,7 +11,6 @@
#include "WiFi.h"
#include <HTTPClient.h>
#include <HTTPUpdate.h>
#endif
#ifdef ESP8266
@@ -76,4 +75,8 @@ extern WebSocketsServer standWebSocket;
**********************************************************************************************************************/
extern String settingsFlashJson;
extern String paramsFlashJson;
extern String paramsHeapJson;
extern String paramsHeapJson;
extern DynamicJsonDocument settingsFlashJsonDoc;
extern DynamicJsonDocument paramsFlashJsonDoc;
extern DynamicJsonDocument paramsHeapJsonDoc;

4
include/StandWebServer.h
View File

@@ -1,13 +1,11 @@
#pragma once
#include "Global.h"
#include "Web.h"
#ifdef STANDARD_WEB_SERVER
extern void standWebServerInit();
extern void standWebServerFiles();
extern bool handleFileRead(String path);
extern String getContentType(String filename);
#ifdef REST_FILE_OPERATIONS
extern void handleFileUpload();
extern void handleFileDelete();

31
include/utils/JsonUtils.h
View File

@@ -2,20 +2,23 @@
#include "Global.h"
String jsonReadStr(String& json, String name);
int jsonReadInt(String& json, String name);
boolean jsonReadBool(String& json, String name);
extern String jsonReadStrDoc(DynamicJsonDocument& doc, String name);
extern void jsonWriteStrDoc(DynamicJsonDocument& doc, String name, String value);
String jsonWriteStr(String& json, String name, String value);
String jsonWriteInt(String& json, String name, int value);
String jsonWriteFloat(String& json, String name, float value);
String jsonWriteBool(String& json, String name, boolean value);
extern String jsonWriteStr(String& json, String name, String value);
extern String jsonWriteInt(String& json, String name, int value);
extern String jsonWriteFloat(String& json, String name, float value);
extern String jsonWriteBool(String& json, String name, boolean value);
bool jsonRead(String& json, String key, String& value);
bool jsonRead(String& json, String key, bool& value);
bool jsonRead(String& json, String key, int& value);
extern bool jsonRead(String& json, String key, String& value);
extern bool jsonRead(String& json, String key, bool& value);
extern bool jsonRead(String& json, String key, int& value);
bool jsonWriteStr_(String& json, String name, String value);
bool jsonWriteBool_(String& json, String name, bool value);
bool jsonWriteInt_(String& json, String name, int value);
bool jsonWriteFloat_(String& json, String name, float value);
extern String jsonReadStr(String& json, String name);
extern int jsonReadInt(String& json, String name);
extern boolean jsonReadBool(String& json, String name);
extern bool jsonWriteStr_(String& json, String name, String value);
extern bool jsonWriteBool_(String& json, String name, bool value);
extern bool jsonWriteInt_(String& json, String name, int value);
extern bool jsonWriteFloat_(String& json, String name, float value);