261

data/s.conf.csv

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

data/set.device.json

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

data/widgets/btn.json

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

data/widgets/select.json

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

include/Consts.h

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

src/MqttClient.cpp

@@ -117,8 +117,7 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
 #endif
 
     } else if (topicStr.indexOf("control")) {
-        //iotTeam/12882830-1458415/light 1
-
+      
         String key = selectFromMarkerToMarker(topicStr, "/", 3);
 
         orderBuf += key;
@@ -135,14 +134,6 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
         if (payloadStr == "1") {
             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();
     }
 }