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

Исправлен баг графиков, работает расширитель

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-10-02 01:06:25 +02:00
parent ebc9c10bcd
commit 31b83e8380
17 changed files with 137 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data_svelte/build/bundle.css.gz
View File

Binary file not shown.

BIN
data_svelte/build/bundle.js.gz
View File

Binary file not shown.

6
data_svelte/index.html
View File

@@ -4,12 +4,12 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" /> <meta name="viewport" content="width=device-width,initial-scale=1" />
<title>IoT Manager 4.3.9</title> <title>IoT Manager 4.4.0</title>
<link rel="icon" type="image/png" href="/favicon.ico" /> <link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="stylesheet" href="/build/bundle.css?439" /> <link rel="stylesheet" href="/build/bundle.css?440" />
<script defer src="/build/bundle.js?439"></script> <script defer src="/build/bundle.js?440"></script>
</head> </head>
<body></body> <body></body>

3
data_svelte/items.json
View File

@@ -30,7 +30,8 @@
"num": 2, "num": 2,
"int": 1, "int": 1,
"logid": "t", "logid": "t",
"points": 365 "points": 365,
"test": 0
}, },
{ {
"name": "3. Таймер", "name": "3. Таймер",

2
include/Const.h
View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
//Версия прошивки //Версия прошивки
#define FIRMWARE_VERSION 429 #define FIRMWARE_VERSION 430
#ifdef esp8266_4mb #ifdef esp8266_4mb
#define FIRMWARE_NAME "esp8266_4mb" #define FIRMWARE_NAME "esp8266_4mb"

1
include/MqttClient.h
View File

@@ -24,6 +24,7 @@ boolean publishStatusMqtt(const String& topic, const String& data);
boolean publishEvent(const String& topic, const String& data); boolean publishEvent(const String& topic, const String& data);
boolean publishInfo(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); boolean publishAnyJsonKey(const String& topic, const String& key, const String& data);
bool publishChartFileToMqtt(String path, String id, int maxCount);
void publishWidgets(); void publishWidgets();
void publishState(); void publishState();

1
include/UpgradeFirm.h
View File

@@ -12,6 +12,7 @@ struct updateFirm {
String configJson; String configJson;
String layoutJson; String layoutJson;
String scenarioTxt; String scenarioTxt;
String chartsData;
}; };
extern void upgradeInit(); extern void upgradeInit();

1
include/WsServer.h
View File

@@ -18,6 +18,7 @@ void publishStatusWs(const String& topic, const String& data);
void publishChartWs(int num, String& path); void publishChartWs(int num, String& path);
void periodicWsSend(); void periodicWsSend();
void sendStringToWs(const String& msg, uint8_t num, String name); void sendStringToWs(const String& msg, uint8_t num, String name);
void publishChartToWs(String filename, int num, size_t frameSize, int maxCount, String id);
// void sendMark(const char* filename, const char* mark, uint8_t num); // void sendMark(const char* filename, const char* mark, uint8_t num);
// void sendFileToWs3(const String& filename, uint8_t num); // void sendFileToWs3(const String& filename, uint8_t num);

2
include/utils/FileUtils.h
View File

@@ -24,6 +24,8 @@ extern void onFlashWrite();
String getFilesList8266(String& directory); String getFilesList8266(String& directory);
String getFilesList32(String& directory); String getFilesList32(String& directory);
String getFilesList(String& directory); String getFilesList(String& directory);
String createDataBaseSting();
void writeDataBaseSting(String input);
struct IoTFSInfo { struct IoTFSInfo {
size_t totalBytes; size_t totalBytes;

43
src/Main.cpp
View File

@@ -80,28 +80,6 @@ void setup() {
// test // test
Serial.println("-------test start--------"); Serial.println("-------test start--------");
// File dir = FileFS.open("/", "r");
// String out;
// printDirectory(dir, out);
// Serial.println(out);
//=======проверка очереди из структур=================
// myDB = new IoTDB;
// QueueItems myItem;
// myItem.myword = "word1";
// myDB->push(myItem);
// myItem.myword = "word2";
// myDB->push(myItem);
// myItem.myword = "word3";
// myDB->push(myItem);
// Serial.println(myDB->front().myword);
// Serial.println(myDB->front().myword);
// Serial.println(myDB->front().myword);
// Serial.println(FileList("lg"));
Serial.println("--------test end---------"); Serial.println("--------test end---------");
// симуляция добавления внешних событий // симуляция добавления внешних событий
@@ -191,3 +169,24 @@ void loop() {
// } // }
//} //}
} }
// File dir = FileFS.open("/", "r");
// String out;
// printDirectory(dir, out);
// Serial.println(out);
//=======проверка очереди из структур=================
// myDB = new IoTDB;
// QueueItems myItem;
// myItem.myword = "word1";
// myDB->push(myItem);
// myItem.myword = "word2";
// myDB->push(myItem);
// myItem.myword = "word3";
// myDB->push(myItem);
// Serial.println(myDB->front().myword);
// Serial.println(myDB->front().myword);
// Serial.println(myDB->front().myword);
// Serial.println(FileList("lg"));

16
src/MqttClient.cpp
View File

@@ -305,6 +305,22 @@ void publishState() {
} }
} }
bool publishChartFileToMqtt(String path, String id, int maxCount) {
File configFile = FileFS.open(path, FILE_READ);
if (!configFile) {
SerialPrint("E", F("Loging"), path + " file reading error, json not created, return");
return false;
}
String oneSingleJson = configFile.readString();
configFile.close();
String topic = mqttRootDevice + "/" + id;
oneSingleJson = "{\"maxCount\":" + String(maxCount) + ",\"topic\":\"" + topic + "\",\"status\":[" + oneSingleJson + "]}";
oneSingleJson.replace("},]}", "}]}");
SerialPrint("i", "Loging", "json size: " + String(oneSingleJson.length()));
publishChartMqtt(id, oneSingleJson);
return true;
}
void handleMqttStatus(bool send) { void handleMqttStatus(bool send) {
String stateStr = getStateStr(mqtt.state()); String stateStr = getStateStr(mqtt.state());
// Serial.println(stateStr); // Serial.println(stateStr);

2
src/UpgradeFirm.cpp
View File

@@ -119,6 +119,7 @@ void putUserDataToRam() {
update.settingsFlashJson = readFile("settings.json", 4096); update.settingsFlashJson = readFile("settings.json", 4096);
update.layoutJson = readFile("layout.json", 4096); update.layoutJson = readFile("layout.json", 4096);
update.scenarioTxt = readFile("scenario.txt", 4096); update.scenarioTxt = readFile("scenario.txt", 4096);
update.chartsData = createDataBaseSting();
} }
void saveUserDataToFlash() { void saveUserDataToFlash() {
@@ -126,6 +127,7 @@ void saveUserDataToFlash() {
writeFile("/settings.json", update.settingsFlashJson); writeFile("/settings.json", update.settingsFlashJson);
writeFile("/layout.json", update.layoutJson); writeFile("/layout.json", update.layoutJson);
writeFile("/scenario.txt", update.scenarioTxt); writeFile("/scenario.txt", update.scenarioTxt);
writeDataBaseSting(update.chartsData);
} }
void handleUpdateStatus(bool send, int state) { void handleUpdateStatus(bool send, int state) {

43
src/WsServer.cpp
View File

@@ -101,6 +101,10 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
standWebSocket.sendTXT(num, settingsFlashJson); standWebSocket.sendTXT(num, settingsFlashJson);
} }
//отправляем все графики в веб для экспорта
if (headerStr == "/expcharts|") {
}
//обработка кнопки сохранить //обработка кнопки сохранить
if (headerStr == "/gifnoc|") { if (headerStr == "/gifnoc|") {
writeFileUint8tByFrames("config.json", payload, length, headerLenth, 256); writeFileUint8tByFrames("config.json", payload, length, headerLenth, 256);
@@ -353,6 +357,45 @@ void sendStringToWs(const String& msg, uint8_t num, String name) {
standWebSocket.sendTXT(num, end); standWebSocket.sendTXT(num, end);
} }
//особая функция отправки графиков в веб
void publishChartToWs(String filename, int num, size_t frameSize, int maxCount, String id) {
String json;
jsonWriteStr(json, "topic", mqttRootDevice + "/" + id);
jsonWriteInt(json, "maxCount", maxCount);
String st = "/st/chart.json|" + json;
if (num == -1) {
standWebSocket.broadcastTXT(st);
} else {
standWebSocket.sendTXT(num, st);
}
String path = filepath(filename);
auto file = FileFS.open(path, "r");
if (!file) {
SerialPrint(F("E"), F("FS"), F("reed file error"));
return;
}
size_t fileSize = file.size();
SerialPrint(F("i"), F("FS"), "Send file '" + String(filename) + "', file size: " + String(fileSize));
uint8_t payload[frameSize];
int countRead = file.read(payload, sizeof(payload));
while (countRead > 0) {
if (num == -1) {
standWebSocket.broadcastBIN(payload, countRead);
} else {
standWebSocket.sendBIN(num, payload, countRead);
}
countRead = file.read(payload, sizeof(payload));
}
file.close();
String end = "/end/chart.json|" + json;
if (num == -1) {
standWebSocket.broadcastTXT(end);
} else {
standWebSocket.sendTXT(num, end);
}
}
// void sendMark(const char* filename, const char* mark, uint8_t num) { // void sendMark(const char* filename, const char* mark, uint8_t num) {
// char outChar[strlen(filename) + strlen(mark) + 1]; // char outChar[strlen(filename) + strlen(mark) + 1];
// strcpy(outChar, mark); // strcpy(outChar, mark);

63
src/modules/virtual/Loging/Loging.cpp
View File

@@ -177,12 +177,12 @@ class Loging : public IoTItem {
if (fileUnixTimeLocal > reqUnixTime && fileUnixTimeLocal < reqUnixTime + 86400) { if (fileUnixTimeLocal > reqUnixTime && fileUnixTimeLocal < reqUnixTime + 86400) {
noData = false; noData = false;
if (_publishType == TO_MQTT) { if (_publishType == TO_MQTT) {
publishChartFileToMqtt(path); publishChartFileToMqtt(path, id, calculateMaxCount());
} else if (_publishType == TO_WS) { } else if (_publishType == TO_WS) {
publishChartToWs(path, _wsNum, 1000); publishChartToWs(path, _wsNum, 1000, calculateMaxCount(), id);
} else if (_publishType == TO_MQTT_WS) { } else if (_publishType == TO_MQTT_WS) {
publishChartFileToMqtt(path); publishChartFileToMqtt(path, id, calculateMaxCount());
publishChartToWs(path, _wsNum, 1000); publishChartToWs(path, _wsNum, 1000, calculateMaxCount(), id);
} }
SerialPrint("i", F("Loging"), String(f) + ") " + path + ", " + getDateTimeDotFormatedFromUnix(fileUnixTimeLocal) + ", sent"); SerialPrint("i", F("Loging"), String(f) + ") " + path + ", " + getDateTimeDotFormatedFromUnix(fileUnixTimeLocal) + ", sent");
} else { } else {
@@ -224,61 +224,6 @@ class Loging : public IoTItem {
} }
} }
bool publishChartFileToMqtt(String path) {
File configFile = FileFS.open(path, FILE_READ);
if (!configFile) {
SerialPrint("E", F("Loging"), path + " file reading error, json not created, return");
return false;
}
String oneSingleJson = configFile.readString();
configFile.close();
String topic = mqttRootDevice + "/" + id;
oneSingleJson = "{\"maxCount\":" + String(calculateMaxCount()) + ",\"topic\":\"" + topic + "\",\"status\":[" + oneSingleJson + "]}";
oneSingleJson.replace("},]}", "}]}");
SerialPrint("i", "Loging", "json size: " + String(oneSingleJson.length()));
publishChartMqtt(id, oneSingleJson);
return true;
}
//особая функция отправки графиков в веб
void publishChartToWs(String filename, int num, size_t frameSize) {
String json;
jsonWriteStr(json, "topic", mqttRootDevice + "/" + id);
jsonWriteInt(json, "maxCount", calculateMaxCount());
String st = "/st/chart.json|";
if (num == -1) {
standWebSocket.broadcastTXT(st);
} else {
standWebSocket.sendTXT(num, st);
}
String path = filepath(filename);
auto file = FileFS.open(path, "r");
if (!file) {
SerialPrint(F("E"), F("FS"), F("reed file error"));
return;
}
size_t fileSize = file.size();
SerialPrint(F("i"), F("FS"), "Send file '" + String(filename) + "', file size: " + String(fileSize));
uint8_t payload[frameSize];
int countRead = file.read(payload, sizeof(payload));
while (countRead > 0) {
if (num == -1) {
standWebSocket.broadcastBIN(payload, countRead);
} else {
standWebSocket.sendBIN(num, payload, countRead);
}
countRead = file.read(payload, sizeof(payload));
}
file.close();
String end = "/end/chart.json|" + json;
if (num == -1) {
standWebSocket.broadcastTXT(end);
} else {
standWebSocket.sendTXT(num, end);
}
}
void clearValue() { void clearValue() {
String topic = mqttRootDevice + "/" + id; String topic = mqttRootDevice + "/" + id;
String json = "{\"maxCount\":0,\"topic\":\"" + topic + "\",\"status\":[]}"; String json = "{\"maxCount\":0,\"topic\":\"" + topic + "\",\"status\":[]}";

70
src/modules/virtual/LogingDaily/LogingDaily.cpp
View File

@@ -14,6 +14,8 @@ class LogingDaily : public IoTItem {
int points; int points;
int testMode;
IoTItem *dateIoTItem; IoTItem *dateIoTItem;
String prevDate = ""; String prevDate = "";
@@ -26,6 +28,7 @@ class LogingDaily : public IoTItem {
jsonRead(parameters, F("logid"), logid); jsonRead(parameters, F("logid"), logid);
jsonRead(parameters, F("id"), id); jsonRead(parameters, F("id"), id);
jsonRead(parameters, F("points"), points); jsonRead(parameters, F("points"), points);
jsonRead(parameters, F("test"), testMode);
if (points > 365) { if (points > 365) {
points = 365; points = 365;
@@ -36,7 +39,7 @@ class LogingDaily : public IoTItem {
} }
void doByInterval() { void doByInterval() {
if (hasDayChanged()) { if (hasDayChanged() || testMode == 1) {
execute(); execute();
} }
} }
@@ -72,7 +75,7 @@ class LogingDaily : public IoTItem {
float difference = currentValue - prevValue; float difference = currentValue - prevValue;
jsonWriteInt(logData, "x", unixTime); jsonWriteInt(logData, "x", unixTime - 120);
jsonWriteFloat(logData, "y1", difference); jsonWriteFloat(logData, "y1", difference);
//прочитаем путь к файлу последнего сохранения //прочитаем путь к файлу последнего сохранения
@@ -167,12 +170,12 @@ class LogingDaily : public IoTItem {
f++; f++;
if (_publishType == TO_MQTT) { if (_publishType == TO_MQTT) {
publishChartFileToMqtt(path); publishChartFileToMqtt(path, id, calculateMaxCount());
} else if (_publishType == TO_WS) { } else if (_publishType == TO_WS) {
publishChartToWs(path, _wsNum, 1000); publishChartToWs(path, _wsNum, 1000, calculateMaxCount(), id);
} else if (_publishType == TO_MQTT_WS) { } else if (_publishType == TO_MQTT_WS) {
publishChartFileToMqtt(path); publishChartFileToMqtt(path, id, calculateMaxCount());
publishChartToWs(path, _wsNum, 1000); publishChartToWs(path, _wsNum, 1000, calculateMaxCount(), id);
} }
SerialPrint("i", F("LogingDaily"), String(f) + ") " + path + ", sent"); SerialPrint("i", F("LogingDaily"), String(f) + ") " + path + ", sent");
@@ -185,61 +188,6 @@ class LogingDaily : public IoTItem {
cleanDirectory(dir); cleanDirectory(dir);
} }
bool publishChartFileToMqtt(String path) {
File configFile = FileFS.open(path, FILE_READ);
if (!configFile) {
SerialPrint("E", F("LogingDaily"), path + " file reading error, json not created, return");
return false;
}
String oneSingleJson = configFile.readString();
configFile.close();
String topic = mqttRootDevice + "/" + id;
oneSingleJson = "{\"maxCount\":" + String(calculateMaxCount()) + ",\"topic\":\"" + topic + "\",\"status\":[" + oneSingleJson + "]}";
oneSingleJson.replace("},]}", "}]}");
SerialPrint("i", "LogingDaily", "json size: " + String(oneSingleJson.length()));
publishChartMqtt(id, oneSingleJson);
return true;
}
//особая функция отправки графиков в веб
void publishChartToWs(String filename, int num, size_t frameSize) {
String json;
jsonWriteStr(json, "topic", mqttRootDevice + "/" + id);
jsonWriteInt(json, "maxCount", calculateMaxCount());
String st = "/st/chart.json|";
if (num == -1) {
standWebSocket.broadcastTXT(st);
} else {
standWebSocket.sendTXT(num, st);
}
String path = filepath(filename);
auto file = FileFS.open(path, "r");
if (!file) {
SerialPrint(F("E"), F("FS"), F("reed file error"));
return;
}
size_t fileSize = file.size();
SerialPrint(F("i"), F("FS"), "Send file '" + String(filename) + "', file size: " + String(fileSize));
uint8_t payload[frameSize];
int countRead = file.read(payload, sizeof(payload));
while (countRead > 0) {
if (num == -1) {
standWebSocket.broadcastBIN(payload, countRead);
} else {
standWebSocket.sendBIN(num, payload, countRead);
}
countRead = file.read(payload, sizeof(payload));
}
file.close();
String end = "/end/chart.json|" + json;
if (num == -1) {
standWebSocket.broadcastTXT(end);
} else {
standWebSocket.sendTXT(num, end);
}
}
void publishChartToWsSinglePoint(String value) { void publishChartToWsSinglePoint(String value) {
String topic = mqttRootDevice + "/" + id; String topic = mqttRootDevice + "/" + id;
String json = "{\"maxCount\":" + String(calculateMaxCount()) + ",\"topic\":\"" + topic + "\",\"status\":[{\"x\":" + String(unixTime) + ",\"y1\":" + value + "}]}"; String json = "{\"maxCount\":" + String(calculateMaxCount()) + ",\"topic\":\"" + topic + "\",\"status\":[{\"x\":" + String(unixTime) + ",\"y1\":" + value + "}]}";

6
src/modules/virtual/LogingDaily/modinfo.json
View File

@@ -12,7 +12,8 @@
"num": 1, "num": 1,
"int": 1, "int": 1,
"logid": "t", "logid": "t",
"points": 365 "points": 365,
"test": 0
} }
], ],
"about": { "about": {
@@ -28,7 +29,8 @@
"propInfo": { "propInfo": {
"int": "Интервал логирования в мнутах, частота проверки смены суток в минутах. Не рекомендуется менять", "int": "Интервал логирования в мнутах, частота проверки смены суток в минутах. Не рекомендуется менять",
"logid": "ID накопительной величины которую будем логировать", "logid": "ID накопительной величины которую будем логировать",
"points": "Максимальное количество точек" "points": "Максимальное количество точек",
"test": "Режим тестирования - график будет обновляться не раз в сутки, а кадый заданный в int интервал"
} }
}, },
"defActive": true, "defActive": true,

27
src/utils/FileUtils.cpp
View File

@@ -323,3 +323,30 @@ IoTFSInfo getFSInfo() {
return myFSInfo; return myFSInfo;
} }
#endif #endif
String createDataBaseSting() {
String out;
for (std::list<IoTItem*>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
if ((*it)->getSubtype() == "LogingDaily") {
String id = (*it)->getID();
id = "/lgd/" + id + "/" + id + ".txt";
String fileContent = readFile(id, 10000);
if (fileContent == "failed") {
SerialPrint("i", "Export", "file not exist " + id);
} else {
out += "=>" + fileContent + "\r\n";
}
}
}
return out;
}
void writeDataBaseSting(String input) {
while (input.length()) {
String line = selectToMarker(input, "\r\n");
String path = selectToMarker(line, "=>");
String content = deleteBeforeDelimiter(line, "=>");
writeFile(path, content);
input = deleteBeforeDelimiter(input, "\r\n");
}
}