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

fix NTP 2902 и мелкие правки

Browse Source
This commit is contained in:
Mit4el
2024-03-12 00:16:09 +03:00
parent d00eabbe0a
commit b228603158
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
myProfile.json
View File

@@ -156,6 +156,10 @@
"path": "src/modules/virtual/owmWeather",
"active": true
},
{
"path": "src/modules/virtual/Ping",
"active": true
},
{
"path": "src/modules/virtual/Timer",
"active": true
@@ -294,7 +298,7 @@
"path": "src/modules/sensors/Mhz19",
"active": false
},
{
{
"path": "src/modules/sensors/MQgas",
"active": true
},

9
src/NTP.cpp
View File

@@ -167,6 +167,15 @@ unsigned long strDateToUnix(String date) {
int numberOfLeepYears = 12;
int totalNormalYears = year - 1970 - numberOfLeepYears;
unsigned int daysInMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
if (year % 4 == 0) {
if (year % 100 != 0 || year % 400 == 0) {
daysInMonth[1] = 29;
} else {
daysInMonth[1] = 28;
}
} else {
daysInMonth[1] = 28;
}
int numberOfDaysInPastMonths = 0;
for (int i = 0; i <= 11; i++) {
if (i <= month - 2) {

5
src/modules/exec/SmartBoiler/SmartBoiler.cpp
View File

@@ -56,7 +56,8 @@ namespace _Boiler_v2
tmp = findIoTItem(widget);
if (tmp)
{
tmp->setValue(value, true);
if (value != tmp->value.valS)
tmp->setValue(value, true);
}
else
{
@@ -902,7 +903,7 @@ namespace _Boiler_v2
//}
if (!state.stateDHW) // Если уже включено ГВС, то нечего смотреть на отопление
{
if (set.cmd_chEnable && stepMap.size()>0)
if (set.cmd_chEnable && stepMap.size() > 0)
{
SerialPrint("I", "SmartBoiler", " stepMap.size = " + String(stepMap.size()));
publishNew("status", "Штатный режим");

16
src/modules/virtual/Benchmark/modinfo.json
View File

@@ -51,19 +51,7 @@
"defActive": false,
"usedLibs": {
"esp32_4mb": [],
"esp32_4mb3f": [],
"esp32s2_4mb": [],
"esp32_16mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": [],
"esp8285_1mb": [],
"esp8285_1mb_ota": [],
"esp8266_2mb": [],
"esp8266_2mb_ota": []
"esp32*": [],
"esp82*": []
}
}