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

Merge pull request #169 from biveraxe/ver4dev

Browse Source 
Теперь читаем сценарии из JSON
This commit is contained in:
Ilya Belyakov
2022-08-23 15:17:49 +03:00
committed by GitHub
parent d22741d9f6 c0f9a0890b
commit 9d841b1f57
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/classes/IoTScenario.cpp
View File

@@ -929,30 +929,36 @@ void IoTScenario::loadScenario(String fileName) { // посимвольно с
File myfile = seekFile(fileName);
if (myfile.available()) {
String strFromFile = "";
strFromFile = myfile.readString();
Serial.println(strFromFile);
jsonRead(strFromFile, "scen", strFromFile, true);
strFromFile = new String("");
String strFromF = myfile.readString();
Serial.println(strFromF);
jsonRead(strFromF, "scen", *strFromFile, true);
myfile.close();
getNextToken();
while (strIterator < strFromFile.length() - 1) {
// Serial.printf("-%c", LastChar);
switch (CurTok) {
// case tok_eof: return;
// case ';': getNextToken(); break; // игнорируем верхнеуровневые точки с запятой.
case tok_if: {
String IDNames = ""; // накопитель встречающихся идентификаторов в условии
ScenarioElements.push_back(ParseIfExpr(&IDNames));
// Serial.printf("vvvvvvvvvvvvvvvv %s", IDNames.c_str());
break;
//Serial.println(*strFromFile);
if (strFromFile->length()) {
getNextToken();
while (strIterator < strFromFile->length() - 1) {
// Serial.printf("-%c", LastChar);
switch (CurTok) {
// case tok_eof: return;
// case ';': getNextToken(); break; // игнорируем верхнеуровневые точки с запятой.
case tok_if: {
String IDNames = ""; // накопитель встречающихся идентификаторов в условии
ScenarioElements.push_back(ParseIfExpr(&IDNames));
break;
}
default:
getNextToken();
break;
}
default:
getNextToken();
break;
}
}
// delete strFromFile;
delete strFromFile;
strIterator = 0;
} else {
Error("Open file scenario error");