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

process to asinc

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-08-25 18:36:05 +03:00
parent b1318de1dc
commit 532925756f
14 changed files with 382 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/DeviceList.cpp
View File

@@ -2,19 +2,17 @@
static const char* firstLine PROGMEM = "Тип элемента;Id;Виджет;Имя вкладки;Имя виджета;Позиция виджета";
void addElement(String name) {
void addItem(String name) {
String item = readFile("items/" + name + ".txt", 1024);
item.replace("id", "id" + String(getNewElementNumber("id.txt")));
item.replace("order", String(getNewElementNumber("order.txt")));
item.replace("\r\n", "");
item.replace("\r", "");
item.replace("\n", "");
addFile("conf.csv", "\n" + item);
}
void delAllElement() {
void delAllItems() {
removeFile("conf.csv");
addFile("conf.csv", String(firstLine));
removeFile("id.txt");
@@ -29,71 +27,73 @@ int getNewElementNumber(String file) {
return number;
}
void do_getJsonListFromCsv() {
if (getJsonListFromCsvFlag) {
getJsonListFromCsvFlag = false;
removeFile("items/elements.json");
addFile("items/elements.json", getJsonListFromCsv("conf.csv", 1));
}
}
String getJsonListFromCsv(String csvFile, int colum) {
File configFile = LittleFS.open("/" + csvFile, "r");
if (!configFile) {
return "error";
}
configFile.seek(0, SeekSet);
String outJson = "{}";
int count = -1;
while (configFile.position() != configFile.size()) {
count++;
String item = configFile.readStringUntil('\n');
if (count > 0) {
String line = selectFromMarkerToMarker(item, ";", colum);
jsonWriteStr(outJson, line, line);
}
}
configFile.close();
csvFile = "";
return outJson;
}
void do_delElement() {
if (delElementFlag) {
delElementFlag = false;
delElement(itemsFile, itemsLine);
}
}
void delElement(String _itemsFile, String _itemsLine) {
File configFile = LittleFS.open("/" + _itemsFile, "r");
if (!configFile) {
return;
}
configFile.seek(0, SeekSet);
String finalConf;
int count = -1;
while (configFile.position() != configFile.size()) {
count++;
String item = configFile.readStringUntil('\n');
Serial.print(_itemsLine);
Serial.print(" ");
Serial.println(count);
if (count != _itemsLine.toInt()) {
if (count == 0) {
finalConf += item;
} else {
finalConf += "\n" + item;
}
}
}
removeFile(_itemsFile);
addFile(_itemsFile, finalConf);
Serial.println(finalConf);
itemsFile = "";
itemsLine = "";
configFile.close();
}
//void do_getJsonListFromCsv() {
// if (getJsonListFromCsvFlag) {
// getJsonListFromCsvFlag = false;
// removeFile("items/items.json");
// addFile("items/items.json", getJsonListFromCsv("conf.csv", 1));
// }
//}
//
//String getJsonListFromCsv(String csvFile, int colum) {
// File configFile = LittleFS.open("/" + csvFile, "r");
// if (!configFile) {
// return "error";
// }
// configFile.seek(0, SeekSet);
//
// String outJson = "{}";
//
// int count = -1;
//
// while (configFile.position() != configFile.size()) {
// count++;
// String item = configFile.readStringUntil('\n');
// if (count > 0) {
// String line = selectFromMarkerToMarker(item, ";", colum);
// jsonWriteStr(outJson, line, line);
// }
// }
// configFile.close();
// csvFile = "";
// return outJson;
//}
//
//void do_delElement() {
// if (delElementFlag) {
// delElementFlag = false;
// delElement(itemsFile, itemsLine);
// }
//}
//
//void delElement(String _itemsFile, String _itemsLine) {
// File configFile = LittleFS.open("/" + _itemsFile, "r");
// if (!configFile) {
// return;
// }
// configFile.seek(0, SeekSet);
// String finalConf;
// int count = -1;
// while (configFile.position() != configFile.size()) {
// count++;
// String item = configFile.readStringUntil('\n');
// Serial.print(_itemsLine);
// Serial.print(" ");
// Serial.println(count);
// if (count != _itemsLine.toInt()) {
// if (count == 0) {
// finalConf += item;
// } else {
// finalConf += "\n" + item;
// }
// }
// }
// removeFile(_itemsFile);
// addFile(_itemsFile, finalConf);
// Serial.println(finalConf);
// itemsFile = "";
// itemsLine = "";
// configFile.close();
//}