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

optimization

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-08-31 01:45:43 +03:00
parent 0005760774
commit 3816711f04
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/Class/ScenarioClass.h
View File

@@ -33,13 +33,12 @@ class Scenario {
void calculate1() { void calculate1() {
_scenBlok = selectToMarker(_scenarioTmp, "end\n"); _scenBlok = selectToMarker(_scenarioTmp, "end\n");
_condition = selectToMarker(_scenBlok, "\n"); _condition = selectToMarker(_scenBlok, "\n");
_conditionParam = selectFromMarkerToMarker(_condition, " ", 0);
_eventParam = selectToMarker(eventBuf, ","); _eventParam = selectToMarker(eventBuf, ",");
} }
bool isIncommingEventInScenario() { bool isIncommingEventInScenario() {
bool ret = false; bool ret = false;
if (_conditionParam == _eventParam) { if (_condition.indexOf(_eventParam) != -1) {
ret = true; ret = true;
} }
return ret; return ret;
@@ -49,6 +48,8 @@ class Scenario {
_scenarioTmp += "\n"; _scenarioTmp += "\n";
_scenarioTmp.replace("\r\n", "\n"); _scenarioTmp.replace("\r\n", "\n");
_scenarioTmp.replace("\r", "\n"); _scenarioTmp.replace("\r", "\n");
_conditionParam = selectFromMarkerToMarker(_condition, " ", 0);
_conditionSign = selectFromMarkerToMarker(_condition, " ", 1); _conditionSign = selectFromMarkerToMarker(_condition, " ", 1);
_conditionValue = selectFromMarkerToMarker(_condition, " ", 2); _conditionValue = selectFromMarkerToMarker(_condition, " ", 2);
if (!isDigitStr(_conditionValue)) _conditionValue = jsonReadStr(configLiveJson, _conditionValue); if (!isDigitStr(_conditionValue)) _conditionValue = jsonReadStr(configLiveJson, _conditionValue);

17
src/main.cpp
View File

@@ -86,6 +86,23 @@ void setup() {
just_load = false; just_load = false;
initialized = true; initialized = true;
String buf = "Geeks-for-Geeks";
int buf_len = buf.length() + 1;
char char_array[buf_len];
buf.toCharArray(char_array, buf_len);
char* token = strtok(char_array, "-");
while (token != NULL) {
printf("%s\n", token);
token = strtok(NULL, "-");
}
//char str[] = "Geeks for Geeks";
//char* token;
//char* rest = str;
//while ((token = strtok_r(rest, " ", &rest))) {
// printf("%s\n", token);
//}
} }
void loop() { void loop() {