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

Merge pull request #123 from biveraxe/ver3

Browse Source 
Исправление опечатки и новая функция в песочнице
This commit is contained in:
IoT Manager
2022-02-01 12:10:14 +01:00
committed by GitHub
parent adbe794edd dd8d173a94
commit 810f3ca061
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data_ms/items/items.txt
View File

@@ -1,6 +1,6 @@
0;button-out;btnid;toggleBtn;Кнопки;Освещение;order* 0;button-out;btnid;toggleBtn;Кнопки;Освещение;order*
0;button-out;100-0;toggleBtn;Кнопки;Освещение;order;type[ms]* 0;button-out;100-0;toggleBtn;Кнопки;Освещение;order;type[ms]*
0;input;dgtid;inputDigit;Ввод;Введите#цифру;order* 0;input-value;dgtid;inputDigit;Ввод;Введите#цифру;order*
0;input;tmid;inputTime;Ввод;Введите#время;order* 0;input;tmid;inputTime;Ввод;Введите#время;order*
0;output;txtid;anydata;Вывод;Сигнализация;order* 0;output;txtid;anydata;Вывод;Сигнализация;order*
0;count-down;cntid;anydata;Таймер;Обратный#отчет;order* 0;count-down;cntid;anydata;Таймер;Обратный#отчет;order*

25
src/items/vSensorAny.cpp
View File

@@ -50,10 +50,28 @@ void SensorAny::read() {
MySensorAnyVector* mySensorAny = nullptr; MySensorAnyVector* mySensorAny = nullptr;
void AnySensorExecute() {
String key = sCmd.order();
String command = sCmd.next();
if (command == "cmd1") {
SerialPrint("I", "Sensor", key + " выполняет cmd1 без параметра");
}
else if (command == "cmd2") {
String par = sCmd.next();
SerialPrint("I", "Sensor", key + " выполняет cmd2 c параметром " + par);
}
else if (command == "cmd3") {
String par = sCmd.next();
SerialPrint("I", "Sensor", key + " выполняет cmd3 c параметром " + par);
}
}
void AnySensor() { void AnySensor() {
String params = "{}"; String params = "{}";
myLineParsing.update(); myLineParsing.update();
jsonWriteStr(params, "key", myLineParsing.gkey()); String key = myLineParsing.gkey();
jsonWriteStr(params, "key", key);
jsonWriteStr(params, "addr", myLineParsing.gaddr()); jsonWriteStr(params, "addr", myLineParsing.gaddr());
jsonWriteStr(params, "int", myLineParsing.gint()); jsonWriteStr(params, "int", myLineParsing.gint());
jsonWriteStr(params, "c", myLineParsing.gc()); jsonWriteStr(params, "c", myLineParsing.gc());
@@ -64,7 +82,10 @@ void AnySensor() {
myLineParsing.clear(); myLineParsing.clear();
static bool firstTime = true; static bool firstTime = true;
if (firstTime) mySensorAny = new MySensorAnyVector(); if (firstTime) {
mySensorAny = new MySensorAnyVector();
sCmd.addCommand(key.c_str(), AnySensorExecute);
}
firstTime = false; firstTime = false;
mySensorAny->push_back(SensorAny(params)); mySensorAny->push_back(SensorAny(params));
} }