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

запустил кнопки в веб интерфейсе

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-08-16 00:56:23 +02:00
parent dfd85d88cb
commit 85f8deb12a
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data_svelte/build/bundle.js
View File

File diff suppressed because one or more lines are too long

2
data_svelte/index.html
View File

@@ -4,7 +4,7 @@
<meta charset='utf-8'> <meta charset='utf-8'>
<meta name='viewport' content='width=device-width,initial-scale=1'> <meta name='viewport' content='width=device-width,initial-scale=1'>
<title>IoT Manager 4.1.2</title> <title>IoT Manager 4.1.3</title>
<link rel='icon' type='image/png' href='/favicon.ico'> <link rel='icon' type='image/png' href='/favicon.ico'>
<link rel='stylesheet' href='/build/bundle.css'> <link rel='stylesheet' href='/build/bundle.css'>

2
src/WsServer.cpp
View File

@@ -150,7 +150,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
writeUint8tToString(payload, length, headerLenth, msg); writeUint8tToString(payload, length, headerLenth, msg);
String key = selectFromMarkerToMarker(msg, "/", 0); String key = selectFromMarkerToMarker(msg, "/", 0);
String value = selectFromMarkerToMarker(msg, "/", 1); String value = selectFromMarkerToMarker(msg, "/", 1);
//generateOrder(key, value); generateOrder(key, value);
SerialPrint("i", F("=>WS"), "Msg from svelte web, WS No: " + String(num) + ", msg: " + msg); SerialPrint("i", F("=>WS"), "Msg from svelte web, WS No: " + String(num) + ", msg: " + msg);
} }
} break; } break;

16
src/classes/IoTItem.cpp
View File

@@ -84,14 +84,14 @@ void IoTItem::regEvent(String value, String consoleInfo = "") {
generateEvent(_id, value); generateEvent(_id, value);
publishStatusMqtt(_id, value); publishStatusMqtt(_id, value);
//отправка события другим устройствам в сети============================== //отправка события другим устройствам в сети==============================
if (jsonReadBool(settingsFlashJson, "mqttin")) { // if (jsonReadBool(settingsFlashJson, "mqttin")) {
String json = "{}"; // String json = "{}";
jsonWriteStr_(json, "id", _id); // jsonWriteStr_(json, "id", _id);
jsonWriteStr_(json, "val", value); // jsonWriteStr_(json, "val", value);
jsonWriteInt_(json, "int", _interval + 5000); // 5 секунд про запас // jsonWriteInt_(json, "int", _interval + 5000); // 5 секунд про запас
publishEvent(_id, json); // publishEvent(_id, json);
SerialPrint("i", F("<=MQTT"), "Broadcast event: " + json); // SerialPrint("i", F("<=MQTT"), "Broadcast event: " + json);
} //}
//======================================================================== //========================================================================
publishStatusWs(_id, value); // Ilya, data: "1" (analog sensor, round set to 1, should be "1.0") publishStatusWs(_id, value); // Ilya, data: "1" (analog sensor, round set to 1, should be "1.0")
SerialPrint("i", "Sensor " + consoleInfo, "'" + _id + "' data: " + value + "'"); SerialPrint("i", "Sensor " + consoleInfo, "'" + _id + "' data: " + value + "'");