очистка и реорганизация файлов

This commit is contained in:
Dmitry Borisenko
2022-02-02 21:17:50 +01:00
parent e376693028
commit a2f5927172
12 changed files with 211 additions and 272 deletions

View File

@@ -1,8 +0,0 @@
#pragma once
#include "Global.h"
extern void createWidget(String& parameters);
extern bool loadWidget(const String& filename, String& buf);
extern const String getWidgetFile(const String& name);

View File

@@ -1,7 +1,6 @@
#pragma once
#include "Global.h"
#include "Classes/IoTSensor.h"
#include "CreateWidget.h"
extern std::vector<IoTSensor*> iotSensors; // вектор ссылок базового класса IoTSensor - список всех запущенных сенсоров

View File

@@ -8,3 +8,4 @@
#include "classes/NotAsync.h"
#include "ESPConfiguration.h"
#include "MqttClient.h"
#include "WsServer.h"

View File

@@ -19,7 +19,7 @@ boolean publishData(const String& topic, const String& data);
boolean publishChart(const String& topic, const String& data);
boolean publishControl(String id, String topic, String state);
boolean publishChart_test(const String& topic, const String& data);
boolean publishStatus(const String& topic, const String& data);
boolean publishStatusMqtt(const String& topic, const String& data);
boolean publishEvent(const String& topic, const String& data);
boolean publishInfo(const String& topic, const String& data);
boolean publishAnyJsonKey(const String& topic, const String& key, const String& data);

View File

@@ -12,16 +12,3 @@ extern void handleFileCreate();
extern void handleFileList();
#endif
#endif
#ifdef STANDARD_WEB_SOCKETS
extern void standWebSocketsInit();
extern void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length);
#ifdef ESP32
extern void hexdump(const void* mem, uint32_t len, uint8_t cols);
#endif
#endif
void sendFileToWs5(const char* filename, uint8_t num, size_t frameSize);
// void sendMark(const char* filename, const char* mark, uint8_t num);
// void sendFileToWs3(const String& filename, uint8_t num);
// void sendFileToWs4(const String& filename, uint8_t num);

15
include/WsServer.h Normal file
View File

@@ -0,0 +1,15 @@
#pragma once
#include "Global.h"
#ifdef STANDARD_WEB_SOCKETS
extern void standWebSocketsInit();
extern void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length);
#ifdef ESP32
extern void hexdump(const void* mem, uint32_t len, uint8_t cols);
#endif
#endif
void sendFileToWs5(const char* filename, uint8_t num, size_t frameSize);
// void sendMark(const char* filename, const char* mark, uint8_t num);
// void sendFileToWs3(const String& filename, uint8_t num);
// void sendFileToWs4(const String& filename, uint8_t num);