mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-28 07:02:17 +03:00
избавление от двух файлов
This commit is contained in:
@@ -599,16 +599,16 @@ int IoTScenario::getLastChar() {
|
||||
LastChar = file.read();
|
||||
if (LastChar == 10) curLine++;
|
||||
return LastChar;
|
||||
} else
|
||||
} else
|
||||
return EOF;
|
||||
} else if (mode == 1) {
|
||||
if (charCount < strFromFile.length()) {
|
||||
LastChar = strFromFile.charAt(charCount);
|
||||
//Serial.printf("%d, ", LastChar);
|
||||
// Serial.printf("%d, ", LastChar);
|
||||
if (LastChar == 10) curLine++;
|
||||
charCount++;
|
||||
return LastChar;
|
||||
} else
|
||||
} else
|
||||
return EOF;
|
||||
} else {
|
||||
return EOF;
|
||||
@@ -980,6 +980,12 @@ void IoTScenario::loadScenario(String fileName) { // подготавливае
|
||||
return;
|
||||
}
|
||||
strFromFile = file.readString();
|
||||
strFromFile.replace("{\"scen\":\"", "");
|
||||
strFromFile.replace("\\n", "\n");
|
||||
strFromFile.replace("\\\"", "\"");
|
||||
strFromFile.replace(";", " ");
|
||||
strFromFile.replace("\\t", " ");
|
||||
strFromFile.remove(strFromFile.length() - 2, 2);
|
||||
Serial.printf("strFromFile: %s, %s\n", strFromFile.c_str(), fileName.c_str());
|
||||
file.close();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user