iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-28 07:02:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Working version with NotAsinc class

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-08-26 01:03:45 +03:00
parent 7f7bad305c
commit abbfcec92c
10 changed files with 123 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Cmd.cpp
View File

@@ -128,6 +128,12 @@ void buttonOut() {
void buttonOutSet() {
String key = sCmd.order();
String state = sCmd.next();
Serial.println("==");
Serial.println(key);
Serial.println(state);
Serial.println("==");
String pin = jsonReadStr(configOptionJson, key + "_pin");
String inv = jsonReadStr(configOptionJson, key + "_inv");
if (inv == "") {
@@ -461,11 +467,10 @@ void addCommandLoop(const String &cmdStr) {
void fileExecute(const String &filename) {
String cmdStr = readFile(filename, 2048);
stringExecute(cmdStr);
csvExecute(cmdStr);
}
void stringExecute(String &cmdStr) {
cmdStr.replace("x;","");
void csvExecute(String &cmdStr) {
cmdStr.replace(";"," ");
cmdStr += "\r\n";
cmdStr.replace("\r\n", "\n");
@@ -479,6 +484,17 @@ void stringExecute(String &cmdStr) {
}
}
void spaceExecute(String &cmdStr) {
cmdStr += "\r\n";
cmdStr.replace("\r\n", "\n");
cmdStr.replace("\r", "\n");
while (cmdStr.length()) {
String buf = selectToMarker(cmdStr, "\n");
sCmd.readStr(buf);
cmdStr = deleteBeforeDelimiter(cmdStr, "\n");
}
}
void loopCmd() {
if (order_loop.length()) {
String tmp = selectToMarker(order_loop, ","); //выделяем первую команду rel 5 1,