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

261

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-10-21 01:08:24 +03:00
parent 29e5a55ad3
commit 600e66c345
6 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/s.conf.csv
View File

@@ -1 +1 @@
Тип элемента;Id;Виджет;Имя вкладки;Имя виджета;Позиция виджета Удалить;Тип элемента;Id;Виджет;Имя вкладки;Имя виджета;Позиция виджета
1 Удалить Тип элемента Id Виджет Имя вкладки Имя виджета Позиция виджета

2
data/set.device.json
View File

@@ -43,7 +43,7 @@
}, },
{ {
"type": "h4", "type": "h4",
"title": "LittleFS version: 260" "title": "LittleFS version: 261"
}, },
{ {
"type": "hr" "type": "hr"

6
data/widgets/btn.json
View File

@@ -1,6 +1,6 @@
{ {
"widget": "btn", "widget": "btn",
"icon": "switch", "size": "large",
"fill": "outline", "color": "green",
"color": "orange" "send": "test"
} }

11
data/widgets/select.json
View File

@@ -1,7 +1,8 @@
{ {
"widget" : "select", "widget": "select",
"size" : "small", "options": [
"fill" : "outline", "Выключен",
"options" : "["Zero item", "First item", "Second item"]", "Включен"
"status" : 2 ],
"status": 0
} }

2
include/Consts.h
View File

@@ -5,7 +5,7 @@
// //
#ifdef ESP8266 #ifdef ESP8266
#define FIRMWARE_NAME "esp8266-iotm" #define FIRMWARE_NAME "esp8266-iotm"
#define FIRMWARE_VERSION 260 #define FIRMWARE_VERSION 261
#endif #endif
#ifdef ESP32 #ifdef ESP32
#define FIRMWARE_NAME "esp32-iotm" #define FIRMWARE_NAME "esp32-iotm"

11
src/MqttClient.cpp
View File

@@ -117,8 +117,7 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
#endif #endif
} else if (topicStr.indexOf("control")) { } else if (topicStr.indexOf("control")) {
//iotTeam/12882830-1458415/light 1
String key = selectFromMarkerToMarker(topicStr, "/", 3); String key = selectFromMarkerToMarker(topicStr, "/", 3);
orderBuf += key; orderBuf += key;
@@ -135,14 +134,6 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
if (payloadStr == "1") { if (payloadStr == "1") {
myNotAsyncActions->make(do_UPGRADE); myNotAsyncActions->make(do_UPGRADE);
} }
} else if (topicStr.indexOf("devc")) {
writeFile(String(DEVICE_CONFIG_FILE), payloadStr);
Device_init();
} else if (topicStr.indexOf("devs")) {
writeFile(String(DEVICE_SCENARIO_FILE), payloadStr);
loadScenario();
} }
} }