diff --git a/.gitignore b/.gitignore
index d74a9041..b9f3806a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
.pio
.vscode
-/myProfile_wm.json
diff --git a/PrepareProject.py b/PrepareProject.py
index d29c8da4..46157d96 100644
--- a/PrepareProject.py
+++ b/PrepareProject.py
@@ -16,6 +16,7 @@
# поддерживаемые контроллеры (профили):
# esp8266_4mb
# esp32_4mb
+# esp32s2_4mb
# esp8266_1mb
# esp8266_1mb_ota
# esp8285_1mb
@@ -23,6 +24,7 @@
# esp8266_2mb
# esp8266_2mb_ota
+
import configparser
import os, json, sys, getopt
from pathlib import Path
diff --git a/data_svelte/build/bundle.css.gz b/data_svelte/build/bundle.css.gz
index ebccf588..e98b95d1 100644
Binary files a/data_svelte/build/bundle.css.gz and b/data_svelte/build/bundle.css.gz differ
diff --git a/data_svelte/build/bundle.js.gz b/data_svelte/build/bundle.js.gz
index db575529..2807c59c 100644
Binary files a/data_svelte/build/bundle.js.gz and b/data_svelte/build/bundle.js.gz differ
diff --git a/data_svelte/index.html b/data_svelte/index.html
index 9d22217b..cc7dd907 100644
--- a/data_svelte/index.html
+++ b/data_svelte/index.html
@@ -4,12 +4,12 @@
- IoT Manager 4.4.4
+ IoT Manager 4.5.0
-
+
-
+
diff --git a/data_svelte/items.json b/data_svelte/items.json
index f8cc2674..883318f0 100644
--- a/data_svelte/items.json
+++ b/data_svelte/items.json
@@ -819,14 +819,15 @@
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
- "widget": "",
- "page": "",
- "descr": "T",
- "int": 15,
+ "widget": "inputTxt",
+ "page": "Экраны",
+ "descr": "LCD Экран",
"addr": "0x27",
"size": "20,4",
"coord": "0,0",
- "id2show": "id датчика",
+ "id2show": "",
+ "prefix": "",
+ "postfix": "",
"num": 54
},
{
@@ -834,14 +835,15 @@
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
- "widget": "",
- "page": "",
- "descr": "T",
- "int": 15,
+ "widget": "inputTxt",
+ "page": "Экраны",
+ "descr": "LCD Экран",
"addr": "0x27",
"size": "16,2",
"coord": "0,0",
- "id2show": "id датчика",
+ "id2show": "",
+ "prefix": "",
+ "postfix": "",
"num": 55
}
]
\ No newline at end of file
diff --git a/data_svelte/myProfile.json b/data_svelte/myProfile.json
index 7432922b..5db9116e 100644
--- a/data_svelte/myProfile.json
+++ b/data_svelte/myProfile.json
@@ -3,7 +3,7 @@
"name": "IoTmanagerVer4",
"apssid": "IoTmanager",
"appass": "",
- "routerssid": "rise",
+ "routerssid": "iot",
"routerpass": "hostel3333",
"timezone": 2,
"ntp": "pool.ntp.org",
@@ -25,7 +25,7 @@
"projectProp": {
"platformio": {
"default_envs": "esp8266_4mb",
- "comments_default_envs": "choose from: esp8266_4mb or esp32_4mb or esp8266_1mb or esp8266_1mb_ota or esp8285_1mb or esp8285_1mb_ota"
+ "comments_default_envs": "choose from: esp8266_4mb or esp32_4mb or esp32s2_4mb or esp8266_1mb or esp8266_1mb_ota or esp8285_1mb or esp8285_1mb_ota"
}
},
"modules": {
@@ -34,6 +34,10 @@
"path": "src/modules/virtual/Cron",
"active": true
},
+ {
+ "path": "src/modules/virtual/GoogleSheet",
+ "active": false
+ },
{
"path": "src/modules/virtual/Loging",
"active": true
@@ -112,6 +116,10 @@
"path": "src/modules/sensors/DS2401",
"active": false
},
+ {
+ "path": "src/modules/sensors/Ds2423",
+ "active": false
+ },
{
"path": "src/modules/sensors/Emon",
"active": false
@@ -152,6 +160,10 @@
"path": "src/modules/sensors/IoTWiegand",
"active": false
},
+ {
+ "path": "src/modules/sensors/ld2410",
+ "active": false
+ },
{
"path": "src/modules/sensors/Max6675",
"active": false
@@ -160,6 +172,10 @@
"path": "src/modules/sensors/Mhz19",
"active": false
},
+ {
+ "path": "src/modules/sensors/Ntc",
+ "active": false
+ },
{
"path": "src/modules/sensors/Pzem004t",
"active": true
@@ -176,6 +192,10 @@
"path": "src/modules/sensors/S8",
"active": true
},
+ {
+ "path": "src/modules/sensors/Scd40",
+ "active": false
+ },
{
"path": "src/modules/sensors/Sds011",
"active": false
@@ -222,6 +242,10 @@
"path": "src/modules/exec/EspCam",
"active": false
},
+ {
+ "path": "src/modules/exec/Ftp",
+ "active": false
+ },
{
"path": "src/modules/exec/HttpGet",
"active": false
@@ -296,6 +320,10 @@
"path": "src/modules/display/NextionUpload",
"active": false
},
+ {
+ "path": "src/modules/display/Smi2_m",
+ "active": true
+ },
{
"path": "src/modules/display/Ws2812b",
"active": false
diff --git a/data_svelte/settings.json b/data_svelte/settings.json
index 793904a6..297019c9 100644
--- a/data_svelte/settings.json
+++ b/data_svelte/settings.json
@@ -2,7 +2,7 @@
"name": "IoTmanagerVer4",
"apssid": "IoTmanager",
"appass": "",
- "routerssid": "rise",
+ "routerssid": "iot",
"routerpass": "hostel3333",
"timezone": 2,
"ntp": "pool.ntp.org",
@@ -21,5 +21,6 @@
"pinSDA": 0,
"i2cFreq": 100000,
"wg": "group1",
+ "udps": 1,
"settings_": ""
}
\ No newline at end of file
diff --git a/data_svelte/widgets.json b/data_svelte/widgets.json
index adf8aae5..ba91a71f 100644
--- a/data_svelte/widgets.json
+++ b/data_svelte/widgets.json
@@ -245,6 +245,17 @@
"max": 100,
"debounce": 500
},
+ {
+ "name": "range",
+ "label": "Ползунок (Servo)",
+ "widget": "range",
+ "descrColor": "red",
+ "after": "%",
+ "k": 1,
+ "min": 0,
+ "max": 180,
+ "debounce": 500
+ },
{
"name": "select",
"label": "Выпадающий",
diff --git a/data_svelte_lite/index.html b/data_svelte_lite/index.html
index 538417e1..42845542 100644
--- a/data_svelte_lite/index.html
+++ b/data_svelte_lite/index.html
@@ -8,14 +8,14 @@