iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78 from IoTManagerProject/beta

Browse Source 
Beta
This commit is contained in:
IoTManagerProject
2021-01-07 01:21:39 +01:00
committed by GitHub
parent 0b5d7236aa cbf0d372c9
commit 60a292a2f5
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/set.device.json.gz
View File

Binary file not shown.

2
data_ungzip/set.device.json
View File

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

16
include/Class/LineParsing.h
View File

@@ -112,10 +112,18 @@ class LineParsing {
} }
if (_pin != "") { if (_pin != "") {
if (!isPinExist(_pin.toInt()) || !isDigitStr(_pin)) { if (_pin.indexOf(",") == -1) {
pinErrors++; if (!isPinExist(_pin.toInt()) || !isDigitStr(_pin)) {
Serial.println("'" + _pin + "'"); pinErrors++;
_pin = ""; _pin = "";
}
} else {
String pin1 = selectToMarker(_pin, ",");
String pin2 = deleteBeforeDelimiter(_pin, ",");
if (!isPinExist(pin1.toInt()) || !isDigitStr(pin1) || !isPinExist(pin2.toInt()) || !isDigitStr(pin2)) {
pinErrors++;
_pin = "";
}
} }
} }

2
include/Consts.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#define FIRMWARE_VERSION 276 #define FIRMWARE_VERSION 278
#ifdef esp8266_4mb #ifdef esp8266_4mb
#define FIRMWARE_NAME "esp8266_4mb" #define FIRMWARE_NAME "esp8266_4mb"

2
platformio.ini
View File

@@ -11,7 +11,7 @@
;To choose board please use one of definition: ;To choose board please use one of definition:
;esp8266_1mb , esp8266_4mb , esp32_4mb ;esp8266_1mb , esp8266_4mb , esp32_4mb
[platformio] [platformio]
default_envs = esp8266_4mb default_envs = esp8266_1mb
[common_env_data] [common_env_data]

4
src/items/vLogging.cpp
View File

@@ -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 cnt = countLines(filename);
size_t sz = getFileSize(filename); size_t sz = getFileSize(filename);
@@ -128,7 +128,7 @@ void choose_log_date_and_send() {
String all_line = logging_KeyList; String all_line = logging_KeyList;
while (all_line.length() != 0) { while (all_line.length() != 0) {
String tmp = selectToMarker(all_line, ","); String tmp = selectToMarker(all_line, ",");
sendLogData("logs/" + tmp + ".txt", tmp); sendLogData("/logs/" + tmp + ".txt", tmp);
all_line = deleteBeforeDelimiter(all_line, ","); all_line = deleteBeforeDelimiter(all_line, ",");
} }
} }