Merge pull request #78 from IoTManagerProject/beta

Beta

data_ungzip/set.device.json

@@ -43,7 +43,7 @@
         },
         {
             "type": "h4",
-            "title": "Версия файловой системы: 276"
+            "title": "Версия файловой системы: 278"
         },
         {
             "type": "h4",

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 = "";
+                }
             }
         }
 

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"

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]

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, ",");
     }
 }