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

реорганизация файлов, перенос лишнего, рабочая версия

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-01-24 22:28:33 +01:00
parent eca80d7dba
commit 9d56087973
10 changed files with 7 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Const.h
View File

@@ -12,8 +12,6 @@
#define STANDARD_WEB_SERVER
#define STANDARD_WEB_SOCKETS
#define QUEUE_FROM_STR
//#define REST_FILE_OPERATIONS
#define MQTT_RECONNECT_INTERVAL 20000

1
include/Main.h
View File

@@ -5,7 +5,6 @@
#include "Utils/WiFiUtils.h"
#include "AsyncWebServer.h"
#include "StandWebServer.h"
#include "classes/SendJson.h"
#include "classes/NotAsync.h"
#include "ESPConfiguration.h"
#include "MqttClient.h"

3
include/StandWebServer.h
View File

@@ -1,6 +1,5 @@
#pragma once
#include "Global.h"
#include "classes/SendJson.h"
#ifdef STANDARD_WEB_SERVER
extern void standWebServerInit();
@@ -22,8 +21,6 @@ extern void hexdump(const void* mem, uint32_t len, uint8_t cols);
#endif
#endif
void sendFileToWs(const String& filename, uint8_t num);
void sendFileToWs2(const String& filename, uint8_t num);
void sendFileToWs3(const String& filename, uint8_t num);
void sendFileToWs4(const String& filename, uint8_t num);
void sendFileToWs5(const String& filename, uint8_t num);

46
include/classes/QueueFromStruct.h
View File

@@ -1,46 +0,0 @@
#pragma once
#include "Global.h"
#ifdef QUEUE_FROM_STR
#include <queue>
//#include <iostream> долбанный стрим сука
using namespace std;
struct QueueItems {
String myword;
uint8_t num;
};
class QueueFromStruct;
class QueueFromStruct {
public:
QueueFromStruct();
~QueueFromStruct();
void push(QueueItems word);
void pop();
QueueItems front();
bool empty();
private:
queue<QueueItems> queue1;
QueueItems tmpItem;
};
extern QueueFromStruct* filesQueue;
//=======проверка очереди из структур=================
// myQueueStruct = new QueueFromStruct;
// QueueItems myItem;
// myItem.myword = "word1";
// myQueueStruct->push(myItem);
// myItem.myword = "word2";
// myQueueStruct->push(myItem);
// myItem.myword = "word3";
// myQueueStruct->push(myItem);
// Serial.println(myQueueStruct->front().myword);
// Serial.println(myQueueStruct->front().myword);
// Serial.println(myQueueStruct->front().myword);
#endif

31
include/classes/SendJson.h
View File

@@ -1,31 +0,0 @@
#pragma once
#include "Global.h"
#ifdef QUEUE_FROM_STR
#include "classes/QueueFromStruct.h"
class SendJson;
class SendJson {
public:
SendJson();
~SendJson();
void addFileToQueue(String path, uint8_t num);
void loop();
void sendWs(String& jsonArrayElement);
void sendMqtt(String& jsonArrayElement);
QueueItems myItem;
private:
File file;
String _path;
uint8_t _num;
bool sendingInProgress = false;
};
extern SendJson* sendJsonFiles;
#endif