mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 14:12:16 +03:00
версия 306 добавлено блокирование многократного повторения события в сценарии - *
This commit is contained in:
Binary file not shown.
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#define FIRMWARE_VERSION 305
|
||||
#define FIRMWARE_VERSION 306
|
||||
|
||||
//#define svelte
|
||||
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
#include <Arduino.h>
|
||||
|
||||
|
||||
|
||||
void mqttInit();
|
||||
void selectBroker();
|
||||
void getMqttData1();
|
||||
@@ -29,3 +27,5 @@ void publishState();
|
||||
|
||||
void mqttCallback(char* topic, uint8_t* payload, size_t length);
|
||||
const String getStateStr();
|
||||
|
||||
String getAllJson();
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "items/vSensorSHT20.h"
|
||||
#include "items/vSensorUltrasonic.h"
|
||||
#include "items/vSensorUptime.h"
|
||||
#include "MqttClient.h"
|
||||
|
||||
void loopCmdAdd(const String& cmdStr) {
|
||||
if (cmdStr.endsWith(",")) {
|
||||
@@ -182,6 +183,16 @@ void spaceCmdExecute(String& cmdStr) {
|
||||
cmdStr.replace("\r", "\n");
|
||||
while (cmdStr.length()) {
|
||||
String buf = selectToMarker(cmdStr, "\n");
|
||||
if (buf.indexOf("*") != -1) {
|
||||
buf.replace("*", "");
|
||||
String order = selectToMarker(buf, " ");
|
||||
String newValue = selectToMarkerLast(buf, " ");
|
||||
String allJson = getAllJson();
|
||||
String currentValue = jsonReadStr(allJson, order);
|
||||
if (newValue == currentValue) {
|
||||
buf = "";
|
||||
}
|
||||
}
|
||||
if (buf != "") {
|
||||
sCmd.readStr(buf);
|
||||
SerialPrint("I", F("Order done W"), buf);
|
||||
|
||||
@@ -416,3 +416,14 @@ const String getStateStr() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
String getAllJson() {
|
||||
String str;
|
||||
if (configLiveJson != "{}") {
|
||||
str += configLiveJson;
|
||||
}
|
||||
if (configStoreJson != "{}") {
|
||||
str += "," + configStoreJson;
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user