iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-27 22:52:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

устранен баг телеграма, баг сценариев....

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-12-20 17:08:16 +01:00
parent 3417d0c915
commit 1df87f8986
9 changed files with 93 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ItemsList.cpp
View File

@@ -1,7 +1,7 @@
#include "ItemsList.h"
#include "FileSystem.h"
#include "Class/NotAsync.h"
#include "FileSystem.h"
#include "Init.h"
#include "Utils/StringUtils.h"
@@ -20,7 +20,6 @@ void itemsListInit() {
},
nullptr);
SerialPrint("I", F("Items"), F("Items Init"));
}
@@ -61,7 +60,6 @@ void addItem2(String param) {
Serial.println(seachingLine);
}
void addPreset2(int num) {
File configFile = FileFS.open("/presets/presets.c.txt", "r");
if (!configFile) {
@@ -76,8 +74,7 @@ void addPreset2(int num) {
if (i1 == num) {
if (i1 == 1) {
config = "\n" + item;
}
else {
} else {
config = item;
}
break;
@@ -85,7 +82,7 @@ void addPreset2(int num) {
}
configFile.close();
addFile(DEVICE_CONFIG_FILE, config);
//===========================================================================
File scenFile = FileFS.open("/presets/presets.s.txt", "r");
if (!scenFile) {
return;
@@ -97,18 +94,24 @@ void addPreset2(int num) {
i2++;
String item = scenFile.readStringUntil('*');
if (i2 == num) {
scen = item;
if (i1 == 1) {
scen = "\n" + item;
} else {
scen = item;
}
break;
}
}
scenFile.close();
if (readFile(String(DEVICE_SCENARIO_FILE), 2048) == "//") {
removeFile(DEVICE_SCENARIO_FILE);
scen = deleteBeforeDelimiter(scen, "\n");
addFile(DEVICE_SCENARIO_FILE, scen);
} else {
addFile(DEVICE_SCENARIO_FILE, scen);
}
addFile(DEVICE_SCENARIO_FILE, scen);
}
void delAllItems() {
removeFile(DEVICE_CONFIG_FILE);
addFile(DEVICE_CONFIG_FILE, String(firstLine));
@@ -129,24 +132,23 @@ uint8_t getNewElementNumber(String file) {
uint8_t getFreePinAll() {
#ifdef ESP8266
uint8_t pins[] = { 0, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5 };
uint8_t pins[] = {0, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5};
#endif
#ifdef ESP32
uint8_t pins[] = { 0, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5 };
uint8_t pins[] = {0, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5};
#endif
uint8_t array_sz = sizeof(pins) / sizeof(pins[0]);
uint8_t i = getNewElementNumber("pins.txt");
if (i < array_sz) {
return pins[i];
}
else {
} else {
return 0;
}
}
bool isPinExist(unsigned int num) {
bool ret = false;
unsigned int pins[] = { 0, 1, 2, 3, 4, 5, 9, 10, 12, 13, 14, 15, 16 };
unsigned int pins[] = {0, 1, 2, 3, 4, 5, 9, 10, 12, 13, 14, 15, 16};
uint8_t array_sz = sizeof(pins) / sizeof(pins[0]);
for (uint8_t i = 0; i < array_sz; i++) {
if (pins[i] == num) ret = true;
@@ -172,8 +174,7 @@ void delChoosingItems() {
String item = configFile.readStringUntil('\n');
if (firstLine) {
finalConf += item;
}
else {
} else {
int checkbox = selectToMarker(item, ";").toInt();
if (checkbox == 0) {
finalConf += "\n" + item;