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

кольцевой буфер

Browse Source
This commit is contained in:
Dmitry Borisenko
2021-12-21 00:30:05 +01:00
parent 329d1cd382
commit 16cecfb353
10 changed files with 211 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/WebSocket.cpp
View File

@@ -1,6 +1,7 @@
#include "WebSocket.h"
#include "ArduinoJson.h"
#include "Class/CircularBuffer.h"
#include "Class/NotAsync.h"
#include "Global.h"
@@ -22,11 +23,10 @@ void wsPublishData(String topic, String data) {
}
}
//отправка setup массива в sockets способом через string
//отправка setup массива в sockets способом через буфер string, рабочий способ но буфер стринг - плохой метод
void wsSendSetup() {
File file = seekFile("/setup.json");
DynamicJsonDocument doc(2048);
AsyncWebSocketMessageBuffer(20480);
int i = 0;
file.find("[");
SerialPrint("I", F("WS"), F("start send config"));
@@ -41,15 +41,52 @@ void wsSendSetup() {
}
void loopWsExecute() {
static int attampts = wsAttempts;
if (wsBuf.length()) {
if (ws.availableForWriteAll()) {
String tmp = selectToMarker(wsBuf, "\n");
wsPublishData("config", tmp);
wsBuf = deleteBeforeDelimiter(wsBuf, "\n");
if (attampts > 0) {
if (ws.availableForWriteAll()) {
String tmp = selectToMarker(wsBuf, "\n");
wsPublishData("config", tmp);
wsBuf = deleteBeforeDelimiter(wsBuf, "\n");
attampts = wsAttempts;
} else {
attampts--;
SerialPrint("I", F("WS"), String(attampts));
}
} else {
SerialPrint("I", F("WS"), F("socket fatal error"));
attampts = wsAttempts;
}
}
}
//отправка setup массива в sockets способом через кольщевой буфер char
void wsSendSetup2() {
// myWsBuffer = new CircularBuffer<char*, 20480>;
// File file = seekFile("/setup.json");
// DynamicJsonDocument doc(2048);
// int i = 0;
// file.find("[");
// SerialPrint("I", F("WS"), F("start send config"));
// do {
// i++;
// deserializeJson(doc, file);
// char* element = "";
// serializeJson(doc, (char*)element, 1024);
// Serial.println(element);
// myWsBuffer->push(element);
//
//} while (file.findUntil(",", "]"));
// SerialPrint("I", F("WS"), F("completed send config"));
}
void loopWsExecute2() {
// char* item;
// if (myWsBuffer->pop(item)) {
// Serial.println(item);
// }
}
//отправка setup массива в sockets способом прямой загрузки в ws buffer
void wsSendSetupBuffer() {
File file = seekFile("/setup.json");