diff --git a/data/set.device.json.gz b/data/set.device.json.gz index 3a067824..72d39227 100644 Binary files a/data/set.device.json.gz and b/data/set.device.json.gz differ diff --git a/data_ungzip/set.device.json b/data_ungzip/set.device.json index 6b1b055b..d3a93f8d 100644 --- a/data_ungzip/set.device.json +++ b/data_ungzip/set.device.json @@ -43,7 +43,7 @@ }, { "type": "h4", - "title": "Версия файловой системы: 276" + "title": "Версия файловой системы: 278" }, { "type": "h4", diff --git a/include/Class/LineParsing.h b/include/Class/LineParsing.h index f3553ad4..10cf73bd 100644 --- a/include/Class/LineParsing.h +++ b/include/Class/LineParsing.h @@ -112,10 +112,18 @@ class LineParsing { } if (_pin != "") { - if (!isPinExist(_pin.toInt()) || !isDigitStr(_pin)) { - pinErrors++; - Serial.println("'" + _pin + "'"); - _pin = ""; + if (_pin.indexOf(",") == -1) { + if (!isPinExist(_pin.toInt()) || !isDigitStr(_pin)) { + pinErrors++; + _pin = ""; + } + } else { + String pin1 = selectToMarker(_pin, ","); + String pin2 = deleteBeforeDelimiter(_pin, ","); + if (!isPinExist(pin1.toInt()) || !isDigitStr(pin1) || !isPinExist(pin2.toInt()) || !isDigitStr(pin2)) { + pinErrors++; + _pin = ""; + } } } diff --git a/include/Consts.h b/include/Consts.h index a4bb9c2a..6f74b0e2 100644 --- a/include/Consts.h +++ b/include/Consts.h @@ -1,6 +1,6 @@ #pragma once -#define FIRMWARE_VERSION 276 +#define FIRMWARE_VERSION 278 #ifdef esp8266_4mb #define FIRMWARE_NAME "esp8266_4mb" diff --git a/platformio.ini b/platformio.ini index bb600258..94ccba46 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,7 +11,7 @@ ;To choose board please use one of definition: ;esp8266_1mb , esp8266_4mb , esp32_4mb [platformio] -default_envs = esp8266_4mb +default_envs = esp8266_1mb [common_env_data] diff --git a/src/items/vLogging.cpp b/src/items/vLogging.cpp index 9edf1710..dfe1e440 100644 --- a/src/items/vLogging.cpp +++ b/src/items/vLogging.cpp @@ -48,7 +48,7 @@ void LoggingClass::execute(String keyOrValue) { } } - String filename = "logs/" + _key + ".txt"; + String filename = "/logs/" + _key + ".txt"; size_t cnt = countLines(filename); size_t sz = getFileSize(filename); @@ -128,7 +128,7 @@ void choose_log_date_and_send() { String all_line = logging_KeyList; while (all_line.length() != 0) { String tmp = selectToMarker(all_line, ","); - sendLogData("logs/" + tmp + ".txt", tmp); + sendLogData("/logs/" + tmp + ".txt", tmp); all_line = deleteBeforeDelimiter(all_line, ","); } }