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

First working platformio version

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-06-18 23:43:06 +02:00
parent c16b61c82b
commit 86e18f1e99
45 changed files with 511 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main.cpp
View File

@@ -1,6 +1,4 @@
#include "main.h"
#include "set.h"
#include "Global.h"
String jsonReadStr(String& json, String name) {
DynamicJsonBuffer jsonBuffer;
@@ -61,6 +59,9 @@ void saveConfig() {
writeFile("config.json", configSetup);
}
//============================================================================================================
//=============================================STRING===================================================
// --------Выделяем строку от конца строки до маркера-----------------------------------------------------------
String selectToMarkerLast(String str, String found) {
int p = str.lastIndexOf(found);
@@ -121,25 +122,24 @@ int count(String str, String found) {
return i; // Достигли пустой строки и ничего не нашли
}
boolean isDigitStr(String str) {
if (str.length() == 1) {
return Digit(str);
}
if (str.length() > 1) {
for (int i = 0; i < str.length(); i++) {
if (!Digit(String(str.charAt(i)))) return false;
for (int i = 0; i < str.length(); i++) {
if (!isDigit(str.charAt(i))) {
return false;
}
return true;
}
}
boolean Digit(String str) {
if (str == "0" || str == "1" || str == "2" || str == "3" || str == "4" || str == "5" || str == "6" || str == "7" || str == "8" || str == "9") {
return true;
} else {
return false;
}
return str.length();
}
// boolean digit(String str) {
// if (str == "0" || str == "1" || str == "2" || str == "3" || str == "4" || str == "5" || str == "6" || str == "7" || str == "8" || str == "9") {
// return true;
// } else {
// return false;
// }
// }
String getURL(String urls) {
String answer = "";
HTTPClient http;
@@ -153,10 +153,10 @@ String getURL(String urls) {
http.end();
return answer;
}
//===================================================================================================================
//===================================================================================================================
//===========================================FILES===================================================================
// ------------- Добавление файла -----------------------------------------------------------------------------------
String safeDataToFile(String data, String Folder) {
void safeDataToFile(String data, String Folder) {
//String fileName = GetDate();
String fileName;
fileName.toLowerCase();
@@ -168,6 +168,7 @@ String safeDataToFile(String data, String Folder) {
Serial.println(fileName);
jsonWriteStr(configJson, "test", fileName);
}
// ------------- Чтение файла в строку -------------------------------------------------------------------------------
String readFile(String fileName, size_t len) {
File configFile = SPIFFS.open("/" + fileName, "r");