From 34c33692f5ebab4e920776a039fb18236dcff646 Mon Sep 17 00:00:00 2001 From: biver Date: Thu, 11 Aug 2022 21:54:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=20?= =?UTF-8?q?=D0=BD=D1=83=D0=BC=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BF?= =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D0=BA=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_svelte/items.json | 752 +++++++++--------- myProfile.json | 188 ++--- platformio.ini | 56 +- src/modules/API.cpp | 44 +- .../Lcd2004/Lcd2004.cpp | 0 .../Lcd2004/modinfo.json | 0 .../{3.exec => exec}/ButtonIn/ButtonIn.cpp | 0 .../{3.exec => exec}/ButtonIn/modinfo.json | 0 .../{3.exec => exec}/ButtonOut/ButtonOut.cpp | 0 .../{3.exec => exec}/ButtonOut/modinfo.json | 0 .../{3.exec => exec}/EspCam/EspCam.cpp | 0 .../{3.exec => exec}/EspCam/modinfo.json | 0 .../IarduinoRTC/IarduinoRTC.cpp | 0 .../{3.exec => exec}/IarduinoRTC/modinfo.json | 0 .../{3.exec => exec}/IoTServo/IoTServo.cpp | 0 .../{3.exec => exec}/IoTServo/modinfo.json | 0 .../{3.exec => exec}/Mcp23017/Mcp23017.cpp | 0 .../{3.exec => exec}/Mcp23017/modinfo.json | 0 src/modules/{3.exec => exec}/Mp3/Mp3.cpp | 0 src/modules/{3.exec => exec}/Mp3/modinfo.json | 0 src/modules/{3.exec => exec}/Pwm32/Pwm32.cpp | 0 .../{3.exec => exec}/Pwm32/modinfo.json | 0 .../{3.exec => exec}/Pwm8266/Pwm8266.cpp | 0 .../{3.exec => exec}/Pwm8266/modinfo.json | 0 .../{3.exec => exec}/SDcard/SDcard.cpp | 0 .../{3.exec => exec}/SDcard/modinfo.json | 0 .../{3.exec => exec}/SysExt/SysExt.cpp | 0 .../{3.exec => exec}/SysExt/modinfo.json | 0 .../{3.exec => exec}/Telegram/Telegram.cpp | 0 .../{3.exec => exec}/Telegram/modinfo.json | 0 .../Ads1115/Ads1115.cpp | 0 .../Ads1115/modinfo.json | 0 .../{2.sensors => sensors}/Aht20/Aht20.cpp | 0 .../{2.sensors => sensors}/Aht20/modinfo.json | 0 .../AnalogAdc/AnalogAdc.cpp | 0 .../AnalogAdc/modinfo.json | 0 .../{2.sensors => sensors}/Bme280/Bme280.cpp | 0 .../Bme280/modinfo.json | 0 .../{2.sensors => 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 .../{2.sensors => sensors}/Emon/Emon.cpp | 0 .../{2.sensors => sensors}/Emon/modinfo.json | 0 .../{2.sensors => sensors}/GY21/GY21.cpp | 0 .../{2.sensors => 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 .../{2.sensors => sensors}/Mhz19/Mhz19.cpp | 0 .../{2.sensors => sensors}/Mhz19/modinfo.json | 0 .../RCswitch/RCswitch.cpp | 0 .../RCswitch/modinfo.json | 0 .../{2.sensors => sensors}/Sds011/Sds011.cpp | 0 .../Sds011/modinfo.json | 0 .../{2.sensors => sensors}/Sht20/Sht20.cpp | 0 .../{2.sensors => sensors}/Sht20/modinfo.json | 0 .../{2.sensors => sensors}/Sht30/Sht30.cpp | 0 .../{2.sensors => sensors}/Sht30/modinfo.json | 0 .../{2.sensors => sensors}/Sonar/Sonar.cpp | 0 .../{2.sensors => sensors}/Sonar/modinfo.json | 0 .../{1.virtual => virtual}/Timer/Timer.cpp | 0 .../{1.virtual => virtual}/Timer/modinfo.json | 0 .../Variable/Variable.cpp | 0 .../Variable/modinfo.json | 0 70 files changed, 520 insertions(+), 520 deletions(-) rename src/modules/{4.display => display}/Lcd2004/Lcd2004.cpp (100%) rename src/modules/{4.display => display}/Lcd2004/modinfo.json (100%) rename src/modules/{3.exec => exec}/ButtonIn/ButtonIn.cpp (100%) rename src/modules/{3.exec => exec}/ButtonIn/modinfo.json (100%) rename src/modules/{3.exec => exec}/ButtonOut/ButtonOut.cpp (100%) rename src/modules/{3.exec => exec}/ButtonOut/modinfo.json (100%) rename src/modules/{3.exec => exec}/EspCam/EspCam.cpp (100%) rename src/modules/{3.exec => exec}/EspCam/modinfo.json (100%) rename src/modules/{3.exec => exec}/IarduinoRTC/IarduinoRTC.cpp (100%) rename src/modules/{3.exec => exec}/IarduinoRTC/modinfo.json (100%) rename src/modules/{3.exec => exec}/IoTServo/IoTServo.cpp (100%) rename src/modules/{3.exec => exec}/IoTServo/modinfo.json (100%) rename src/modules/{3.exec => exec}/Mcp23017/Mcp23017.cpp (100%) rename src/modules/{3.exec => exec}/Mcp23017/modinfo.json (100%) rename src/modules/{3.exec => exec}/Mp3/Mp3.cpp (100%) rename src/modules/{3.exec => exec}/Mp3/modinfo.json (100%) rename src/modules/{3.exec => exec}/Pwm32/Pwm32.cpp (100%) rename src/modules/{3.exec => exec}/Pwm32/modinfo.json (100%) rename src/modules/{3.exec => exec}/Pwm8266/Pwm8266.cpp (100%) rename src/modules/{3.exec => exec}/Pwm8266/modinfo.json (100%) rename src/modules/{3.exec => exec}/SDcard/SDcard.cpp (100%) rename src/modules/{3.exec => exec}/SDcard/modinfo.json (100%) rename src/modules/{3.exec => exec}/SysExt/SysExt.cpp (100%) rename src/modules/{3.exec => exec}/SysExt/modinfo.json (100%) rename src/modules/{3.exec => exec}/Telegram/Telegram.cpp (100%) rename src/modules/{3.exec => exec}/Telegram/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Ads1115/Ads1115.cpp (100%) rename src/modules/{2.sensors => sensors}/Ads1115/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Aht20/Aht20.cpp (100%) rename src/modules/{2.sensors => sensors}/Aht20/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/AnalogAdc/AnalogAdc.cpp (100%) rename src/modules/{2.sensors => sensors}/AnalogAdc/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Bme280/Bme280.cpp (100%) rename src/modules/{2.sensors => sensors}/Bme280/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Bmp280/Bmp280.cpp (100%) rename src/modules/{2.sensors => sensors}/Bmp280/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Dht1122/Dht1122.cpp (100%) rename src/modules/{2.sensors => sensors}/Dht1122/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Ds18b20/Ds18b20.cpp (100%) rename src/modules/{2.sensors => sensors}/Ds18b20/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Emon/Emon.cpp (100%) rename src/modules/{2.sensors => sensors}/Emon/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/GY21/GY21.cpp (100%) rename src/modules/{2.sensors => sensors}/GY21/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Hdc1080/Hdc1080.cpp (100%) rename src/modules/{2.sensors => sensors}/Hdc1080/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/IoTWiegand/IoTWiegand.cpp (100%) rename src/modules/{2.sensors => sensors}/IoTWiegand/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Max6675/Max6675.cpp (100%) rename src/modules/{2.sensors => sensors}/Max6675/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Mhz19/Mhz19.cpp (100%) rename src/modules/{2.sensors => sensors}/Mhz19/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/RCswitch/RCswitch.cpp (100%) rename src/modules/{2.sensors => sensors}/RCswitch/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Sds011/Sds011.cpp (100%) rename src/modules/{2.sensors => sensors}/Sds011/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Sht20/Sht20.cpp (100%) rename src/modules/{2.sensors => sensors}/Sht20/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Sht30/Sht30.cpp (100%) rename src/modules/{2.sensors => sensors}/Sht30/modinfo.json (100%) rename src/modules/{2.sensors => sensors}/Sonar/Sonar.cpp (100%) rename src/modules/{2.sensors => sensors}/Sonar/modinfo.json (100%) rename src/modules/{1.virtual => virtual}/Timer/Timer.cpp (100%) rename src/modules/{1.virtual => virtual}/Timer/modinfo.json (100%) rename src/modules/{1.virtual => virtual}/Variable/Variable.cpp (100%) rename src/modules/{1.virtual => virtual}/Variable/modinfo.json (100%) diff --git a/data_svelte/items.json b/data_svelte/items.json index c6e8cb70..a3c6eb51 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -4,363 +4,43 @@ "num": 0 }, { - "header": "Виртуальные элементы" + "header": "Экраны" }, { - "name": "1. Таймер", - "type": "Writing", - "subtype": "Timer", - "id": "timer", + "name": "1. LCD экран 2004", + "type": "Reading", + "subtype": "Lcd2004", + "id": "Lcd", "widget": "", "page": "", - "descr": "", - "int": 1, - "countDown": 15, - "ticker": 0, - "repeat": 0, - "needSave": 0, + "descr": "T", + "int": 15, + "addr": "0x27", + "size": "20,4", + "coord": "0,0", + "id2show": "id датчика", "num": 1 }, { - "name": "2. Кнопка", + "name": "2. LCD экран 1602", "type": "Reading", - "subtype": "Variable", - "id": "vbtn", + "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": 2 }, - { - "name": "3. Окно ввода цифры", - "type": "Reading", - "subtype": "Variable", - "id": "dedit", - "widget": "", - "page": "", - "descr": "", - "int": "0", - "val": "0", - "num": 3 - }, - { - "name": "4. Окно ввода времени", - "type": "Reading", - "subtype": "Variable", - "id": "tedit", - "widget": "", - "page": "", - "descr": "", - "int": "0", - "val": "0", - "num": 4 - }, - { - "name": "5. Переменная", - "type": "Reading", - "subtype": "Variable", - "id": "var", - "widget": "", - "page": "", - "descr": "", - "int": "0", - "val": "0", - "num": 5 - }, - { - "header": "Сенсоры" - }, - { - "name": "6. Cенсор температуры AHT20", - "type": "Reading", - "subtype": "Aht20t", - "id": "Temp20", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "AHT20 Температура", - "int": 15, - "addr": "0x38", - "round": 1, - "num": 6 - }, - { - "name": "7. Cенсор влажности AHT20", - "type": "Reading", - "subtype": "Aht20h", - "id": "Hum20", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "AHT20 Влажность", - "int": 15, - "addr": "0x38", - "round": 1, - "num": 7 - }, - { - "name": "8. Аналоговый сенсор", - "type": "Reading", - "subtype": "AnalogAdc", - "id": "t", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Температура", - "map": "1,1024,1,100", - "plus": 0, - "multiply": 1, - "round": 1, - "pin": 0, - "int": 15, - "avgSteps": 1, - "num": 8 - }, - { - "name": "9. Cенсор температуры Bme280", - "type": "Reading", - "subtype": "Bme280t", - "id": "tmp3", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Температура", - "int": 15, - "addr": "0x77", - "round": 1, - "num": 9 - }, - { - "name": "10. Cенсор давления Bme280", - "type": "Reading", - "subtype": "Bme280p", - "id": "Press3", - "widget": "anydataMm", - "page": "Сенсоры", - "descr": "Давление", - "int": 15, - "addr": "0x77", - "round": 1, - "num": 10 - }, - { - "name": "11. Cенсор влажности Bme280", - "type": "Reading", - "subtype": "Bme280h", - "id": "Hum3", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "Влажность", - "int": 15, - "addr": "0x77", - "round": 1, - "num": 11 - }, - { - "name": "12. Cенсор температуры Bmp280", - "type": "Reading", - "subtype": "Bmp280t", - "id": "tmp3", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "280 Температура", - "int": 15, - "addr": "0x77", - "round": 1, - "num": 12 - }, - { - "name": "13. Cенсор давления Bmp280", - "type": "Reading", - "subtype": "Bmp280p", - "id": "Press3", - "widget": "anydataMm", - "page": "Сенсоры", - "descr": "280 Давление", - "int": 15, - "addr": "0x77", - "round": 1, - "num": 13 - }, - { - "name": "14. Cенсор температуры dht11", - "type": "Reading", - "subtype": "Dht1122t", - "id": "tmp3", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Температура", - "int": 15, - "pin": 0, - "senstype": "dht11", - "num": 14 - }, - { - "name": "15. Cенсор влажности dht11", - "type": "Reading", - "subtype": "Dht1122h", - "id": "Hum3", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "Влажность", - "int": 15, - "pin": 0, - "senstype": "dht11", - "num": 15 - }, - { - "name": "16. Cенсор температуры ds18b20", - "type": "Reading", - "subtype": "Ds18b20", - "id": "dstmp", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "DS Температура", - "int": 15, - "pin": 2, - "index": 0, - "addr": "", - "round": 1, - "num": 16 - }, - { - "name": "17. Cенсор температуры GY21", - "type": "Reading", - "subtype": "GY21t", - "id": "tmp4", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Температура", - "round": 1, - "int": 15, - "num": 17 - }, - { - "name": "18. Cенсор влажности GY21", - "type": "Reading", - "subtype": "GY21h", - "id": "Hum4", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "Влажность", - "round": 1, - "int": 15, - "num": 18 - }, - { - "name": "19. Cенсор температуры HDC1080", - "type": "Reading", - "subtype": "Hdc1080t", - "id": "Temp1080", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "1080 Температура", - "int": 15, - "addr": "0x40", - "round": 1, - "num": 19 - }, - { - "name": "20. Cенсор влажности HDC1080", - "type": "Reading", - "subtype": "Hdc1080h", - "id": "Hum1080", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "1080 Влажность", - "int": 15, - "addr": "0x40", - "round": 1, - "num": 20 - }, - { - "name": "21. Cенсор температуры MAX6675", - "type": "Reading", - "subtype": "Max6675t", - "id": "maxtmp", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "MAX Температура", - "int": 15, - "DO": 12, - "CS": 13, - "CLK": 14, - "num": 21 - }, - { - "name": "22. Сканер кнопок 433 MHz", - "num": 22, - "type": "Reading", - "subtype": "RCswitch", - "id": "rsw", - "int": 500, - "pinRx": 12, - "pinTx": 12 - }, - { - "name": "23. Cенсор температуры Sht20", - "type": "Reading", - "subtype": "Sht20t", - "id": "tmp2", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Температура", - "int": 15, - "round": 1, - "num": 23 - }, - { - "name": "24. Cенсор влажности Sht20", - "type": "Reading", - "subtype": "Sht20h", - "id": "Hum2", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "Влажность", - "int": 15, - "round": 1, - "num": 24 - }, - { - "name": "25. Cенсор температуры Sht30", - "type": "Reading", - "subtype": "Sht30t", - "id": "tmp30", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "SHT30 Температура", - "int": 15, - "round": 1, - "num": 25 - }, - { - "name": "26. Cенсор влажности Sht30", - "type": "Reading", - "subtype": "Sht30h", - "id": "Hum30", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "SHT30 Влажность", - "int": 15, - "round": 1, - "num": 26 - }, - { - "name": "27. Сонар HC-SR04", - "num": 27, - "type": "Reading", - "subtype": "Sonar", - "id": "sonar", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "Расстояние (см)", - "pinTrig": 5, - "pinEcho": 4, - "int": 5 - }, { "header": "Исполнительные устройства" }, { - "name": "28. Кнопка подключенная к пину", + "name": "3. Кнопка подключенная к пину", "type": "Writing", "subtype": "ButtonIn", "id": "btn", @@ -373,10 +53,10 @@ "pinMode": "INPUT", "debounceDelay": 50, "fixState": 1, - "num": 28 + "num": 3 }, { - "name": "29. Кнопка управляющая пином (Реле)", + "name": "4. Кнопка управляющая пином (Реле)", "type": "Writing", "subtype": "ButtonOut", "id": "btn", @@ -386,10 +66,10 @@ "int": 0, "inv": 0, "pin": 2, - "num": 29 + "num": 4 }, { - "name": "30. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)", + "name": "5. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)", "type": "Reading", "subtype": "IarduinoRTC", "id": "RTC", @@ -403,10 +83,10 @@ "dat": 4, "defFormat": "d-m-Y", "ticker": 0, - "num": 30 + "num": 5 }, { - "name": "31. Сервопривод", + "name": "6. Сервопривод", "type": "Writing", "subtype": "IoTServo", "id": "servo", @@ -417,10 +97,10 @@ "pin": 12, "apin": -1, "amap": "0, 4096, 0, 180", - "num": 31 + "num": 6 }, { - "name": "32. Расширитель портов Mcp23017", + "name": "7. Расширитель портов Mcp23017", "type": "Reading", "subtype": "Mcp23017", "id": "Mcp", @@ -430,10 +110,10 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 32 + "num": 7 }, { - "name": "33. MP3 плеер", + "name": "8. MP3 плеер", "type": "Reading", "subtype": "Mp3", "id": "mp3", @@ -443,10 +123,10 @@ "int": 1, "pins": "14,12", "volume": 20, - "num": 33 + "num": 8 }, { - "name": "34. PWM ESP8266", + "name": "9. PWM ESP8266", "type": "Writing", "subtype": "Pwm8266", "id": "pwm", @@ -458,10 +138,10 @@ "freq": 5000, "val": 0, "apin": -1, - "num": 34 + "num": 9 }, { - "name": "35. Доп. функции системы", + "name": "10. Доп. функции системы", "type": "Reading", "subtype": "SysExt", "id": "SysExt", @@ -469,39 +149,359 @@ "page": "", "descr": "", "int": 15, + "num": 10 + }, + { + "header": "Сенсоры" + }, + { + "name": "11. Cенсор температуры AHT20", + "type": "Reading", + "subtype": "Aht20t", + "id": "Temp20", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "AHT20 Температура", + "int": 15, + "addr": "0x38", + "round": 1, + "num": 11 + }, + { + "name": "12. Cенсор влажности AHT20", + "type": "Reading", + "subtype": "Aht20h", + "id": "Hum20", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "AHT20 Влажность", + "int": 15, + "addr": "0x38", + "round": 1, + "num": 12 + }, + { + "name": "13. Аналоговый сенсор", + "type": "Reading", + "subtype": "AnalogAdc", + "id": "t", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "map": "1,1024,1,100", + "plus": 0, + "multiply": 1, + "round": 1, + "pin": 0, + "int": 15, + "avgSteps": 1, + "num": 13 + }, + { + "name": "14. Cенсор температуры Bme280", + "type": "Reading", + "subtype": "Bme280t", + "id": "tmp3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 14 + }, + { + "name": "15. Cенсор давления Bme280", + "type": "Reading", + "subtype": "Bme280p", + "id": "Press3", + "widget": "anydataMm", + "page": "Сенсоры", + "descr": "Давление", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 15 + }, + { + "name": "16. Cенсор влажности Bme280", + "type": "Reading", + "subtype": "Bme280h", + "id": "Hum3", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 16 + }, + { + "name": "17. Cенсор температуры Bmp280", + "type": "Reading", + "subtype": "Bmp280t", + "id": "tmp3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "280 Температура", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 17 + }, + { + "name": "18. Cенсор давления Bmp280", + "type": "Reading", + "subtype": "Bmp280p", + "id": "Press3", + "widget": "anydataMm", + "page": "Сенсоры", + "descr": "280 Давление", + "int": 15, + "addr": "0x77", + "round": 1, + "num": 18 + }, + { + "name": "19. Cенсор температуры dht11", + "type": "Reading", + "subtype": "Dht1122t", + "id": "tmp3", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "int": 15, + "pin": 0, + "senstype": "dht11", + "num": 19 + }, + { + "name": "20. Cенсор влажности dht11", + "type": "Reading", + "subtype": "Dht1122h", + "id": "Hum3", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "int": 15, + "pin": 0, + "senstype": "dht11", + "num": 20 + }, + { + "name": "21. Cенсор температуры ds18b20", + "type": "Reading", + "subtype": "Ds18b20", + "id": "dstmp", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "DS Температура", + "int": 15, + "pin": 2, + "index": 0, + "addr": "", + "round": 1, + "num": 21 + }, + { + "name": "22. Cенсор температуры GY21", + "type": "Reading", + "subtype": "GY21t", + "id": "tmp4", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "round": 1, + "int": 15, + "num": 22 + }, + { + "name": "23. Cенсор влажности GY21", + "type": "Reading", + "subtype": "GY21h", + "id": "Hum4", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "round": 1, + "int": 15, + "num": 23 + }, + { + "name": "24. Cенсор температуры HDC1080", + "type": "Reading", + "subtype": "Hdc1080t", + "id": "Temp1080", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "1080 Температура", + "int": 15, + "addr": "0x40", + "round": 1, + "num": 24 + }, + { + "name": "25. Cенсор влажности HDC1080", + "type": "Reading", + "subtype": "Hdc1080h", + "id": "Hum1080", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "1080 Влажность", + "int": 15, + "addr": "0x40", + "round": 1, + "num": 25 + }, + { + "name": "26. Cенсор температуры MAX6675", + "type": "Reading", + "subtype": "Max6675t", + "id": "maxtmp", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "MAX Температура", + "int": 15, + "DO": 12, + "CS": 13, + "CLK": 14, + "num": 26 + }, + { + "name": "27. Сканер кнопок 433 MHz", + "num": 27, + "type": "Reading", + "subtype": "RCswitch", + "id": "rsw", + "int": 500, + "pinRx": 12, + "pinTx": 12 + }, + { + "name": "28. Cенсор температуры Sht20", + "type": "Reading", + "subtype": "Sht20t", + "id": "tmp2", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Температура", + "int": 15, + "round": 1, + "num": 28 + }, + { + "name": "29. Cенсор влажности Sht20", + "type": "Reading", + "subtype": "Sht20h", + "id": "Hum2", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "Влажность", + "int": 15, + "round": 1, + "num": 29 + }, + { + "name": "30. Cенсор температуры Sht30", + "type": "Reading", + "subtype": "Sht30t", + "id": "tmp30", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "SHT30 Температура", + "int": 15, + "round": 1, + "num": 30 + }, + { + "name": "31. Cенсор влажности Sht30", + "type": "Reading", + "subtype": "Sht30h", + "id": "Hum30", + "widget": "anydataHum", + "page": "Сенсоры", + "descr": "SHT30 Влажность", + "int": 15, + "round": 1, + "num": 31 + }, + { + "name": "32. Сонар HC-SR04", + "num": 32, + "type": "Reading", + "subtype": "Sonar", + "id": "sonar", + "widget": "anydataTmp", + "page": "Сенсоры", + "descr": "Расстояние (см)", + "pinTrig": 5, + "pinEcho": 4, + "int": 5 + }, + { + "header": "Виртуальные элементы" + }, + { + "name": "33. Таймер", + "type": "Writing", + "subtype": "Timer", + "id": "timer", + "widget": "", + "page": "", + "descr": "", + "int": 1, + "countDown": 15, + "ticker": 0, + "repeat": 0, + "needSave": 0, + "num": 33 + }, + { + "name": "34. Кнопка", + "type": "Reading", + "subtype": "Variable", + "id": "vbtn", + "widget": "", + "page": "", + "descr": "", + "int": "0", + "val": "0", + "num": 34 + }, + { + "name": "35. Окно ввода цифры", + "type": "Reading", + "subtype": "Variable", + "id": "dedit", + "widget": "", + "page": "", + "descr": "", + "int": "0", + "val": "0", "num": 35 }, { - "header": "Экраны" - }, - { - "name": "36. LCD экран 2004", + "name": "36. Окно ввода времени", "type": "Reading", - "subtype": "Lcd2004", - "id": "Lcd", + "subtype": "Variable", + "id": "tedit", "widget": "", "page": "", - "descr": "T", - "int": 15, - "addr": "0x27", - "size": "20,4", - "coord": "0,0", - "id2show": "id датчика", + "descr": "", + "int": "0", + "val": "0", "num": 36 }, { - "name": "37. LCD экран 1602", + "name": "37. Переменная", "type": "Reading", - "subtype": "Lcd2004", - "id": "Lcd", + "subtype": "Variable", + "id": "var", "widget": "", "page": "", - "descr": "T", - "int": 15, - "addr": "0x27", - "size": "16,2", - "coord": "0,0", - "id2show": "id датчика", + "descr": "", + "int": "0", + "val": "0", "num": 37 } ] \ No newline at end of file diff --git a/myProfile.json b/myProfile.json index bfa05ffb..9b6978aa 100644 --- a/myProfile.json +++ b/myProfile.json @@ -26,143 +26,143 @@ } }, "modules": { - "Виртуальные элементы": [ + "Экраны": [ { - "path": "src\\modules\\1.virtual\\Timer", - "active": true - }, - { - "path": "src\\modules\\1.virtual\\Variable", - "active": true - } - ], - "Сенсоры": [ - { - "path": "src\\modules\\2.sensors\\Ads1115", - "active": false - }, - { - "path": "src\\modules\\2.sensors\\Aht20", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\AnalogAdc", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Bme280", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Bmp280", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Dht1122", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Ds18b20", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Emon", - "active": false - }, - { - "path": "src\\modules\\2.sensors\\GY21", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Hdc1080", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\IoTWiegand", - "active": false - }, - { - "path": "src\\modules\\2.sensors\\Max6675", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Mhz19", - "active": false - }, - { - "path": "src\\modules\\2.sensors\\RCswitch", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Sds011", - "active": false - }, - { - "path": "src\\modules\\2.sensors\\Sht20", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Sht30", - "active": true - }, - { - "path": "src\\modules\\2.sensors\\Sonar", + "path": "src\\modules\\display\\Lcd2004", "active": true } ], "Исполнительные устройства": [ { - "path": "src\\modules\\3.exec\\ButtonIn", + "path": "src\\modules\\exec\\ButtonIn", "active": true }, { - "path": "src\\modules\\3.exec\\ButtonOut", + "path": "src\\modules\\exec\\ButtonOut", "active": true }, { - "path": "src\\modules\\3.exec\\EspCam", + "path": "src\\modules\\exec\\EspCam", "active": false }, { - "path": "src\\modules\\3.exec\\IarduinoRTC", + "path": "src\\modules\\exec\\IarduinoRTC", "active": true }, { - "path": "src\\modules\\3.exec\\IoTServo", + "path": "src\\modules\\exec\\IoTServo", "active": true }, { - "path": "src\\modules\\3.exec\\Mcp23017", + "path": "src\\modules\\exec\\Mcp23017", "active": true }, { - "path": "src\\modules\\3.exec\\Mp3", + "path": "src\\modules\\exec\\Mp3", "active": true }, { - "path": "src\\modules\\3.exec\\Pwm32", + "path": "src\\modules\\exec\\Pwm32", "active": true }, { - "path": "src\\modules\\3.exec\\Pwm8266", + "path": "src\\modules\\exec\\Pwm8266", "active": true }, { - "path": "src\\modules\\3.exec\\SDcard", + "path": "src\\modules\\exec\\SDcard", "active": false }, { - "path": "src\\modules\\3.exec\\SysExt", + "path": "src\\modules\\exec\\SysExt", "active": true }, { - "path": "src\\modules\\3.exec\\Telegram", + "path": "src\\modules\\exec\\Telegram", "active": false } ], - "Экраны": [ + "Сенсоры": [ { - "path": "src\\modules\\4.display\\Lcd2004", + "path": "src\\modules\\sensors\\Ads1115", + "active": false + }, + { + "path": "src\\modules\\sensors\\Aht20", + "active": true + }, + { + "path": "src\\modules\\sensors\\AnalogAdc", + "active": true + }, + { + "path": "src\\modules\\sensors\\Bme280", + "active": true + }, + { + "path": "src\\modules\\sensors\\Bmp280", + "active": true + }, + { + "path": "src\\modules\\sensors\\Dht1122", + "active": true + }, + { + "path": "src\\modules\\sensors\\Ds18b20", + "active": true + }, + { + "path": "src\\modules\\sensors\\Emon", + "active": false + }, + { + "path": "src\\modules\\sensors\\GY21", + "active": true + }, + { + "path": "src\\modules\\sensors\\Hdc1080", + "active": true + }, + { + "path": "src\\modules\\sensors\\IoTWiegand", + "active": false + }, + { + "path": "src\\modules\\sensors\\Max6675", + "active": true + }, + { + "path": "src\\modules\\sensors\\Mhz19", + "active": false + }, + { + "path": "src\\modules\\sensors\\RCswitch", + "active": true + }, + { + "path": "src\\modules\\sensors\\Sds011", + "active": false + }, + { + "path": "src\\modules\\sensors\\Sht20", + "active": true + }, + { + "path": "src\\modules\\sensors\\Sht30", + "active": true + }, + { + "path": "src\\modules\\sensors\\Sonar", + "active": true + } + ], + "Виртуальные элементы": [ + { + "path": "src\\modules\\virtual\\Timer", + "active": true + }, + { + "path": "src\\modules\\virtual\\Variable", "active": true } ] diff --git a/platformio.ini b/platformio.ini index 5e76a479..a5cd7728 100644 --- a/platformio.ini +++ b/platformio.ini @@ -50,6 +50,10 @@ lib_deps_external = [env:esp8266_4mb_fromitems] lib_deps = + marcoschwartz/LiquidCrystal_I2C@^1.1.4 + adafruit/Adafruit MCP23017 Arduino Library@^2.0.2 + adafruit/Adafruit BusIO @ ^1.13.0 + dfrobot/DFRobotDFPlayerMini @ ^1.0.5 Adafruit AHTX0 adafruit/Adafruit BME280 Library adafruit/Adafruit BMP280 Library @@ -61,35 +65,31 @@ lib_deps = rc-switch @ ^2.6.4 robtillaart/SHT2x@^0.1.1 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/API.cpp b/src/modules/API.cpp index 5edd6349..113a9c0a 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -1,7 +1,14 @@ #include "ESPConfiguration.h" -void* getAPI_Timer(String subtype, String params); -void* getAPI_Variable(String subtype, String params); +void* getAPI_Lcd2004(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_Aht20(String subtype, String params); void* getAPI_AnalogAdc(String subtype, String params); void* getAPI_Bme280(String subtype, String params); @@ -15,20 +22,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_Lcd2004(String subtype, String params); +void* getAPI_Timer(String subtype, String params); +void* getAPI_Variable(String subtype, String params); void* getAPI(String subtype, String params) { void* tmpAPI; -if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return 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_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_Aht20(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_AnalogAdc(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Bme280(subtype, params)) != nullptr) return tmpAPI; @@ -42,14 +49,7 @@ 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_Lcd2004(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI; return nullptr; } \ No newline at end of file diff --git a/src/modules/4.display/Lcd2004/Lcd2004.cpp b/src/modules/display/Lcd2004/Lcd2004.cpp similarity index 100% rename from src/modules/4.display/Lcd2004/Lcd2004.cpp rename to src/modules/display/Lcd2004/Lcd2004.cpp diff --git a/src/modules/4.display/Lcd2004/modinfo.json b/src/modules/display/Lcd2004/modinfo.json similarity index 100% rename from src/modules/4.display/Lcd2004/modinfo.json rename to src/modules/display/Lcd2004/modinfo.json diff --git a/src/modules/3.exec/ButtonIn/ButtonIn.cpp b/src/modules/exec/ButtonIn/ButtonIn.cpp similarity index 100% rename from src/modules/3.exec/ButtonIn/ButtonIn.cpp rename to src/modules/exec/ButtonIn/ButtonIn.cpp diff --git a/src/modules/3.exec/ButtonIn/modinfo.json b/src/modules/exec/ButtonIn/modinfo.json similarity index 100% rename from src/modules/3.exec/ButtonIn/modinfo.json rename to src/modules/exec/ButtonIn/modinfo.json diff --git a/src/modules/3.exec/ButtonOut/ButtonOut.cpp b/src/modules/exec/ButtonOut/ButtonOut.cpp similarity index 100% rename from src/modules/3.exec/ButtonOut/ButtonOut.cpp rename to src/modules/exec/ButtonOut/ButtonOut.cpp diff --git a/src/modules/3.exec/ButtonOut/modinfo.json b/src/modules/exec/ButtonOut/modinfo.json similarity index 100% rename from src/modules/3.exec/ButtonOut/modinfo.json rename to src/modules/exec/ButtonOut/modinfo.json diff --git a/src/modules/3.exec/EspCam/EspCam.cpp b/src/modules/exec/EspCam/EspCam.cpp similarity index 100% rename from src/modules/3.exec/EspCam/EspCam.cpp rename to src/modules/exec/EspCam/EspCam.cpp diff --git a/src/modules/3.exec/EspCam/modinfo.json b/src/modules/exec/EspCam/modinfo.json similarity index 100% rename from src/modules/3.exec/EspCam/modinfo.json rename to src/modules/exec/EspCam/modinfo.json diff --git a/src/modules/3.exec/IarduinoRTC/IarduinoRTC.cpp b/src/modules/exec/IarduinoRTC/IarduinoRTC.cpp similarity index 100% rename from src/modules/3.exec/IarduinoRTC/IarduinoRTC.cpp rename to src/modules/exec/IarduinoRTC/IarduinoRTC.cpp diff --git a/src/modules/3.exec/IarduinoRTC/modinfo.json b/src/modules/exec/IarduinoRTC/modinfo.json similarity index 100% rename from src/modules/3.exec/IarduinoRTC/modinfo.json rename to src/modules/exec/IarduinoRTC/modinfo.json diff --git a/src/modules/3.exec/IoTServo/IoTServo.cpp b/src/modules/exec/IoTServo/IoTServo.cpp similarity index 100% rename from src/modules/3.exec/IoTServo/IoTServo.cpp rename to src/modules/exec/IoTServo/IoTServo.cpp diff --git a/src/modules/3.exec/IoTServo/modinfo.json b/src/modules/exec/IoTServo/modinfo.json similarity index 100% rename from src/modules/3.exec/IoTServo/modinfo.json rename to src/modules/exec/IoTServo/modinfo.json diff --git a/src/modules/3.exec/Mcp23017/Mcp23017.cpp b/src/modules/exec/Mcp23017/Mcp23017.cpp similarity index 100% rename from src/modules/3.exec/Mcp23017/Mcp23017.cpp rename to src/modules/exec/Mcp23017/Mcp23017.cpp diff --git a/src/modules/3.exec/Mcp23017/modinfo.json b/src/modules/exec/Mcp23017/modinfo.json similarity index 100% rename from src/modules/3.exec/Mcp23017/modinfo.json rename to src/modules/exec/Mcp23017/modinfo.json diff --git a/src/modules/3.exec/Mp3/Mp3.cpp b/src/modules/exec/Mp3/Mp3.cpp similarity index 100% rename from src/modules/3.exec/Mp3/Mp3.cpp rename to src/modules/exec/Mp3/Mp3.cpp diff --git a/src/modules/3.exec/Mp3/modinfo.json b/src/modules/exec/Mp3/modinfo.json similarity index 100% rename from src/modules/3.exec/Mp3/modinfo.json rename to src/modules/exec/Mp3/modinfo.json diff --git a/src/modules/3.exec/Pwm32/Pwm32.cpp b/src/modules/exec/Pwm32/Pwm32.cpp similarity index 100% rename from src/modules/3.exec/Pwm32/Pwm32.cpp rename to src/modules/exec/Pwm32/Pwm32.cpp diff --git a/src/modules/3.exec/Pwm32/modinfo.json b/src/modules/exec/Pwm32/modinfo.json similarity index 100% rename from src/modules/3.exec/Pwm32/modinfo.json rename to src/modules/exec/Pwm32/modinfo.json diff --git a/src/modules/3.exec/Pwm8266/Pwm8266.cpp b/src/modules/exec/Pwm8266/Pwm8266.cpp similarity index 100% rename from src/modules/3.exec/Pwm8266/Pwm8266.cpp rename to src/modules/exec/Pwm8266/Pwm8266.cpp diff --git a/src/modules/3.exec/Pwm8266/modinfo.json b/src/modules/exec/Pwm8266/modinfo.json similarity index 100% rename from src/modules/3.exec/Pwm8266/modinfo.json rename to src/modules/exec/Pwm8266/modinfo.json diff --git a/src/modules/3.exec/SDcard/SDcard.cpp b/src/modules/exec/SDcard/SDcard.cpp similarity index 100% rename from src/modules/3.exec/SDcard/SDcard.cpp rename to src/modules/exec/SDcard/SDcard.cpp diff --git a/src/modules/3.exec/SDcard/modinfo.json b/src/modules/exec/SDcard/modinfo.json similarity index 100% rename from src/modules/3.exec/SDcard/modinfo.json rename to src/modules/exec/SDcard/modinfo.json diff --git a/src/modules/3.exec/SysExt/SysExt.cpp b/src/modules/exec/SysExt/SysExt.cpp similarity index 100% rename from src/modules/3.exec/SysExt/SysExt.cpp rename to src/modules/exec/SysExt/SysExt.cpp diff --git a/src/modules/3.exec/SysExt/modinfo.json b/src/modules/exec/SysExt/modinfo.json similarity index 100% rename from src/modules/3.exec/SysExt/modinfo.json rename to src/modules/exec/SysExt/modinfo.json diff --git a/src/modules/3.exec/Telegram/Telegram.cpp b/src/modules/exec/Telegram/Telegram.cpp similarity index 100% rename from src/modules/3.exec/Telegram/Telegram.cpp rename to src/modules/exec/Telegram/Telegram.cpp diff --git a/src/modules/3.exec/Telegram/modinfo.json b/src/modules/exec/Telegram/modinfo.json similarity index 100% rename from src/modules/3.exec/Telegram/modinfo.json rename to src/modules/exec/Telegram/modinfo.json diff --git a/src/modules/2.sensors/Ads1115/Ads1115.cpp b/src/modules/sensors/Ads1115/Ads1115.cpp similarity index 100% rename from src/modules/2.sensors/Ads1115/Ads1115.cpp rename to src/modules/sensors/Ads1115/Ads1115.cpp diff --git a/src/modules/2.sensors/Ads1115/modinfo.json b/src/modules/sensors/Ads1115/modinfo.json similarity index 100% rename from src/modules/2.sensors/Ads1115/modinfo.json rename to src/modules/sensors/Ads1115/modinfo.json diff --git a/src/modules/2.sensors/Aht20/Aht20.cpp b/src/modules/sensors/Aht20/Aht20.cpp similarity index 100% rename from src/modules/2.sensors/Aht20/Aht20.cpp rename to src/modules/sensors/Aht20/Aht20.cpp diff --git a/src/modules/2.sensors/Aht20/modinfo.json b/src/modules/sensors/Aht20/modinfo.json similarity index 100% rename from src/modules/2.sensors/Aht20/modinfo.json rename to src/modules/sensors/Aht20/modinfo.json diff --git a/src/modules/2.sensors/AnalogAdc/AnalogAdc.cpp b/src/modules/sensors/AnalogAdc/AnalogAdc.cpp similarity index 100% rename from src/modules/2.sensors/AnalogAdc/AnalogAdc.cpp rename to src/modules/sensors/AnalogAdc/AnalogAdc.cpp diff --git a/src/modules/2.sensors/AnalogAdc/modinfo.json b/src/modules/sensors/AnalogAdc/modinfo.json similarity index 100% rename from src/modules/2.sensors/AnalogAdc/modinfo.json rename to src/modules/sensors/AnalogAdc/modinfo.json diff --git a/src/modules/2.sensors/Bme280/Bme280.cpp b/src/modules/sensors/Bme280/Bme280.cpp similarity index 100% rename from src/modules/2.sensors/Bme280/Bme280.cpp rename to src/modules/sensors/Bme280/Bme280.cpp diff --git a/src/modules/2.sensors/Bme280/modinfo.json b/src/modules/sensors/Bme280/modinfo.json similarity index 100% rename from src/modules/2.sensors/Bme280/modinfo.json rename to src/modules/sensors/Bme280/modinfo.json diff --git a/src/modules/2.sensors/Bmp280/Bmp280.cpp b/src/modules/sensors/Bmp280/Bmp280.cpp similarity index 100% rename from src/modules/2.sensors/Bmp280/Bmp280.cpp rename to src/modules/sensors/Bmp280/Bmp280.cpp diff --git a/src/modules/2.sensors/Bmp280/modinfo.json b/src/modules/sensors/Bmp280/modinfo.json similarity index 100% rename from src/modules/2.sensors/Bmp280/modinfo.json rename to src/modules/sensors/Bmp280/modinfo.json diff --git a/src/modules/2.sensors/Dht1122/Dht1122.cpp b/src/modules/sensors/Dht1122/Dht1122.cpp similarity index 100% rename from src/modules/2.sensors/Dht1122/Dht1122.cpp rename to src/modules/sensors/Dht1122/Dht1122.cpp diff --git a/src/modules/2.sensors/Dht1122/modinfo.json b/src/modules/sensors/Dht1122/modinfo.json similarity index 100% rename from src/modules/2.sensors/Dht1122/modinfo.json rename to src/modules/sensors/Dht1122/modinfo.json diff --git a/src/modules/2.sensors/Ds18b20/Ds18b20.cpp b/src/modules/sensors/Ds18b20/Ds18b20.cpp similarity index 100% rename from src/modules/2.sensors/Ds18b20/Ds18b20.cpp rename to src/modules/sensors/Ds18b20/Ds18b20.cpp diff --git a/src/modules/2.sensors/Ds18b20/modinfo.json b/src/modules/sensors/Ds18b20/modinfo.json similarity index 100% rename from src/modules/2.sensors/Ds18b20/modinfo.json rename to src/modules/sensors/Ds18b20/modinfo.json diff --git a/src/modules/2.sensors/Emon/Emon.cpp b/src/modules/sensors/Emon/Emon.cpp similarity index 100% rename from src/modules/2.sensors/Emon/Emon.cpp rename to src/modules/sensors/Emon/Emon.cpp diff --git a/src/modules/2.sensors/Emon/modinfo.json b/src/modules/sensors/Emon/modinfo.json similarity index 100% rename from src/modules/2.sensors/Emon/modinfo.json rename to src/modules/sensors/Emon/modinfo.json diff --git a/src/modules/2.sensors/GY21/GY21.cpp b/src/modules/sensors/GY21/GY21.cpp similarity index 100% rename from src/modules/2.sensors/GY21/GY21.cpp rename to src/modules/sensors/GY21/GY21.cpp diff --git a/src/modules/2.sensors/GY21/modinfo.json b/src/modules/sensors/GY21/modinfo.json similarity index 100% rename from src/modules/2.sensors/GY21/modinfo.json rename to src/modules/sensors/GY21/modinfo.json diff --git a/src/modules/2.sensors/Hdc1080/Hdc1080.cpp b/src/modules/sensors/Hdc1080/Hdc1080.cpp similarity index 100% rename from src/modules/2.sensors/Hdc1080/Hdc1080.cpp rename to src/modules/sensors/Hdc1080/Hdc1080.cpp diff --git a/src/modules/2.sensors/Hdc1080/modinfo.json b/src/modules/sensors/Hdc1080/modinfo.json similarity index 100% rename from src/modules/2.sensors/Hdc1080/modinfo.json rename to src/modules/sensors/Hdc1080/modinfo.json diff --git a/src/modules/2.sensors/IoTWiegand/IoTWiegand.cpp b/src/modules/sensors/IoTWiegand/IoTWiegand.cpp similarity index 100% rename from src/modules/2.sensors/IoTWiegand/IoTWiegand.cpp rename to src/modules/sensors/IoTWiegand/IoTWiegand.cpp diff --git a/src/modules/2.sensors/IoTWiegand/modinfo.json b/src/modules/sensors/IoTWiegand/modinfo.json similarity index 100% rename from src/modules/2.sensors/IoTWiegand/modinfo.json rename to src/modules/sensors/IoTWiegand/modinfo.json diff --git a/src/modules/2.sensors/Max6675/Max6675.cpp b/src/modules/sensors/Max6675/Max6675.cpp similarity index 100% rename from src/modules/2.sensors/Max6675/Max6675.cpp rename to src/modules/sensors/Max6675/Max6675.cpp diff --git a/src/modules/2.sensors/Max6675/modinfo.json b/src/modules/sensors/Max6675/modinfo.json similarity index 100% rename from src/modules/2.sensors/Max6675/modinfo.json rename to src/modules/sensors/Max6675/modinfo.json diff --git a/src/modules/2.sensors/Mhz19/Mhz19.cpp b/src/modules/sensors/Mhz19/Mhz19.cpp similarity index 100% rename from src/modules/2.sensors/Mhz19/Mhz19.cpp rename to src/modules/sensors/Mhz19/Mhz19.cpp diff --git a/src/modules/2.sensors/Mhz19/modinfo.json b/src/modules/sensors/Mhz19/modinfo.json similarity index 100% rename from src/modules/2.sensors/Mhz19/modinfo.json rename to src/modules/sensors/Mhz19/modinfo.json diff --git a/src/modules/2.sensors/RCswitch/RCswitch.cpp b/src/modules/sensors/RCswitch/RCswitch.cpp similarity index 100% rename from src/modules/2.sensors/RCswitch/RCswitch.cpp rename to src/modules/sensors/RCswitch/RCswitch.cpp diff --git a/src/modules/2.sensors/RCswitch/modinfo.json b/src/modules/sensors/RCswitch/modinfo.json similarity index 100% rename from src/modules/2.sensors/RCswitch/modinfo.json rename to src/modules/sensors/RCswitch/modinfo.json diff --git a/src/modules/2.sensors/Sds011/Sds011.cpp b/src/modules/sensors/Sds011/Sds011.cpp similarity index 100% rename from src/modules/2.sensors/Sds011/Sds011.cpp rename to src/modules/sensors/Sds011/Sds011.cpp diff --git a/src/modules/2.sensors/Sds011/modinfo.json b/src/modules/sensors/Sds011/modinfo.json similarity index 100% rename from src/modules/2.sensors/Sds011/modinfo.json rename to src/modules/sensors/Sds011/modinfo.json diff --git a/src/modules/2.sensors/Sht20/Sht20.cpp b/src/modules/sensors/Sht20/Sht20.cpp similarity index 100% rename from src/modules/2.sensors/Sht20/Sht20.cpp rename to src/modules/sensors/Sht20/Sht20.cpp diff --git a/src/modules/2.sensors/Sht20/modinfo.json b/src/modules/sensors/Sht20/modinfo.json similarity index 100% rename from src/modules/2.sensors/Sht20/modinfo.json rename to src/modules/sensors/Sht20/modinfo.json diff --git a/src/modules/2.sensors/Sht30/Sht30.cpp b/src/modules/sensors/Sht30/Sht30.cpp similarity index 100% rename from src/modules/2.sensors/Sht30/Sht30.cpp rename to src/modules/sensors/Sht30/Sht30.cpp diff --git a/src/modules/2.sensors/Sht30/modinfo.json b/src/modules/sensors/Sht30/modinfo.json similarity index 100% rename from src/modules/2.sensors/Sht30/modinfo.json rename to src/modules/sensors/Sht30/modinfo.json diff --git a/src/modules/2.sensors/Sonar/Sonar.cpp b/src/modules/sensors/Sonar/Sonar.cpp similarity index 100% rename from src/modules/2.sensors/Sonar/Sonar.cpp rename to src/modules/sensors/Sonar/Sonar.cpp diff --git a/src/modules/2.sensors/Sonar/modinfo.json b/src/modules/sensors/Sonar/modinfo.json similarity index 100% rename from src/modules/2.sensors/Sonar/modinfo.json rename to src/modules/sensors/Sonar/modinfo.json diff --git a/src/modules/1.virtual/Timer/Timer.cpp b/src/modules/virtual/Timer/Timer.cpp similarity index 100% rename from src/modules/1.virtual/Timer/Timer.cpp rename to src/modules/virtual/Timer/Timer.cpp diff --git a/src/modules/1.virtual/Timer/modinfo.json b/src/modules/virtual/Timer/modinfo.json similarity index 100% rename from src/modules/1.virtual/Timer/modinfo.json rename to src/modules/virtual/Timer/modinfo.json diff --git a/src/modules/1.virtual/Variable/Variable.cpp b/src/modules/virtual/Variable/Variable.cpp similarity index 100% rename from src/modules/1.virtual/Variable/Variable.cpp rename to src/modules/virtual/Variable/Variable.cpp diff --git a/src/modules/1.virtual/Variable/modinfo.json b/src/modules/virtual/Variable/modinfo.json similarity index 100% rename from src/modules/1.virtual/Variable/modinfo.json rename to src/modules/virtual/Variable/modinfo.json