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

Merge branch 'IoTManagerProject:ver3' into ver3

Browse Source
This commit is contained in:
biveraxe
2022-01-11 15:33:15 +03:00
committed by GitHub
parent ea53d5ccf1 bf9acf4c63
commit bcd6f06e5e
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Telegram.cpp
View File

@@ -59,7 +59,7 @@ void telegramMsgParse(String msg) {
SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + String(msg)); SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + String(msg));
} else if (msg.indexOf("get") != -1) { } else if (msg.indexOf("get") != -1) {
msg = deleteBeforeDelimiter(msg, "_"); msg = deleteBeforeDelimiter(msg, "_");
myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), getValue(msg)); //jsonReadStr(configLiveJson , msg)); myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), getValue(msg)); // jsonReadStr(configLiveJson , msg));
SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + String(msg)); SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + String(msg));
} else if (msg.indexOf("all") != -1) { } else if (msg.indexOf("all") != -1) {
String list = returnListOfParams(); String list = returnListOfParams();
@@ -74,13 +74,21 @@ void telegramMsgParse(String msg) {
void sendTelegramMsg() { void sendTelegramMsg() {
String sabject = sCmd.next(); String sabject = sCmd.next();
String msg = sCmd.next(); String msg = sCmd.next();
String ID_name = "";
String ID_value = "";
if (sabject == "often") { if (sabject == "often") {
msg.replace("#", " "); msg.replace("#", " ");
msg.replace("%date%", timeNow->getDateTimeDotFormated()); msg.replace("%date%", timeNow->getDateTimeDotFormated());
msg.replace("%weekday%", timeNow->getWeekday()); msg.replace("%weekday%", timeNow->getWeekday());
msg.replace("%IP%", jsonReadStr(configSetupJson, F("ip"))); msg.replace("%IP%", jsonReadStr(configSetupJson, F("ip")));
msg.replace("%name%", jsonReadStr(configSetupJson, F("name"))); msg.replace("%name%", jsonReadStr(configSetupJson, F("name")));
if (msg.indexOf("_") != -1) {
ID_name = deleteBeforeDelimiter(msg, "_");
ID_name = deleteAfterDelimiter(ID_name, "_");
ID_value = getValue(ID_name);
msg.replace(ID_name, ID_value);
}
msg.replace("_", " ");
myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), msg); myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), msg);
SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + msg); SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + msg);
} else { } else {
@@ -93,6 +101,13 @@ void sendTelegramMsg() {
msg.replace("%weekday%", timeNow->getWeekday()); msg.replace("%weekday%", timeNow->getWeekday());
msg.replace("%IP%", jsonReadStr(configSetupJson, F("ip"))); msg.replace("%IP%", jsonReadStr(configSetupJson, F("ip")));
msg.replace("%name%", jsonReadStr(configSetupJson, F("name"))); msg.replace("%name%", jsonReadStr(configSetupJson, F("name")));
if (msg.indexOf("_") != -1) {
ID_name = deleteBeforeDelimiter(msg, "_");
ID_name = deleteAfterDelimiter(ID_name, "_");
ID_value = getValue(ID_name);
msg.replace(ID_name, ID_value);
}
msg.replace("_", " ");
myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), msg); myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), msg);
SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + msg); SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + msg);
@@ -120,7 +135,7 @@ String returnListOfParams() {
count++; count++;
if (count > 1) { if (count > 1) {
String id = selectFromMarkerToMarker(buf, ";", 2); String id = selectFromMarkerToMarker(buf, ";", 2);
String value = getValue(id); //jsonReadStr(configLiveJson , id); String value = getValue(id); // jsonReadStr(configLiveJson , id);
String page = selectFromMarkerToMarker(buf, ";", 4); String page = selectFromMarkerToMarker(buf, ";", 4);
page.replace("#", " "); page.replace("#", " ");
String name = selectFromMarkerToMarker(buf, ";", 5); String name = selectFromMarkerToMarker(buf, ";", 5);

2
src/items/vImpulsOut.cpp
View File

@@ -24,7 +24,7 @@ void ImpulsOutClass::loop() {
currentMillis = millis(); currentMillis = millis();
difference = currentMillis - prevMillis; difference = currentMillis - prevMillis;
if (_impulsCountBuf > 0) { if (_impulsCountBuf > 0) {
if (difference > _impulsPeriod) { if (difference >= _impulsPeriod) {
_impulsCountBuf--; _impulsCountBuf--;
prevMillis = millis(); prevMillis = millis();
yield(); yield();