Merge pull request #250 from IoTManagerProject/ver4dev

Ver4dev

PrepareProject.py

@@ -18,6 +18,8 @@
 # esp32_4mb
 # esp8266_1mb
 # esp8266_1mb_ota
+# esp8285_1mb
+# esp8285_1mb_ota
 
 import configparser
 import os, json, sys, getopt
@@ -117,7 +119,7 @@ deviceName = profJson['projectProp']['platformio']['default_envs']
 
 # назначаем папку с файлами прошивки в зависимости от устройства и запоминаем в профиле
 dataDir = 'data_svelte'
-if deviceName == 'esp8266_1mb_ota': 
+if deviceName == 'esp8266_1mb_ota' or deviceName == 'esp8285_1mb_ota': 
     dataDir = 'data_svelte_lite'
 profJson['projectProp'] = {
     'platformio': {

data_svelte_lite/items.json

@@ -7,7 +7,23 @@
         "header": "Виртуальные элементы"
     },
     {
-        "name": "1. Таймер",
+        "global": 0,
+        "name": "1. Будильник (Cron)",
+        "type": "Writing",
+        "subtype": "Cron",
+        "id": "cron",
+        "widget": "anydataDef",
+        "page": "Таймеры",
+        "descr": "Будильник",
+        "int": 1,
+        "val": "*/15 * * * * *",
+        "formatNextAlarm": "%H:%M:%S",
+        "needSave": 0,
+        "num": 1
+    },
+    {
+        "global": 0,
+        "name": "2. Таймер",
         "type": "Writing",
         "subtype": "Timer",
         "id": "timer",
@@ -19,73 +35,106 @@
         "ticker": 1,
         "repeat": 1,
         "needSave": 0,
-        "num": 1
+        "num": 2
     },
     {
-        "name": "2. Окно ввода числа (переменная)",
+        "global": 0,
+        "name": "3. Окно ввода числа (переменная)",
         "type": "Reading",
         "subtype": "Variable",
         "id": "value",
+        "needSave": 0,
         "widget": "inputDgt",
         "page": "Ввод",
         "descr": "Введите число",
         "int": "0",
         "val": "0.0",
-        "num": 2
+        "map": "1024,1024,1,100",
+        "plus": 0,
+        "multiply": 1,
+        "round": 0,
+        "num": 3
     },
     {
-        "name": "3. Окно ввода времени",
+        "global": 0,
+        "name": "4. Окно ввода времени",
         "type": "Reading",
         "subtype": "Variable",
         "id": "time",
+        "needSave": 0,
         "widget": "inputTm",
         "page": "Ввод",
         "descr": "Введите время",
         "int": "0",
         "val": "02:00",
-        "num": 3
+        "num": 4
     },
     {
-        "name": "4. Окно ввода даты",
+        "global": 0,
+        "name": "5. Окно ввода даты",
         "type": "Reading",
         "subtype": "Variable",
         "id": "time",
+        "needSave": 0,
         "widget": "inputDate",
         "page": "Ввод",
         "descr": "Введите дату",
         "int": "0",
         "val": "24.05.2022",
-        "num": 4
+        "num": 5
     },
     {
-        "name": "5. Окно ввода текста",
+        "global": 0,
+        "name": "6. Окно ввода текста",
         "type": "Reading",
         "subtype": "Variable",
         "id": "txt",
+        "needSave": 0,
         "widget": "inputTxt",
         "page": "Ввод",
         "descr": "Введите текст",
         "int": "0",
         "val": "текст",
-        "num": 5
+        "num": 6
     },
     {
-        "name": "6. Виртуальная кнопка",
+        "global": 0,
+        "name": "7. Вывод значения",
+        "type": "Reading",
+        "subtype": "Variable",
+        "id": "vout",
+        "needSave": 0,
+        "widget": "anydataDef",
+        "page": "Вывод",
+        "descr": "Значение",
+        "int": "0",
+        "val": "0.0",
+        "map": "1024,1024,1,100",
+        "plus": 0,
+        "multiply": 1,
+        "round": 0,
+        "num": 7
+    },
+    {
+        "global": 0,
+        "name": "8. Виртуальная кнопка",
         "type": "Reading",
         "subtype": "VButton",
         "id": "vbtn",
+        "needSave": 0,
         "widget": "toggle",
         "page": "Кнопки",
         "descr": "Кнопка",
         "int": "0",
         "val": "0",
-        "num": 6
+        "num": 8
     },
     {
         "header": "Сенсоры"
     },
     {
-        "name": "7. DS18B20 Температура",
+        "global": 0,
+        "name": "9. DS18B20 Температура",
         "type": "Reading",
         "subtype": "Ds18b20",
         "id": "dstmp",
@@ -97,21 +146,12 @@
         "index": 0,
         "addr": "",
         "round": 1,
-        "num": 7
+        "num": 9
     },
     {
-        "name": "8. Сканер кнопок 433 MHz",
+        "global": 0,
-        "num": 8,
+        "name": "10. HC-SR04 Ультразвуковой дальномер",
-        "type": "Reading",
+        "num": 10,
-        "subtype": "RCswitch",
-        "id": "rsw",
-        "int": 500,
-        "pinRx": 12,
-        "pinTx": 12
-    },
-    {
-        "name": "9. HC-SR04 Ультразвуковой дальномер",
-        "num": 9,
         "type": "Reading",
         "subtype": "Sonar",
         "id": "sonar",
@@ -126,25 +166,29 @@
         "header": "Исполнительные устройства"
     },
     {
-        "name": "10. Кнопка подключенная к пину",
+        "global": 0,
+        "name": "11. Кнопка подключенная к пину",
         "type": "Writing",
         "subtype": "ButtonIn",
         "id": "btn",
         "widget": "toggle",
         "page": "Кнопки",
         "descr": "Освещение",
+        "needSave": 0,
         "int": 0,
         "pin": 16,
         "execLevel": "1",
         "pinMode": "INPUT",
         "debounceDelay": 50,
         "fixState": 0,
-        "num": 10
+        "num": 11
     },
     {
-        "name": "11. Управление пином",
+        "global": 0,
+        "name": "12. Управление пином",
         "type": "Writing",
         "subtype": "ButtonOut",
+        "needSave": 0,
         "id": "btn",
         "widget": "toggle",
         "page": "Кнопки",
@@ -152,10 +196,11 @@
         "int": 0,
         "inv": 0,
         "pin": 2,
-        "num": 11
+        "num": 12
     },
     {
-        "name": "12. Расширитель портов Mcp23017",
+        "global": 0,
+        "name": "13. Расширитель портов Mcp23017",
         "type": "Reading",
         "subtype": "Mcp23017",
         "id": "Mcp",
@@ -165,10 +210,29 @@
         "int": "0",
         "addr": "0x20",
         "index": 1,
-        "num": 12
+        "num": 13
     },
     {
-        "name": "13. Расширитель портов Pcf8574",
+        "global": 0,
+        "name": "14. Сенсорная кнопка",
+        "type": "Writing",
+        "subtype": "Multitouch",
+        "id": "impulse",
+        "widget": "anydataDef",
+        "page": "Кнопки",
+        "descr": "Количество нажаний",
+        "needSave": 0,
+        "int": 300,
+        "inv": 1,
+        "pin": 16,
+        "pinMode": "INPUT",
+        "debounceDelay": 50,
+        "PWMDelay": 500,
+        "num": 14
+    },
+    {
+        "global": 0,
+        "name": "15. Расширитель портов Pcf8574",
         "type": "Reading",
         "subtype": "Pcf8574",
         "id": "Pcf",
@@ -178,10 +242,11 @@
         "int": "0",
         "addr": "0x20",
         "index": 1,
-        "num": 13
+        "num": 15
     },
     {
-        "name": "14. PWM ESP8266",
+        "global": 0,
+        "name": "16. PWM ESP8266",
         "type": "Writing",
         "subtype": "Pwm8266",
         "id": "pwm",
@@ -193,10 +258,11 @@
         "freq": 5000,
         "val": 0,
         "apin": -1,
-        "num": 14
+        "num": 16
     },
     {
-        "name": "15. Телеграм-Лайт",
+        "global": 0,
+        "name": "17. Телеграм-Лайт",
         "type": "Writing",
         "subtype": "TelegramLT",
         "id": "tg",
@@ -205,13 +271,14 @@
         "descr": "",
         "token": "",
         "chatID": "",
-        "num": 15
+        "num": 17
     },
     {
         "header": "Экраны"
     },
     {
-        "name": "16. LCD экран 2004",
+        "global": 0,
+        "name": "18. LCD экран 2004",
         "type": "Reading",
         "subtype": "Lcd2004",
         "id": "Lcd",
@@ -223,10 +290,10 @@
         "size": "20,4",
         "coord": "0,0",
         "id2show": "id датчика",
-        "num": 16
+        "num": 18
     },
     {
-        "name": "17. LCD экран 1602",
+        "name": "19. LCD экран 1602",
         "type": "Reading",
         "subtype": "Lcd2004",
         "id": "Lcd",
@@ -238,6 +305,6 @@
         "size": "16,2",
         "coord": "0,0",
         "id2show": "id датчика",
-        "num": 17
+        "num": 19
     }
 ]

