From 799aff338347ea89021f7f391d6790fa880385cc Mon Sep 17 00:00:00 2001 From: biver Date: Thu, 11 Aug 2022 17:40:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D1=80=D0=B8=D1=80=D1=83=D0=B5=D0=BC=20=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=D0=BB=D0=B8=20=D0=BA=D0=B0=D0=BA=20=D0=BD=D0=B0=D0=B4=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_svelte/items.json | 326 +++++++++--------- myProfile.json | 128 +++---- platformio.ini | 52 +-- .../{exec => 1.virtual}/Timer/Timer.cpp | 0 .../{exec => 1.virtual}/Timer/modinfo.json | 2 +- .../Variable/Variable.cpp | 0 .../Variable/modinfo.json | 2 +- .../Ads1115/Ads1115.cpp | 0 .../Ads1115/modinfo.json | 0 .../{sensors => 2.sensors}/Aht20/Aht20.cpp | 0 .../{sensors => 2.sensors}/Aht20/modinfo.json | 0 .../AnalogAdc/AnalogAdc.cpp | 0 .../AnalogAdc/modinfo.json | 0 .../{sensors => 2.sensors}/Bme280/Bme280.cpp | 0 .../Bme280/modinfo.json | 0 .../{sensors => 2.sensors}/Bmp280/Bmp280.cpp | 0 .../Bmp280/modinfo.json | 0 .../Dht1122/Dht1122.cpp | 0 .../Dht1122/modinfo.json | 0 .../Ds18b20/Ds18b20.cpp | 0 .../Ds18b20/modinfo.json | 0 .../{sensors => 2.sensors}/Emon/Emon.cpp | 0 .../{sensors => 2.sensors}/Emon/modinfo.json | 0 .../{sensors => 2.sensors}/GY21/GY21.cpp | 0 .../{sensors => 2.sensors}/GY21/modinfo.json | 0 .../Hdc1080/Hdc1080.cpp | 0 .../Hdc1080/modinfo.json | 0 .../IoTWiegand/IoTWiegand.cpp | 0 .../IoTWiegand/modinfo.json | 0 .../Max6675/Max6675.cpp | 0 .../Max6675/modinfo.json | 0 .../{sensors => 2.sensors}/Mhz19/Mhz19.cpp | 0 .../{sensors => 2.sensors}/Mhz19/modinfo.json | 0 .../RCswitch/RCswitch.cpp | 0 .../RCswitch/modinfo.json | 0 .../{sensors => 2.sensors}/Sds011/Sds011.cpp | 0 .../Sds011/modinfo.json | 0 .../{sensors => 2.sensors}/Sht20/Sht20.cpp | 0 .../{sensors => 2.sensors}/Sht20/modinfo.json | 0 .../{sensors => 2.sensors}/Sht30/Sht30.cpp | 0 .../{sensors => 2.sensors}/Sht30/modinfo.json | 0 .../{sensors => 2.sensors}/Sonar/Sonar.cpp | 0 .../{sensors => 2.sensors}/Sonar/modinfo.json | 0 .../{exec => 3.exec}/ButtonIn/ButtonIn.cpp | 0 .../{exec => 3.exec}/ButtonIn/modinfo.json | 2 +- .../{exec => 3.exec}/ButtonOut/ButtonOut.cpp | 0 .../{exec => 3.exec}/ButtonOut/modinfo.json | 2 +- .../{exec => 3.exec}/EspCam/EspCam.cpp | 0 .../{exec => 3.exec}/EspCam/modinfo.json | 2 +- .../IarduinoRTC/IarduinoRTC.cpp | 0 .../IarduinoRTC/modinfo.json | 2 +- .../{exec => 3.exec}/IoTServo/IoTServo.cpp | 0 .../{exec => 3.exec}/IoTServo/modinfo.json | 2 +- .../{system => 3.exec}/Mcp23017/Mcp23017.cpp | 0 .../{system => 3.exec}/Mcp23017/modinfo.json | 2 +- src/modules/{exec => 3.exec}/Mp3/Mp3.cpp | 0 src/modules/{exec => 3.exec}/Mp3/modinfo.json | 2 +- src/modules/{exec => 3.exec}/Pwm32/Pwm32.cpp | 0 .../{exec => 3.exec}/Pwm32/modinfo.json | 2 +- .../{exec => 3.exec}/Pwm8266/Pwm8266.cpp | 0 .../{exec => 3.exec}/Pwm8266/modinfo.json | 2 +- .../{exec => 3.exec}/SDcard/SDcard.cpp | 0 .../{exec => 3.exec}/SDcard/modinfo.json | 2 +- .../{system => 3.exec}/SysExt/SysExt.cpp | 0 .../{system => 3.exec}/SysExt/modinfo.json | 2 +- .../{exec => 3.exec}/Telegram/Telegram.cpp | 0 .../{exec => 3.exec}/Telegram/modinfo.json | 2 +- .../Lcd2004/Lcd2004.cpp | 0 .../Lcd2004/modinfo.json | 0 src/modules/API.cpp | 28 +- 70 files changed, 281 insertions(+), 281 deletions(-) rename src/modules/{exec => 1.virtual}/Timer/Timer.cpp (100%) rename src/modules/{exec => 1.virtual}/Timer/modinfo.json (96%) rename src/modules/{system => 1.virtual}/Variable/Variable.cpp (100%) rename src/modules/{system => 1.virtual}/Variable/modinfo.json (94%) rename src/modules/{sensors => 2.sensors}/Ads1115/Ads1115.cpp (100%) rename src/modules/{sensors => 2.sensors}/Ads1115/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Aht20/Aht20.cpp (100%) rename src/modules/{sensors => 2.sensors}/Aht20/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/AnalogAdc/AnalogAdc.cpp (100%) rename src/modules/{sensors => 2.sensors}/AnalogAdc/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Bme280/Bme280.cpp (100%) rename src/modules/{sensors => 2.sensors}/Bme280/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Bmp280/Bmp280.cpp (100%) rename src/modules/{sensors => 2.sensors}/Bmp280/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Dht1122/Dht1122.cpp (100%) rename src/modules/{sensors => 2.sensors}/Dht1122/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Ds18b20/Ds18b20.cpp (100%) rename src/modules/{sensors => 2.sensors}/Ds18b20/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Emon/Emon.cpp (100%) rename src/modules/{sensors => 2.sensors}/Emon/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/GY21/GY21.cpp (100%) rename src/modules/{sensors => 2.sensors}/GY21/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Hdc1080/Hdc1080.cpp (100%) rename src/modules/{sensors => 2.sensors}/Hdc1080/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/IoTWiegand/IoTWiegand.cpp (100%) rename src/modules/{sensors => 2.sensors}/IoTWiegand/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Max6675/Max6675.cpp (100%) rename src/modules/{sensors => 2.sensors}/Max6675/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Mhz19/Mhz19.cpp (100%) rename src/modules/{sensors => 2.sensors}/Mhz19/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/RCswitch/RCswitch.cpp (100%) rename src/modules/{sensors => 2.sensors}/RCswitch/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Sds011/Sds011.cpp (100%) rename src/modules/{sensors => 2.sensors}/Sds011/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Sht20/Sht20.cpp (100%) rename src/modules/{sensors => 2.sensors}/Sht20/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Sht30/Sht30.cpp (100%) rename src/modules/{sensors => 2.sensors}/Sht30/modinfo.json (100%) rename src/modules/{sensors => 2.sensors}/Sonar/Sonar.cpp (100%) rename src/modules/{sensors => 2.sensors}/Sonar/modinfo.json (100%) rename src/modules/{exec => 3.exec}/ButtonIn/ButtonIn.cpp (100%) rename src/modules/{exec => 3.exec}/ButtonIn/modinfo.json (96%) rename src/modules/{exec => 3.exec}/ButtonOut/ButtonOut.cpp (100%) rename src/modules/{exec => 3.exec}/ButtonOut/modinfo.json (93%) rename src/modules/{exec => 3.exec}/EspCam/EspCam.cpp (100%) rename src/modules/{exec => 3.exec}/EspCam/modinfo.json (96%) rename src/modules/{system => 3.exec}/IarduinoRTC/IarduinoRTC.cpp (100%) rename src/modules/{system => 3.exec}/IarduinoRTC/modinfo.json (96%) rename src/modules/{exec => 3.exec}/IoTServo/IoTServo.cpp (100%) rename src/modules/{exec => 3.exec}/IoTServo/modinfo.json (95%) rename src/modules/{system => 3.exec}/Mcp23017/Mcp23017.cpp (100%) rename src/modules/{system => 3.exec}/Mcp23017/modinfo.json (95%) rename src/modules/{exec => 3.exec}/Mp3/Mp3.cpp (100%) rename src/modules/{exec => 3.exec}/Mp3/modinfo.json (94%) rename src/modules/{exec => 3.exec}/Pwm32/Pwm32.cpp (100%) rename src/modules/{exec => 3.exec}/Pwm32/modinfo.json (95%) rename src/modules/{exec => 3.exec}/Pwm8266/Pwm8266.cpp (100%) rename src/modules/{exec => 3.exec}/Pwm8266/modinfo.json (94%) rename src/modules/{exec => 3.exec}/SDcard/SDcard.cpp (100%) rename src/modules/{exec => 3.exec}/SDcard/modinfo.json (93%) rename src/modules/{system => 3.exec}/SysExt/SysExt.cpp (100%) rename src/modules/{system => 3.exec}/SysExt/modinfo.json (92%) rename src/modules/{exec => 3.exec}/Telegram/Telegram.cpp (100%) rename src/modules/{exec => 3.exec}/Telegram/modinfo.json (95%) rename src/modules/{display => 4.display}/Lcd2004/Lcd2004.cpp (100%) rename src/modules/{display => 4.display}/Lcd2004/modinfo.json (100%) diff --git a/data_svelte/items.json b/data_svelte/items.json index ebc91b24..7e6b528a 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -4,114 +4,10 @@ "num": 0 }, { - "header": "Экраны" + "header": "Виртуальные элементы" }, { - "name": "1. LCD экран 2004", - "type": "Reading", - "subtype": "Lcd2004", - "id": "Lcd", - "widget": "", - "page": "", - "descr": "T", - "int": 15, - "addr": "0x27", - "size": "20,4", - "coord": "0,0", - "id2show": "id датчика", - "num": 1 - }, - { - "name": "2. LCD экран 1602", - "type": "Reading", - "subtype": "Lcd2004", - "id": "Lcd", - "widget": "", - "page": "", - "descr": "T", - "int": 15, - "addr": "0x27", - "size": "16,2", - "coord": "0,0", - "id2show": "id датчика", - "num": 2 - }, - { - "header": "Модули управления" - }, - { - "name": "3. Кнопка (подключенная физически)", - "type": "Writing", - "subtype": "ButtonIn", - "id": "btn", - "widget": "toggle", - "page": "Кнопки", - "descr": "", - "int": 0, - "pin": 16, - "execLevel": "1", - "pinMode": "INPUT", - "debounceDelay": 50, - "fixState": 1, - "num": 3 - }, - { - "name": "4. Кнопка управляющая пином (Реле с кнопкой)", - "type": "Writing", - "subtype": "ButtonOut", - "id": "btn", - "widget": "toggle", - "page": "Кнопки", - "descr": "", - "int": 0, - "inv": 0, - "pin": 2, - "num": 4 - }, - { - "name": "5. Сервопривод", - "type": "Writing", - "subtype": "IoTServo", - "id": "servo", - "widget": "range", - "page": "servo", - "descr": "угол", - "int": 1, - "pin": 12, - "apin": -1, - "amap": "0, 4096, 0, 180", - "num": 5 - }, - { - "name": "6. MP3 плеер", - "type": "Reading", - "subtype": "Mp3", - "id": "mp3", - "widget": "", - "page": "", - "descr": "", - "int": 1, - "pins": "14,12", - "volume": 20, - "num": 6 - }, - { - "name": "7. PWM ESP8266", - "type": "Writing", - "subtype": "Pwm8266", - "id": "pwm", - "widget": "range", - "page": "Кнопки", - "descr": "PWM", - "int": 0, - "pin": 15, - "freq": 5000, - "val": 0, - "apin": -1, - "num": 7 - }, - { - "name": "8. Таймер", + "name": "1. Таймер", "type": "Writing", "subtype": "Timer", "id": "timer", @@ -123,13 +19,25 @@ "ticker": 0, "repeat": 0, "needSave": 0, - "num": 8 + "num": 1 + }, + { + "name": "2. Переменная", + "type": "Reading", + "subtype": "Variable", + "id": "var", + "widget": "", + "page": "", + "descr": "", + "int": "0", + "val": "0", + "num": 2 }, { "header": "Сенсоры" }, { - "name": "9. Cенсор температуры AHT20", + "name": "3. Cенсор температуры AHT20", "type": "Reading", "subtype": "Aht20t", "id": "Temp20", @@ -139,10 +47,10 @@ "int": 15, "addr": "0x38", "round": 1, - "num": 9 + "num": 3 }, { - "name": "10. Cенсор влажности AHT20", + "name": "4. Cенсор влажности AHT20", "type": "Reading", "subtype": "Aht20h", "id": "Hum20", @@ -152,10 +60,10 @@ "int": 15, "addr": "0x38", "round": 1, - "num": 10 + "num": 4 }, { - "name": "11. Аналоговый сенсор", + "name": "5. Аналоговый сенсор", "type": "Reading", "subtype": "AnalogAdc", "id": "t", @@ -169,10 +77,10 @@ "pin": 0, "int": 15, "avgSteps": 1, - "num": 11 + "num": 5 }, { - "name": "12. Cенсор температуры Bme280", + "name": "6. Cенсор температуры Bme280", "type": "Reading", "subtype": "Bme280t", "id": "tmp3", @@ -182,10 +90,10 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 12 + "num": 6 }, { - "name": "13. Cенсор давления Bme280", + "name": "7. Cенсор давления Bme280", "type": "Reading", "subtype": "Bme280p", "id": "Press3", @@ -195,10 +103,10 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 13 + "num": 7 }, { - "name": "14. Cенсор влажности Bme280", + "name": "8. Cенсор влажности Bme280", "type": "Reading", "subtype": "Bme280h", "id": "Hum3", @@ -208,10 +116,10 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 14 + "num": 8 }, { - "name": "15. Cенсор температуры Bmp280", + "name": "9. Cенсор температуры Bmp280", "type": "Reading", "subtype": "Bmp280t", "id": "tmp3", @@ -221,10 +129,10 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 15 + "num": 9 }, { - "name": "16. Cенсор давления Bmp280", + "name": "10. Cенсор давления Bmp280", "type": "Reading", "subtype": "Bmp280p", "id": "Press3", @@ -234,10 +142,10 @@ "int": 15, "addr": "0x77", "round": 1, - "num": 16 + "num": 10 }, { - "name": "17. Cенсор температуры dht11", + "name": "11. Cенсор температуры dht11", "type": "Reading", "subtype": "Dht1122t", "id": "tmp3", @@ -247,10 +155,10 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 17 + "num": 11 }, { - "name": "18. Cенсор влажности dht11", + "name": "12. Cенсор влажности dht11", "type": "Reading", "subtype": "Dht1122h", "id": "Hum3", @@ -260,10 +168,10 @@ "int": 15, "pin": 0, "senstype": "dht11", - "num": 18 + "num": 12 }, { - "name": "19. Cенсор температуры ds18b20", + "name": "13. Cенсор температуры ds18b20", "type": "Reading", "subtype": "Ds18b20", "id": "dstmp", @@ -275,10 +183,10 @@ "index": 0, "addr": "", "round": 1, - "num": 19 + "num": 13 }, { - "name": "20. Cенсор температуры GY21", + "name": "14. Cенсор температуры GY21", "type": "Reading", "subtype": "GY21t", "id": "tmp4", @@ -287,10 +195,10 @@ "descr": "Температура", "round": 1, "int": 15, - "num": 20 + "num": 14 }, { - "name": "21. Cенсор влажности GY21", + "name": "15. Cенсор влажности GY21", "type": "Reading", "subtype": "GY21h", "id": "Hum4", @@ -299,10 +207,10 @@ "descr": "Влажность", "round": 1, "int": 15, - "num": 21 + "num": 15 }, { - "name": "22. Cенсор температуры HDC1080", + "name": "16. Cенсор температуры HDC1080", "type": "Reading", "subtype": "Hdc1080t", "id": "Temp1080", @@ -312,10 +220,10 @@ "int": 15, "addr": "0x40", "round": 1, - "num": 22 + "num": 16 }, { - "name": "23. Cенсор влажности HDC1080", + "name": "17. Cенсор влажности HDC1080", "type": "Reading", "subtype": "Hdc1080h", "id": "Hum1080", @@ -325,10 +233,10 @@ "int": 15, "addr": "0x40", "round": 1, - "num": 23 + "num": 17 }, { - "name": "24. Cенсор температуры MAX6675", + "name": "18. Cенсор температуры MAX6675", "type": "Reading", "subtype": "Max6675t", "id": "maxtmp", @@ -339,11 +247,11 @@ "DO": 12, "CS": 13, "CLK": 14, - "num": 24 + "num": 18 }, { - "name": "25. Сканер кнопок 433 MHz", - "num": 25, + "name": "19. Сканер кнопок 433 MHz", + "num": 19, "type": "Reading", "subtype": "RCswitch", "id": "rsw", @@ -352,7 +260,7 @@ "pinTx": 12 }, { - "name": "26. Cенсор температуры Sht20", + "name": "20. Cенсор температуры Sht20", "type": "Reading", "subtype": "Sht20t", "id": "tmp2", @@ -361,10 +269,10 @@ "descr": "Температура", "int": 15, "round": 1, - "num": 26 + "num": 20 }, { - "name": "27. Cенсор влажности Sht20", + "name": "21. Cенсор влажности Sht20", "type": "Reading", "subtype": "Sht20h", "id": "Hum2", @@ -373,10 +281,10 @@ "descr": "Влажность", "int": 15, "round": 1, - "num": 27 + "num": 21 }, { - "name": "28. Cенсор температуры Sht30", + "name": "22. Cенсор температуры Sht30", "type": "Reading", "subtype": "Sht30t", "id": "tmp30", @@ -385,10 +293,10 @@ "descr": "SHT30 Температура", "int": 15, "round": 1, - "num": 28 + "num": 22 }, { - "name": "29. Cенсор влажности Sht30", + "name": "23. Cенсор влажности Sht30", "type": "Reading", "subtype": "Sht30h", "id": "Hum30", @@ -397,11 +305,11 @@ "descr": "SHT30 Влажность", "int": 15, "round": 1, - "num": 29 + "num": 23 }, { - "name": "30. Сонар HC-SR04", - "num": 30, + "name": "24. Сонар HC-SR04", + "num": 24, "type": "Reading", "subtype": "Sonar", "id": "sonar", @@ -413,10 +321,39 @@ "int": 5 }, { - "header": "Расширения" + "header": "Исполнительные устройства" }, { - "name": "31. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)", + "name": "25. Кнопка (подключенная физически)", + "type": "Writing", + "subtype": "ButtonIn", + "id": "btn", + "widget": "toggle", + "page": "Кнопки", + "descr": "", + "int": 0, + "pin": 16, + "execLevel": "1", + "pinMode": "INPUT", + "debounceDelay": 50, + "fixState": 1, + "num": 25 + }, + { + "name": "26. Кнопка управляющая пином (Реле с кнопкой)", + "type": "Writing", + "subtype": "ButtonOut", + "id": "btn", + "widget": "toggle", + "page": "Кнопки", + "descr": "", + "int": 0, + "inv": 0, + "pin": 2, + "num": 26 + }, + { + "name": "27. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)", "type": "Reading", "subtype": "IarduinoRTC", "id": "RTC", @@ -430,10 +367,24 @@ "dat": 4, "defFormat": "d-m-Y", "ticker": 0, - "num": 31 + "num": 27 }, { - "name": "32. Расширитель портов Mcp23017", + "name": "28. Сервопривод", + "type": "Writing", + "subtype": "IoTServo", + "id": "servo", + "widget": "range", + "page": "servo", + "descr": "угол", + "int": 1, + "pin": 12, + "apin": -1, + "amap": "0, 4096, 0, 180", + "num": 28 + }, + { + "name": "29. Расширитель портов Mcp23017", "type": "Reading", "subtype": "Mcp23017", "id": "Mcp", @@ -443,10 +394,38 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 32 + "num": 29 }, { - "name": "33. Доп. функции системы", + "name": "30. MP3 плеер", + "type": "Reading", + "subtype": "Mp3", + "id": "mp3", + "widget": "", + "page": "", + "descr": "", + "int": 1, + "pins": "14,12", + "volume": 20, + "num": 30 + }, + { + "name": "31. PWM ESP8266", + "type": "Writing", + "subtype": "Pwm8266", + "id": "pwm", + "widget": "range", + "page": "Кнопки", + "descr": "PWM", + "int": 0, + "pin": 15, + "freq": 5000, + "val": 0, + "apin": -1, + "num": 31 + }, + { + "name": "32. Доп. функции системы", "type": "Reading", "subtype": "SysExt", "id": "SysExt", @@ -454,18 +433,39 @@ "page": "", "descr": "", "int": 15, + "num": 32 + }, + { + "header": "Экраны" + }, + { + "name": "33. LCD экран 2004", + "type": "Reading", + "subtype": "Lcd2004", + "id": "Lcd", + "widget": "", + "page": "", + "descr": "T", + "int": 15, + "addr": "0x27", + "size": "20,4", + "coord": "0,0", + "id2show": "id датчика", "num": 33 }, { - "name": "34. Переменная", + "name": "34. LCD экран 1602", "type": "Reading", - "subtype": "Variable", - "id": "var", + "subtype": "Lcd2004", + "id": "Lcd", "widget": "", "page": "", - "descr": "", - "int": "0", - "val": "0", + "descr": "T", + "int": 15, + "addr": "0x27", + "size": "16,2", + "coord": "0,0", + "id2show": "id датчика", "num": 34 } ] \ No newline at end of file diff --git a/myProfile.json b/myProfile.json index 45f6cde1..bfa05ffb 100644 --- a/myProfile.json +++ b/myProfile.json @@ -26,143 +26,143 @@ } }, "modules": { - "Экраны": [ + "Виртуальные элементы": [ { - "path": "src\\modules\\display\\Lcd2004", - "active": true - } - ], - "Модули управления": [ - { - "path": "src\\modules\\exec\\ButtonIn", + "path": "src\\modules\\1.virtual\\Timer", "active": true }, { - "path": "src\\modules\\exec\\ButtonOut", - "active": true - }, - { - "path": "src\\modules\\exec\\EspCam", - "active": false - }, - { - "path": "src\\modules\\exec\\IoTServo", - "active": true - }, - { - "path": "src\\modules\\exec\\Mp3", - "active": true - }, - { - "path": "src\\modules\\exec\\Pwm32", - "active": true - }, - { - "path": "src\\modules\\exec\\Pwm8266", - "active": true - }, - { - "path": "src\\modules\\exec\\SDcard", - "active": false - }, - { - "path": "src\\modules\\exec\\Telegram", - "active": false - }, - { - "path": "src\\modules\\exec\\Timer", + "path": "src\\modules\\1.virtual\\Variable", "active": true } ], "Сенсоры": [ { - "path": "src\\modules\\sensors\\Ads1115", + "path": "src\\modules\\2.sensors\\Ads1115", "active": false }, { - "path": "src\\modules\\sensors\\Aht20", + "path": "src\\modules\\2.sensors\\Aht20", "active": true }, { - "path": "src\\modules\\sensors\\AnalogAdc", + "path": "src\\modules\\2.sensors\\AnalogAdc", "active": true }, { - "path": "src\\modules\\sensors\\Bme280", + "path": "src\\modules\\2.sensors\\Bme280", "active": true }, { - "path": "src\\modules\\sensors\\Bmp280", + "path": "src\\modules\\2.sensors\\Bmp280", "active": true }, { - "path": "src\\modules\\sensors\\Dht1122", + "path": "src\\modules\\2.sensors\\Dht1122", "active": true }, { - "path": "src\\modules\\sensors\\Ds18b20", + "path": "src\\modules\\2.sensors\\Ds18b20", "active": true }, { - "path": "src\\modules\\sensors\\Emon", + "path": "src\\modules\\2.sensors\\Emon", "active": false }, { - "path": "src\\modules\\sensors\\GY21", + "path": "src\\modules\\2.sensors\\GY21", "active": true }, { - "path": "src\\modules\\sensors\\Hdc1080", + "path": "src\\modules\\2.sensors\\Hdc1080", "active": true }, { - "path": "src\\modules\\sensors\\IoTWiegand", + "path": "src\\modules\\2.sensors\\IoTWiegand", "active": false }, { - "path": "src\\modules\\sensors\\Max6675", + "path": "src\\modules\\2.sensors\\Max6675", "active": true }, { - "path": "src\\modules\\sensors\\Mhz19", + "path": "src\\modules\\2.sensors\\Mhz19", "active": false }, { - "path": "src\\modules\\sensors\\RCswitch", + "path": "src\\modules\\2.sensors\\RCswitch", "active": true }, { - "path": "src\\modules\\sensors\\Sds011", + "path": "src\\modules\\2.sensors\\Sds011", "active": false }, { - "path": "src\\modules\\sensors\\Sht20", + "path": "src\\modules\\2.sensors\\Sht20", "active": true }, { - "path": "src\\modules\\sensors\\Sht30", + "path": "src\\modules\\2.sensors\\Sht30", "active": true }, { - "path": "src\\modules\\sensors\\Sonar", + "path": "src\\modules\\2.sensors\\Sonar", "active": true } ], - "Расширения": [ + "Исполнительные устройства": [ { - "path": "src\\modules\\system\\IarduinoRTC", + "path": "src\\modules\\3.exec\\ButtonIn", "active": true }, { - "path": "src\\modules\\system\\Mcp23017", + "path": "src\\modules\\3.exec\\ButtonOut", "active": true }, { - "path": "src\\modules\\system\\SysExt", + "path": "src\\modules\\3.exec\\EspCam", + "active": false + }, + { + "path": "src\\modules\\3.exec\\IarduinoRTC", "active": true }, { - "path": "src\\modules\\system\\Variable", + "path": "src\\modules\\3.exec\\IoTServo", + "active": true + }, + { + "path": "src\\modules\\3.exec\\Mcp23017", + "active": true + }, + { + "path": "src\\modules\\3.exec\\Mp3", + "active": true + }, + { + "path": "src\\modules\\3.exec\\Pwm32", + "active": true + }, + { + "path": "src\\modules\\3.exec\\Pwm8266", + "active": true + }, + { + "path": "src\\modules\\3.exec\\SDcard", + "active": false + }, + { + "path": "src\\modules\\3.exec\\SysExt", + "active": true + }, + { + "path": "src\\modules\\3.exec\\Telegram", + "active": false + } + ], + "Экраны": [ + { + "path": "src\\modules\\4.display\\Lcd2004", "active": true } ] diff --git a/platformio.ini b/platformio.ini index 726b79d5..5e76a479 100644 --- a/platformio.ini +++ b/platformio.ini @@ -50,8 +50,6 @@ lib_deps_external = [env:esp8266_4mb_fromitems] lib_deps = - marcoschwartz/LiquidCrystal_I2C@^1.1.4 - dfrobot/DFRobotDFPlayerMini @ ^1.0.5 Adafruit AHTX0 adafruit/Adafruit BME280 Library adafruit/Adafruit BMP280 Library @@ -65,31 +63,33 @@ lib_deps = WEMOS SHT3x@1.0.0 adafruit/Adafruit MCP23017 Arduino Library@^2.0.2 adafruit/Adafruit BusIO @ ^1.13.0 + dfrobot/DFRobotDFPlayerMini @ ^1.0.5 + marcoschwartz/LiquidCrystal_I2C@^1.1.4 build_src_filter = - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [env:esp32_4mb_fromitems] lib_deps = diff --git a/src/modules/exec/Timer/Timer.cpp b/src/modules/1.virtual/Timer/Timer.cpp similarity index 100% rename from src/modules/exec/Timer/Timer.cpp rename to src/modules/1.virtual/Timer/Timer.cpp diff --git a/src/modules/exec/Timer/modinfo.json b/src/modules/1.virtual/Timer/modinfo.json similarity index 96% rename from src/modules/exec/Timer/modinfo.json rename to src/modules/1.virtual/Timer/modinfo.json index e5e367a0..3c9244af 100644 --- a/src/modules/exec/Timer/modinfo.json +++ b/src/modules/1.virtual/Timer/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Виртуальные элементы", "configItem": [{ "name": "Таймер", diff --git a/src/modules/system/Variable/Variable.cpp b/src/modules/1.virtual/Variable/Variable.cpp similarity index 100% rename from src/modules/system/Variable/Variable.cpp rename to src/modules/1.virtual/Variable/Variable.cpp diff --git a/src/modules/system/Variable/modinfo.json b/src/modules/1.virtual/Variable/modinfo.json similarity index 94% rename from src/modules/system/Variable/modinfo.json rename to src/modules/1.virtual/Variable/modinfo.json index 2a2bfb47..38c8059e 100644 --- a/src/modules/system/Variable/modinfo.json +++ b/src/modules/1.virtual/Variable/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Расширения", + "menuSection": "Виртуальные элементы", "configItem": [{ "name": "Переменная", diff --git a/src/modules/sensors/Ads1115/Ads1115.cpp b/src/modules/2.sensors/Ads1115/Ads1115.cpp similarity index 100% rename from src/modules/sensors/Ads1115/Ads1115.cpp rename to src/modules/2.sensors/Ads1115/Ads1115.cpp diff --git a/src/modules/sensors/Ads1115/modinfo.json b/src/modules/2.sensors/Ads1115/modinfo.json similarity index 100% rename from src/modules/sensors/Ads1115/modinfo.json rename to src/modules/2.sensors/Ads1115/modinfo.json diff --git a/src/modules/sensors/Aht20/Aht20.cpp b/src/modules/2.sensors/Aht20/Aht20.cpp similarity index 100% rename from src/modules/sensors/Aht20/Aht20.cpp rename to src/modules/2.sensors/Aht20/Aht20.cpp diff --git a/src/modules/sensors/Aht20/modinfo.json b/src/modules/2.sensors/Aht20/modinfo.json similarity index 100% rename from src/modules/sensors/Aht20/modinfo.json rename to src/modules/2.sensors/Aht20/modinfo.json diff --git a/src/modules/sensors/AnalogAdc/AnalogAdc.cpp b/src/modules/2.sensors/AnalogAdc/AnalogAdc.cpp similarity index 100% rename from src/modules/sensors/AnalogAdc/AnalogAdc.cpp rename to src/modules/2.sensors/AnalogAdc/AnalogAdc.cpp diff --git a/src/modules/sensors/AnalogAdc/modinfo.json b/src/modules/2.sensors/AnalogAdc/modinfo.json similarity index 100% rename from src/modules/sensors/AnalogAdc/modinfo.json rename to src/modules/2.sensors/AnalogAdc/modinfo.json diff --git a/src/modules/sensors/Bme280/Bme280.cpp b/src/modules/2.sensors/Bme280/Bme280.cpp similarity index 100% rename from src/modules/sensors/Bme280/Bme280.cpp rename to src/modules/2.sensors/Bme280/Bme280.cpp diff --git a/src/modules/sensors/Bme280/modinfo.json b/src/modules/2.sensors/Bme280/modinfo.json similarity index 100% rename from src/modules/sensors/Bme280/modinfo.json rename to src/modules/2.sensors/Bme280/modinfo.json diff --git a/src/modules/sensors/Bmp280/Bmp280.cpp b/src/modules/2.sensors/Bmp280/Bmp280.cpp similarity index 100% rename from src/modules/sensors/Bmp280/Bmp280.cpp rename to src/modules/2.sensors/Bmp280/Bmp280.cpp diff --git a/src/modules/sensors/Bmp280/modinfo.json b/src/modules/2.sensors/Bmp280/modinfo.json similarity index 100% rename from src/modules/sensors/Bmp280/modinfo.json rename to src/modules/2.sensors/Bmp280/modinfo.json diff --git a/src/modules/sensors/Dht1122/Dht1122.cpp b/src/modules/2.sensors/Dht1122/Dht1122.cpp similarity index 100% rename from src/modules/sensors/Dht1122/Dht1122.cpp rename to src/modules/2.sensors/Dht1122/Dht1122.cpp diff --git a/src/modules/sensors/Dht1122/modinfo.json b/src/modules/2.sensors/Dht1122/modinfo.json similarity index 100% rename from src/modules/sensors/Dht1122/modinfo.json rename to src/modules/2.sensors/Dht1122/modinfo.json diff --git a/src/modules/sensors/Ds18b20/Ds18b20.cpp b/src/modules/2.sensors/Ds18b20/Ds18b20.cpp similarity index 100% rename from src/modules/sensors/Ds18b20/Ds18b20.cpp rename to src/modules/2.sensors/Ds18b20/Ds18b20.cpp diff --git a/src/modules/sensors/Ds18b20/modinfo.json b/src/modules/2.sensors/Ds18b20/modinfo.json similarity index 100% rename from src/modules/sensors/Ds18b20/modinfo.json rename to src/modules/2.sensors/Ds18b20/modinfo.json diff --git a/src/modules/sensors/Emon/Emon.cpp b/src/modules/2.sensors/Emon/Emon.cpp similarity index 100% rename from src/modules/sensors/Emon/Emon.cpp rename to src/modules/2.sensors/Emon/Emon.cpp diff --git a/src/modules/sensors/Emon/modinfo.json b/src/modules/2.sensors/Emon/modinfo.json similarity index 100% rename from src/modules/sensors/Emon/modinfo.json rename to src/modules/2.sensors/Emon/modinfo.json diff --git a/src/modules/sensors/GY21/GY21.cpp b/src/modules/2.sensors/GY21/GY21.cpp similarity index 100% rename from src/modules/sensors/GY21/GY21.cpp rename to src/modules/2.sensors/GY21/GY21.cpp diff --git a/src/modules/sensors/GY21/modinfo.json b/src/modules/2.sensors/GY21/modinfo.json similarity index 100% rename from src/modules/sensors/GY21/modinfo.json rename to src/modules/2.sensors/GY21/modinfo.json diff --git a/src/modules/sensors/Hdc1080/Hdc1080.cpp b/src/modules/2.sensors/Hdc1080/Hdc1080.cpp similarity index 100% rename from src/modules/sensors/Hdc1080/Hdc1080.cpp rename to src/modules/2.sensors/Hdc1080/Hdc1080.cpp diff --git a/src/modules/sensors/Hdc1080/modinfo.json b/src/modules/2.sensors/Hdc1080/modinfo.json similarity index 100% rename from src/modules/sensors/Hdc1080/modinfo.json rename to src/modules/2.sensors/Hdc1080/modinfo.json diff --git a/src/modules/sensors/IoTWiegand/IoTWiegand.cpp b/src/modules/2.sensors/IoTWiegand/IoTWiegand.cpp similarity index 100% rename from src/modules/sensors/IoTWiegand/IoTWiegand.cpp rename to src/modules/2.sensors/IoTWiegand/IoTWiegand.cpp diff --git a/src/modules/sensors/IoTWiegand/modinfo.json b/src/modules/2.sensors/IoTWiegand/modinfo.json similarity index 100% rename from src/modules/sensors/IoTWiegand/modinfo.json rename to src/modules/2.sensors/IoTWiegand/modinfo.json diff --git a/src/modules/sensors/Max6675/Max6675.cpp b/src/modules/2.sensors/Max6675/Max6675.cpp similarity index 100% rename from src/modules/sensors/Max6675/Max6675.cpp rename to src/modules/2.sensors/Max6675/Max6675.cpp diff --git a/src/modules/sensors/Max6675/modinfo.json b/src/modules/2.sensors/Max6675/modinfo.json similarity index 100% rename from src/modules/sensors/Max6675/modinfo.json rename to src/modules/2.sensors/Max6675/modinfo.json diff --git a/src/modules/sensors/Mhz19/Mhz19.cpp b/src/modules/2.sensors/Mhz19/Mhz19.cpp similarity index 100% rename from src/modules/sensors/Mhz19/Mhz19.cpp rename to src/modules/2.sensors/Mhz19/Mhz19.cpp diff --git a/src/modules/sensors/Mhz19/modinfo.json b/src/modules/2.sensors/Mhz19/modinfo.json similarity index 100% rename from src/modules/sensors/Mhz19/modinfo.json rename to src/modules/2.sensors/Mhz19/modinfo.json diff --git a/src/modules/sensors/RCswitch/RCswitch.cpp b/src/modules/2.sensors/RCswitch/RCswitch.cpp similarity index 100% rename from src/modules/sensors/RCswitch/RCswitch.cpp rename to src/modules/2.sensors/RCswitch/RCswitch.cpp diff --git a/src/modules/sensors/RCswitch/modinfo.json b/src/modules/2.sensors/RCswitch/modinfo.json similarity index 100% rename from src/modules/sensors/RCswitch/modinfo.json rename to src/modules/2.sensors/RCswitch/modinfo.json diff --git a/src/modules/sensors/Sds011/Sds011.cpp b/src/modules/2.sensors/Sds011/Sds011.cpp similarity index 100% rename from src/modules/sensors/Sds011/Sds011.cpp rename to src/modules/2.sensors/Sds011/Sds011.cpp diff --git a/src/modules/sensors/Sds011/modinfo.json b/src/modules/2.sensors/Sds011/modinfo.json similarity index 100% rename from src/modules/sensors/Sds011/modinfo.json rename to src/modules/2.sensors/Sds011/modinfo.json diff --git a/src/modules/sensors/Sht20/Sht20.cpp b/src/modules/2.sensors/Sht20/Sht20.cpp similarity index 100% rename from src/modules/sensors/Sht20/Sht20.cpp rename to src/modules/2.sensors/Sht20/Sht20.cpp diff --git a/src/modules/sensors/Sht20/modinfo.json b/src/modules/2.sensors/Sht20/modinfo.json similarity index 100% rename from src/modules/sensors/Sht20/modinfo.json rename to src/modules/2.sensors/Sht20/modinfo.json diff --git a/src/modules/sensors/Sht30/Sht30.cpp b/src/modules/2.sensors/Sht30/Sht30.cpp similarity index 100% rename from src/modules/sensors/Sht30/Sht30.cpp rename to src/modules/2.sensors/Sht30/Sht30.cpp diff --git a/src/modules/sensors/Sht30/modinfo.json b/src/modules/2.sensors/Sht30/modinfo.json similarity index 100% rename from src/modules/sensors/Sht30/modinfo.json rename to src/modules/2.sensors/Sht30/modinfo.json diff --git a/src/modules/sensors/Sonar/Sonar.cpp b/src/modules/2.sensors/Sonar/Sonar.cpp similarity index 100% rename from src/modules/sensors/Sonar/Sonar.cpp rename to src/modules/2.sensors/Sonar/Sonar.cpp diff --git a/src/modules/sensors/Sonar/modinfo.json b/src/modules/2.sensors/Sonar/modinfo.json similarity index 100% rename from src/modules/sensors/Sonar/modinfo.json rename to src/modules/2.sensors/Sonar/modinfo.json diff --git a/src/modules/exec/ButtonIn/ButtonIn.cpp b/src/modules/3.exec/ButtonIn/ButtonIn.cpp similarity index 100% rename from src/modules/exec/ButtonIn/ButtonIn.cpp rename to src/modules/3.exec/ButtonIn/ButtonIn.cpp diff --git a/src/modules/exec/ButtonIn/modinfo.json b/src/modules/3.exec/ButtonIn/modinfo.json similarity index 96% rename from src/modules/exec/ButtonIn/modinfo.json rename to src/modules/3.exec/ButtonIn/modinfo.json index 642532fe..2c8e6984 100644 --- a/src/modules/exec/ButtonIn/modinfo.json +++ b/src/modules/3.exec/ButtonIn/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "Кнопка (подключенная физически)", diff --git a/src/modules/exec/ButtonOut/ButtonOut.cpp b/src/modules/3.exec/ButtonOut/ButtonOut.cpp similarity index 100% rename from src/modules/exec/ButtonOut/ButtonOut.cpp rename to src/modules/3.exec/ButtonOut/ButtonOut.cpp diff --git a/src/modules/exec/ButtonOut/modinfo.json b/src/modules/3.exec/ButtonOut/modinfo.json similarity index 93% rename from src/modules/exec/ButtonOut/modinfo.json rename to src/modules/3.exec/ButtonOut/modinfo.json index d85a2220..9fd70a92 100644 --- a/src/modules/exec/ButtonOut/modinfo.json +++ b/src/modules/3.exec/ButtonOut/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "Кнопка управляющая пином (Реле с кнопкой)", diff --git a/src/modules/exec/EspCam/EspCam.cpp b/src/modules/3.exec/EspCam/EspCam.cpp similarity index 100% rename from src/modules/exec/EspCam/EspCam.cpp rename to src/modules/3.exec/EspCam/EspCam.cpp diff --git a/src/modules/exec/EspCam/modinfo.json b/src/modules/3.exec/EspCam/modinfo.json similarity index 96% rename from src/modules/exec/EspCam/modinfo.json rename to src/modules/3.exec/EspCam/modinfo.json index 35768e3c..39590753 100644 --- a/src/modules/exec/EspCam/modinfo.json +++ b/src/modules/3.exec/EspCam/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "Camera OV2640 (ESPcam)", diff --git a/src/modules/system/IarduinoRTC/IarduinoRTC.cpp b/src/modules/3.exec/IarduinoRTC/IarduinoRTC.cpp similarity index 100% rename from src/modules/system/IarduinoRTC/IarduinoRTC.cpp rename to src/modules/3.exec/IarduinoRTC/IarduinoRTC.cpp diff --git a/src/modules/system/IarduinoRTC/modinfo.json b/src/modules/3.exec/IarduinoRTC/modinfo.json similarity index 96% rename from src/modules/system/IarduinoRTC/modinfo.json rename to src/modules/3.exec/IarduinoRTC/modinfo.json index 568f0ed9..8dec3def 100644 --- a/src/modules/system/IarduinoRTC/modinfo.json +++ b/src/modules/3.exec/IarduinoRTC/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Расширения", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)", diff --git a/src/modules/exec/IoTServo/IoTServo.cpp b/src/modules/3.exec/IoTServo/IoTServo.cpp similarity index 100% rename from src/modules/exec/IoTServo/IoTServo.cpp rename to src/modules/3.exec/IoTServo/IoTServo.cpp diff --git a/src/modules/exec/IoTServo/modinfo.json b/src/modules/3.exec/IoTServo/modinfo.json similarity index 95% rename from src/modules/exec/IoTServo/modinfo.json rename to src/modules/3.exec/IoTServo/modinfo.json index c0936b75..6f8ae28a 100644 --- a/src/modules/exec/IoTServo/modinfo.json +++ b/src/modules/3.exec/IoTServo/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "Сервопривод", diff --git a/src/modules/system/Mcp23017/Mcp23017.cpp b/src/modules/3.exec/Mcp23017/Mcp23017.cpp similarity index 100% rename from src/modules/system/Mcp23017/Mcp23017.cpp rename to src/modules/3.exec/Mcp23017/Mcp23017.cpp diff --git a/src/modules/system/Mcp23017/modinfo.json b/src/modules/3.exec/Mcp23017/modinfo.json similarity index 95% rename from src/modules/system/Mcp23017/modinfo.json rename to src/modules/3.exec/Mcp23017/modinfo.json index 0d3df2c1..f89a0e87 100644 --- a/src/modules/system/Mcp23017/modinfo.json +++ b/src/modules/3.exec/Mcp23017/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Расширения", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "Расширитель портов Mcp23017", diff --git a/src/modules/exec/Mp3/Mp3.cpp b/src/modules/3.exec/Mp3/Mp3.cpp similarity index 100% rename from src/modules/exec/Mp3/Mp3.cpp rename to src/modules/3.exec/Mp3/Mp3.cpp diff --git a/src/modules/exec/Mp3/modinfo.json b/src/modules/3.exec/Mp3/modinfo.json similarity index 94% rename from src/modules/exec/Mp3/modinfo.json rename to src/modules/3.exec/Mp3/modinfo.json index 74341161..3f0bf2fd 100644 --- a/src/modules/exec/Mp3/modinfo.json +++ b/src/modules/3.exec/Mp3/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "MP3 плеер", diff --git a/src/modules/exec/Pwm32/Pwm32.cpp b/src/modules/3.exec/Pwm32/Pwm32.cpp similarity index 100% rename from src/modules/exec/Pwm32/Pwm32.cpp rename to src/modules/3.exec/Pwm32/Pwm32.cpp diff --git a/src/modules/exec/Pwm32/modinfo.json b/src/modules/3.exec/Pwm32/modinfo.json similarity index 95% rename from src/modules/exec/Pwm32/modinfo.json rename to src/modules/3.exec/Pwm32/modinfo.json index 4c2e5bc0..bfde92ab 100644 --- a/src/modules/exec/Pwm32/modinfo.json +++ b/src/modules/3.exec/Pwm32/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "PWM ESP32", diff --git a/src/modules/exec/Pwm8266/Pwm8266.cpp b/src/modules/3.exec/Pwm8266/Pwm8266.cpp similarity index 100% rename from src/modules/exec/Pwm8266/Pwm8266.cpp rename to src/modules/3.exec/Pwm8266/Pwm8266.cpp diff --git a/src/modules/exec/Pwm8266/modinfo.json b/src/modules/3.exec/Pwm8266/modinfo.json similarity index 94% rename from src/modules/exec/Pwm8266/modinfo.json rename to src/modules/3.exec/Pwm8266/modinfo.json index 8d1967f6..4cdd0836 100644 --- a/src/modules/exec/Pwm8266/modinfo.json +++ b/src/modules/3.exec/Pwm8266/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "PWM ESP8266", diff --git a/src/modules/exec/SDcard/SDcard.cpp b/src/modules/3.exec/SDcard/SDcard.cpp similarity index 100% rename from src/modules/exec/SDcard/SDcard.cpp rename to src/modules/3.exec/SDcard/SDcard.cpp diff --git a/src/modules/exec/SDcard/modinfo.json b/src/modules/3.exec/SDcard/modinfo.json similarity index 93% rename from src/modules/exec/SDcard/modinfo.json rename to src/modules/3.exec/SDcard/modinfo.json index 7e6746a6..a3d3eca6 100644 --- a/src/modules/exec/SDcard/modinfo.json +++ b/src/modules/3.exec/SDcard/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "SD карта", diff --git a/src/modules/system/SysExt/SysExt.cpp b/src/modules/3.exec/SysExt/SysExt.cpp similarity index 100% rename from src/modules/system/SysExt/SysExt.cpp rename to src/modules/3.exec/SysExt/SysExt.cpp diff --git a/src/modules/system/SysExt/modinfo.json b/src/modules/3.exec/SysExt/modinfo.json similarity index 92% rename from src/modules/system/SysExt/modinfo.json rename to src/modules/3.exec/SysExt/modinfo.json index 53166d97..dfbfa3c1 100644 --- a/src/modules/system/SysExt/modinfo.json +++ b/src/modules/3.exec/SysExt/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Расширения", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "Доп. функции системы", diff --git a/src/modules/exec/Telegram/Telegram.cpp b/src/modules/3.exec/Telegram/Telegram.cpp similarity index 100% rename from src/modules/exec/Telegram/Telegram.cpp rename to src/modules/3.exec/Telegram/Telegram.cpp diff --git a/src/modules/exec/Telegram/modinfo.json b/src/modules/3.exec/Telegram/modinfo.json similarity index 95% rename from src/modules/exec/Telegram/modinfo.json rename to src/modules/3.exec/Telegram/modinfo.json index c6331aa8..9ecb39c4 100644 --- a/src/modules/exec/Telegram/modinfo.json +++ b/src/modules/3.exec/Telegram/modinfo.json @@ -1,5 +1,5 @@ { - "menuSection": "Модули управления", + "menuSection": "Исполнительные устройства", "configItem": [{ "name": "Телеграм-Бот", diff --git a/src/modules/display/Lcd2004/Lcd2004.cpp b/src/modules/4.display/Lcd2004/Lcd2004.cpp similarity index 100% rename from src/modules/display/Lcd2004/Lcd2004.cpp rename to src/modules/4.display/Lcd2004/Lcd2004.cpp diff --git a/src/modules/display/Lcd2004/modinfo.json b/src/modules/4.display/Lcd2004/modinfo.json similarity index 100% rename from src/modules/display/Lcd2004/modinfo.json rename to src/modules/4.display/Lcd2004/modinfo.json diff --git a/src/modules/API.cpp b/src/modules/API.cpp index e32991d7..5edd6349 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -1,12 +1,7 @@ #include "ESPConfiguration.h" -void* getAPI_Lcd2004(String subtype, String params); -void* getAPI_ButtonIn(String subtype, String params); -void* getAPI_ButtonOut(String subtype, String params); -void* getAPI_IoTServo(String subtype, String params); -void* getAPI_Mp3(String subtype, String params); -void* getAPI_Pwm8266(String subtype, String params); void* getAPI_Timer(String subtype, String params); +void* getAPI_Variable(String subtype, String params); void* getAPI_Aht20(String subtype, String params); void* getAPI_AnalogAdc(String subtype, String params); void* getAPI_Bme280(String subtype, String params); @@ -20,20 +15,20 @@ void* getAPI_RCswitch(String subtype, String params); void* getAPI_Sht20(String subtype, String params); void* getAPI_Sht30(String subtype, String params); void* getAPI_Sonar(String subtype, String params); +void* getAPI_ButtonIn(String subtype, String params); +void* getAPI_ButtonOut(String subtype, String params); void* getAPI_IarduinoRTC(String subtype, String params); +void* getAPI_IoTServo(String subtype, String params); void* getAPI_Mcp23017(String subtype, String params); +void* getAPI_Mp3(String subtype, String params); +void* getAPI_Pwm8266(String subtype, String params); void* getAPI_SysExt(String subtype, String params); -void* getAPI_Variable(String subtype, String params); +void* getAPI_Lcd2004(String subtype, String params); void* getAPI(String subtype, String params) { void* tmpAPI; -if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_ButtonIn(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_ButtonOut(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_IoTServo(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Aht20(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_AnalogAdc(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Bme280(subtype, params)) != nullptr) return tmpAPI; @@ -47,9 +42,14 @@ if ((tmpAPI = getAPI_RCswitch(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Sht20(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Sht30(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Sonar(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_ButtonIn(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_ButtonOut(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_IarduinoRTC(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_IoTServo(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Mcp23017(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_SysExt(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI; return nullptr; } \ No newline at end of file