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

версия 404, много исправлений

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-02-16 00:53:52 +01:00
parent 218a0408a5
commit 5110c609c3
21 changed files with 101 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/Const.h
View File

@@ -1,10 +1,18 @@
#pragma once
//Это версия прошивки
#define FIRMWARE_VERSION 403
#define FIRMWARE_VERSION 404
#ifdef esp8266_4mb
#define FIRMWARE_NAME "esp8266_4mb"
#endif
#ifdef esp32_4mb
#define FIRMWARE_NAME "esp32_4mb"
#endif
//Размер буфера json
#define JSON_BUFFER_SIZE 1024
#define JSON_BUFFER_SIZE 2048
//выбор сервера
//#define ASYNC_WEB_SERVER

2
include/Global.h
View File

@@ -55,7 +55,6 @@
*****************************************глобальные объекты классов***************************************************
**********************************************************************************************************************/
extern TickerScheduler ts;
extern WiFiClient espClient;
extern PubSubClient mqtt;
@@ -104,6 +103,7 @@ extern String mqttUser;
extern String mqttPass;
extern unsigned long mqttUptime;
extern unsigned long flashWriteNumber;
extern String mqttRootDevice;
extern String chipId;

16
include/classes/ScenarioClass3.h
View File

@@ -70,8 +70,8 @@ class Scenario {
oneBlock = deleteBeforeDelimiter(oneBlock, "\n");
oneBlock.replace("end", "");
// SerialPrint("I", "Event done", incommingEvent);
SerialPrint("I", F("Scenario"), F("All conditions are matched"));
// SerialPrint("i", "Event done", incommingEvent);
SerialPrint("i", F("Scenario"), F("All conditions are matched"));
spaceCmdExecute(oneBlock);
}
@@ -124,8 +124,8 @@ class Scenario {
oneBlock = deleteBeforeDelimiter(oneBlock, "\n");
oneBlock.replace("end", "");
// SerialPrint("I", "Event done", incommingEvent);
SerialPrint("I", F("Scenario"), F("One of all condition are matched"));
// SerialPrint("i", "Event done", incommingEvent);
SerialPrint("i", F("Scenario"), F("One of all condition are matched"));
spaceCmdExecute(oneBlock);
}
@@ -135,8 +135,8 @@ class Scenario {
oneBlock = deleteBeforeDelimiter(oneBlock, "\n");
oneBlock.replace("end", "");
// SerialPrint("I", "Event done", incommingEvent);
SerialPrint("I", F("Scenario"), "Condition are matched: " + condition);
// SerialPrint("i", "Event done", incommingEvent);
SerialPrint("i", F("Scenario"), "Condition are matched: " + condition);
spaceCmdExecute(oneBlock);
}
@@ -146,8 +146,8 @@ class Scenario {
oneBlock = deleteBeforeDelimiter(oneBlock, "\n");
oneBlock.replace("end", "");
// SerialPrint("I", "Event done", incommingEvent);
SerialPrint("I", F("Scenario"), "Condition are matched: " + condition);
// SerialPrint("i", "Event done", incommingEvent);
SerialPrint("i", F("Scenario"), "Condition are matched: " + condition);
spaceCmdExecute(oneBlock);
}
}

3
include/utils/FileUtils.h
View File

@@ -9,4 +9,5 @@ extern const String writeFile(const String& filename, const String& str);
extern const String readFile(const String& filename, size_t max_size);
extern const String filepath(const String& filename);
extern bool cutFile(const String& src, const String& dst);
extern const String addFileLn(const String& filename, const String& str);
extern const String addFileLn(const String& filename, const String& str);
extern void onFlashWrite();