data_svelte_lite/settings.json

@@ -8,7 +8,7 @@
     "ntp": "pool.ntp.org",
     "weblogin": "admin",
     "webpass": "admin",
-    "mqttServer": "m2.wqtt.ru",
+    "mqttServer": "",
     "mqttPort": 8021,
     "mqttPrefix": "/risenew",
     "mqttUser": "rise",

myProfile.json

@@ -24,7 +24,8 @@
     },
     "projectProp": {
         "platformio": {
-            "default_envs": "esp8266_4mb"
+            "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"
         }
     },
     "modules": {

platformio.ini

@@ -1,3 +1,12 @@
+[platformio]
+default_envs = esp8266_4mb
+data_dir = data_svelte
+
+[common_env_data]
+lib_deps_external = 
+	bblanchon/ArduinoJson @6.18.0
+	knolleary/PubSubClient
+
 [env:esp8266_1mb_ota]
 lib_deps = 
 	${common_env_data.lib_deps_external}
@@ -40,6 +49,48 @@ build_src_filter =
 	+<modules/*.cpp>
 	${env:esp8266_1mb_fromitems.build_src_filter}
 
+[env:esp8285_1mb_ota]
+lib_deps = 
+	${common_env_data.lib_deps_external}
+	${env:esp8285_1mb_ota_fromitems.lib_deps}
+	ESPAsyncUDP
+build_flags = -Desp8266_1mb_ota="esp8266_1mb_ota"
+framework = arduino
+board = esp8285
+board_build.ldscript = eagle.flash.1m64.ld
+platform = espressif8266 @4.0.1
+monitor_filters = esp8266_exception_decoder
+upload_speed = 921600
+monitor_speed = 115200
+board_build.filesystem = littlefs
+build_src_filter = 
+	+<*.cpp>
+	+<classes/*.cpp>
+	+<utils/*.cpp>
+	+<modules/*.cpp>
+	${env:esp8285_1mb_ota_fromitems.build_src_filter}
+
+[env:esp8285_1mb]
+lib_deps = 
+	${common_env_data.lib_deps_external}
+	${env:esp8285_1mb_fromitems.lib_deps}
+	ESPAsyncUDP
+build_flags = -Desp8266_1mb="esp8266_1mb"
+framework = arduino
+board = esp8285
+board_build.ldscript = eagle.flash.1m256.ld
+platform = espressif8266 @4.0.1
+monitor_filters = esp8266_exception_decoder
+upload_speed = 921600
+monitor_speed = 115200
+board_build.filesystem = littlefs
+build_src_filter = 
+	+<*.cpp>
+	+<classes/*.cpp>
+	+<utils/*.cpp>
+	+<modules/*.cpp>
+	${env:esp8285_1mb_fromitems.build_src_filter}
+
 [env:esp8266_4mb]
 lib_deps = 
 	${common_env_data.lib_deps_external}
@@ -82,33 +133,24 @@ build_src_filter =
 	+<modules/*.cpp>
 	${env:esp32_4mb_fromitems.build_src_filter}
 
-[platformio]
-default_envs = esp8266_4mb
-data_dir = data_svelte
-
-[common_env_data]
-lib_deps_external = 
-	bblanchon/ArduinoJson @6.18.0
-	knolleary/PubSubClient
-
 [env:esp8266_1mb_ota_fromitems]
 lib_deps = 
 	milesburton/DallasTemperature@^3.9.1
-	rc-switch @ ^2.6.4
 	adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
 	adafruit/Adafruit BusIO @ ^1.13.2
 	adafruit/Adafruit BusIO @ ^1.13.2
 	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 build_src_filter = 
+	+<modules/virtual/Cron>
 	+<modules/virtual/Timer>
 	+<modules/virtual/Variable>
 	+<modules/virtual/VButton>
 	+<modules/sensors/Ds18b20>
-	+<modules/sensors/RCswitch>
 	+<modules/sensors/Sonar>
 	+<modules/exec/ButtonIn>
 	+<modules/exec/ButtonOut>
 	+<modules/exec/Mcp23017>
+	+<modules/exec/Multitouch>
 	+<modules/exec/Pcf8574>
 	+<modules/exec/Pwm8266>
 	+<modules/exec/TelegramLT>
@@ -117,21 +159,67 @@ build_src_filter =
 [env:esp8266_1mb_fromitems]
 lib_deps = 
 	milesburton/DallasTemperature@^3.9.1
-	rc-switch @ ^2.6.4
 	adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
 	adafruit/Adafruit BusIO @ ^1.13.2
 	adafruit/Adafruit BusIO @ ^1.13.2
 	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 build_src_filter = 
+	+<modules/virtual/Cron>
 	+<modules/virtual/Timer>
 	+<modules/virtual/Variable>
 	+<modules/virtual/VButton>
 	+<modules/sensors/Ds18b20>
-	+<modules/sensors/RCswitch>
 	+<modules/sensors/Sonar>
 	+<modules/exec/ButtonIn>
 	+<modules/exec/ButtonOut>
 	+<modules/exec/Mcp23017>
+	+<modules/exec/Multitouch>
+	+<modules/exec/Pcf8574>
+	+<modules/exec/Pwm8266>
+	+<modules/exec/TelegramLT>
+	+<modules/display/Lcd2004>
+
+[env:esp8285_1mb_ota_fromitems]
+lib_deps = 
+	milesburton/DallasTemperature@^3.9.1
+	adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
+	adafruit/Adafruit BusIO @ ^1.13.2
+	adafruit/Adafruit BusIO @ ^1.13.2
+	marcoschwartz/LiquidCrystal_I2C@^1.1.4
+build_src_filter = 
+	+<modules/virtual/Cron>
+	+<modules/virtual/Timer>
+	+<modules/virtual/Variable>
+	+<modules/virtual/VButton>
+	+<modules/sensors/Ds18b20>
+	+<modules/sensors/Sonar>
+	+<modules/exec/ButtonIn>
+	+<modules/exec/ButtonOut>
+	+<modules/exec/Mcp23017>
+	+<modules/exec/Multitouch>
+	+<modules/exec/Pcf8574>
+	+<modules/exec/Pwm8266>
+	+<modules/exec/TelegramLT>
+	+<modules/display/Lcd2004>
+
+[env:esp8285_1mb_fromitems]
+lib_deps = 
+	milesburton/DallasTemperature@^3.9.1
+	adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
+	adafruit/Adafruit BusIO @ ^1.13.2
+	adafruit/Adafruit BusIO @ ^1.13.2
+	marcoschwartz/LiquidCrystal_I2C@^1.1.4
+build_src_filter = 
+	+<modules/virtual/Cron>
+	+<modules/virtual/Timer>
+	+<modules/virtual/Variable>
+	+<modules/virtual/VButton>
+	+<modules/sensors/Ds18b20>
+	+<modules/sensors/Sonar>
+	+<modules/exec/ButtonIn>
+	+<modules/exec/ButtonOut>
+	+<modules/exec/Mcp23017>
+	+<modules/exec/Multitouch>
 	+<modules/exec/Pcf8574>
 	+<modules/exec/Pwm8266>
 	+<modules/exec/TelegramLT>

src/modules/display/Lcd2004/modinfo.json

@@ -115,6 +115,12 @@
         ],
         "esp8266_1mb_ota": [
             "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
+        ],
+        "esp8285_1mb": [
+            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
+        ],
+        "esp8285_1mb_ota": [
+            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
         ]
     }
 }

src/modules/exec/ButtonIn/modinfo.json

@@ -46,6 +46,8 @@
         "esp32_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
-        "esp8266_1mb_ota": []
+        "esp8266_1mb_ota": [],
+        "esp8285_1mb": [],
+        "esp8285_1mb_ota": []
     }
 }

src/modules/exec/ButtonOut/modinfo.json

@@ -47,6 +47,8 @@
         "esp32_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
-        "esp8266_1mb_ota": []
+        "esp8266_1mb_ota": [],
+        "esp8285_1mb": [],
+        "esp8285_1mb_ota": []
     }
 }

src/modules/exec/Mcp23017/modinfo.json

@@ -54,6 +54,14 @@
         "esp8266_1mb_ota": [
             "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
             "adafruit/Adafruit BusIO @ ^1.13.2"
+        ],
+        "esp8285_1mb": [
+            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
+            "adafruit/Adafruit BusIO @ ^1.13.2"
+        ],
+        "esp8285_1mb_ota": [
+            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
+            "adafruit/Adafruit BusIO @ ^1.13.2"
         ]
     }
 }

src/modules/exec/Multitouch/modinfo.json

@@ -46,6 +46,8 @@
     "esp32_4mb": [],
     "esp8266_4mb": [],
     "esp8266_1mb": [],
-    "esp8266_1mb_ota": []
+    "esp8266_1mb_ota": [],
+    "esp8285_1mb": [],
+    "esp8285_1mb_ota": []
   }
 }

src/modules/exec/Pcf8574/modinfo.json

@@ -44,6 +44,12 @@
         ],
         "esp8266_1mb_ota": [
             "adafruit/Adafruit BusIO @ ^1.13.2"
+        ],
+        "esp8285_1mb": [
+            "adafruit/Adafruit BusIO @ ^1.13.2"
+        ],
+        "esp8285_1mb_ota": [
+            "adafruit/Adafruit BusIO @ ^1.13.2"
         ]
     }
 }

src/modules/exec/Pwm8266/modinfo.json

@@ -44,6 +44,8 @@
     "usedLibs": {
         "esp8266_4mb": [],
         "esp8266_1mb": [],
-        "esp8266_1mb_ota": []
+        "esp8266_1mb_ota": [],
+        "esp8285_1mb": [],
+        "esp8285_1mb_ota": []
     }
 }

src/modules/exec/TelegramLT/modinfo.json

@@ -58,6 +58,8 @@
     "esp32_4mb": [],
     "esp8266_4mb": [],
     "esp8266_1mb": [],
-    "esp8266_1mb_ota": []
+    "esp8266_1mb_ota": [],
+    "esp8285_1mb": [],
+    "esp8285_1mb_ota": []
   }
 }

src/modules/sensors/Ds18b20/modinfo.json

@@ -50,6 +50,12 @@
         ],
         "esp8266_1mb_ota": [
             "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8285_1mb": [
+            "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8285_1mb_ota": [
+            "milesburton/DallasTemperature@^3.9.1"
         ]
     }
 }

src/modules/sensors/RCswitch/modinfo.json

@@ -62,13 +62,19 @@
         "esp32_4mb": [
             "rc-switch @ ^2.6.4"
         ],
+        "esp8266_4mb": [
+            "rc-switch @ ^2.6.4"
+        ],
         "esp8266_1mb": [
             "rc-switch @ ^2.6.4"
         ],
         "esp8266_1mb_ota": [
             "rc-switch @ ^2.6.4"
         ],
-        "esp8266_4mb": [
+        "esp8285_1mb": [
+            "rc-switch @ ^2.6.4"
+        ],
+        "esp8285_1mb_ota": [
             "rc-switch @ ^2.6.4"
         ]
     }

src/modules/sensors/Sgp30/modinfo.json

@@ -59,6 +59,12 @@
         ],
         "esp8266_1mb_ota": [
             "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
+        ],
+        "esp8285_1mb": [
+            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
+        ],
+        "esp8285_1mb_ota": [
+            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
         ]
     }
 }

src/modules/sensors/Sonar/modinfo.json

@@ -40,6 +40,8 @@
         "esp32_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
-        "esp8266_1mb_ota": []
+        "esp8266_1mb_ota": [],
+        "esp8285_1mb": [],
+        "esp8285_1mb_ota": []
     }
 }

src/modules/virtual/Cron/modinfo.json

@@ -52,6 +52,8 @@
         "esp32_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
-        "esp8266_1mb_ota": []
+        "esp8266_1mb_ota": [],
+        "esp8285_1mb": [],
+        "esp8285_1mb_ota": []
     }
 }

src/modules/virtual/Timer/modinfo.json

@@ -72,6 +72,8 @@
         "esp32_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
-        "esp8266_1mb_ota": []
+        "esp8266_1mb_ota": [],
+        "esp8285_1mb": [],
+        "esp8285_1mb_ota": []
     }
 }

src/modules/virtual/VButton/modinfo.json

@@ -38,6 +38,8 @@
         "esp32_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
-        "esp8266_1mb_ota": []
+        "esp8266_1mb_ota": [],
+        "esp8285_1mb": [],
+        "esp8285_1mb_ota": []
     }
 }

src/modules/virtual/Variable/modinfo.json

@@ -98,6 +98,8 @@
         "esp32_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
-        "esp8266_1mb_ota": []
+        "esp8266_1mb_ota": [],
+        "esp8285_1mb": [],
+        "esp8285_1mb_ota": []
     }
 }