diff --git a/.gitignore b/.gitignore index d74a9041..b9f3806a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ .pio .vscode -/myProfile_wm.json diff --git a/data_svelte/items.json b/data_svelte/items.json index ed78c67e..f8cc2674 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -399,45 +399,7 @@ }, { "global": 0, - "name": "27. DS2423 счетчик 1", - "type": "Reading", - "subtype": "Ds2423a", - "id": "dscounta", - "widget": "anydataDef", - "page": "Счетчики", - "descr": "DS1 V", - "plus": 0, - "multiply": 1, - "pin": 4, - "index": 0, - "addr": "", - "int": 10, - "round": 0, - "needSave": 0, - "num": 27 - }, - { - "global": 0, - "name": "28. DS2423 счетчик 2", - "type": "Reading", - "subtype": "Ds2423b", - "id": "dscountb", - "widget": "anydataDef", - "page": "Счетчики", - "descr": "DS2 V", - "plus": 0, - "multiply": 1, - "pin": 4, - "index": 0, - "addr": "", - "int": 10, - "round": 0, - "needSave": 0, - "num": 28 - }, - { - "global": 0, - "name": "29. Аналоговый счетчик импульсов", + "name": "27. Аналоговый счетчик импульсов", "type": "Writing", "subtype": "Impulse", "id": "impulse", @@ -450,32 +412,11 @@ "pinMode": "INPUT", "debounceDelay": 3, "multiply": 1, - "num": 29 + "num": 27 }, { "global": 0, - "name": "30. Cенсор температуры NTC", - "type": "Reading", - "subtype": "Ntc", - "id": "Ntctmp", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "NTC Температура", - "needSave": 0, - "val": "0", - "int": 15, - "pin": "35", - "R1": "10000", - "R0": "10000", - "Beta": "3950.0", - "T0": "25", - "Vs": "3.3", - "round": 1, - "num": 30 - }, - { - "global": 0, - "name": "31. PZEM 004t Напряжение", + "name": "28. PZEM 004t Напряжение", "type": "Reading", "subtype": "Pzem004v", "id": "v", @@ -485,11 +426,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 31 + "num": 28 }, { "global": 0, - "name": "32. PZEM 004t Сила тока", + "name": "29. PZEM 004t Сила тока", "type": "Reading", "subtype": "Pzem004a", "id": "a", @@ -499,11 +440,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 32 + "num": 29 }, { "global": 0, - "name": "33. PZEM 004t Мощность", + "name": "30. PZEM 004t Мощность", "type": "Reading", "subtype": "Pzem004w", "id": "w", @@ -513,11 +454,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 33 + "num": 30 }, { "global": 0, - "name": "34. PZEM 004t Энергия", + "name": "31. PZEM 004t Энергия", "type": "Reading", "subtype": "Pzem004wh", "id": "wh", @@ -527,11 +468,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 34 + "num": 31 }, { "global": 0, - "name": "35. PZEM 004t Частота", + "name": "32. PZEM 004t Частота", "type": "Reading", "subtype": "Pzem004hz", "id": "hz", @@ -541,11 +482,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 35 + "num": 32 }, { "global": 0, - "name": "36. PZEM 004t Косинус", + "name": "33. PZEM 004t Косинус", "type": "Reading", "subtype": "Pzem004pf", "id": "pf", @@ -555,11 +496,11 @@ "int": 15, "addr": "0xF8", "round": 1, - "num": 36 + "num": 33 }, { "global": 0, - "name": "37. PZEM настройка", + "name": "34. PZEM настройка", "type": "Reading", "subtype": "Pzem004cmd", "id": "set", @@ -571,11 +512,11 @@ "changeaddr": 0, "setaddr": "0x01", "reset": 0, - "num": 37 + "num": 34 }, { "global": 0, - "name": "38. Часы реального времени", + "name": "35. Часы реального времени", "type": "Reading", "subtype": "RTC", "id": "rtc", @@ -591,11 +532,11 @@ "int": 5, "btn-setUTime": "0", "btn-setSysTime": "nil", - "num": 38 + "num": 35 }, { - "name": "39. (S8) Cенсор качества воздуха", - "num": 39, + "name": "36. (S8) Cенсор качества воздуха", + "num": 36, "type": "Reading", "subtype": "S8co", "id": "s8co", @@ -609,50 +550,7 @@ }, { "global": 0, - "name": "40. SCD40 Углекислый газ", - "type": "Reading", - "subtype": "Scd40co2", - "id": "Scd40co2", - "widget": "anydataPpm", - "page": "Сенсоры", - "descr": "SCD40 Углекислый газ", - "int": 15, - "round": 0, - "lowPeriodic": 1, - "autoCalibration": 1, - "btn-Recalibration": 0, - "num": 40 - }, - { - "global": 0, - "name": "41. SCD40 Влажность", - "type": "Reading", - "subtype": "Scd40h", - "id": "Scd40h", - "widget": "anydataHum", - "page": "Сенсоры", - "descr": "SCD40 Влажность", - "int": 15, - "round": 1, - "num": 41 - }, - { - "global": 0, - "name": "42. SCD40 Температура", - "type": "Reading", - "subtype": "Scd40t", - "id": "Scd40t", - "widget": "anydataTmp", - "page": "Сенсоры", - "descr": "SCD40 Температура", - "int": 15, - "round": 1, - "offset": 4, - "num": 42 - }, - { - "global": 0, - "name": "43. Sht20 Температура", + "name": "37. Sht20 Температура", "type": "Reading", "subtype": "Sht20t", "id": "tmp2", @@ -661,11 +559,11 @@ "descr": "Температура", "int": 15, "round": 1, - "num": 43 + "num": 37 }, { "global": 0, - "name": "44. Sht20 Влажность", + "name": "38. Sht20 Влажность", "type": "Reading", "subtype": "Sht20h", "id": "Hum2", @@ -674,11 +572,11 @@ "descr": "Влажность", "int": 15, "round": 1, - "num": 44 + "num": 38 }, { "global": 0, - "name": "45. Sht30 Температура", + "name": "39. Sht30 Температура", "type": "Reading", "subtype": "Sht30t", "id": "tmp30", @@ -687,11 +585,11 @@ "descr": "SHT30 Температура", "int": 15, "round": 1, - "num": 45 + "num": 39 }, { "global": 0, - "name": "46. Sht30 Влажность", + "name": "40. Sht30 Влажность", "type": "Reading", "subtype": "Sht30h", "id": "Hum30", @@ -700,12 +598,12 @@ "descr": "SHT30 Влажность", "int": 15, "round": 1, - "num": 46 + "num": 40 }, { "global": 0, - "name": "47. HC-SR04 Ультразвуковой дальномер", - "num": 47, + "name": "41. HC-SR04 Ультразвуковой дальномер", + "num": 41, "type": "Reading", "subtype": "Sonar", "id": "sonar", @@ -717,7 +615,7 @@ "int": 5 }, { - "name": "48. UART", + "name": "42. UART", "type": "Reading", "subtype": "UART", "page": "", @@ -729,14 +627,14 @@ "line": 2, "speed": 9600, "eventFormat": 0, - "num": 48 + "num": 42 }, { "header": "Исполнительные устройства" }, { "global": 0, - "name": "49. Кнопка подключенная к пину", + "name": "43. Кнопка подключенная к пину", "type": "Writing", "subtype": "ButtonIn", "id": "btn", @@ -751,11 +649,11 @@ "debounceDelay": 50, "fixState": 0, "inv": 0, - "num": 49 + "num": 43 }, { "global": 0, - "name": "50. Управление пином", + "name": "44. Управление пином", "type": "Writing", "subtype": "ButtonOut", "needSave": 0, @@ -766,11 +664,11 @@ "int": 0, "inv": 0, "pin": 2, - "num": 50 + "num": 44 }, { "global": 0, - "name": "51. Пассивный звуковой извещатель", + "name": "45. Пассивный звуковой извещатель", "type": "Writing", "subtype": "Buzzer", "id": "buzzer", @@ -789,11 +687,11 @@ "cycle": 0, "indication": 1, "val": 0, - "num": 51 + "num": 45 }, { "global": 0, - "name": "52. Энкодер", + "name": "46. Энкодер", "type": "Writing", "subtype": "Encoder", "id": "enc", @@ -806,11 +704,11 @@ "step": 1, "stepOnPress": 5, "pins": "4,5,2", - "num": 52 + "num": 46 }, { "global": 0, - "name": "53. Сервопривод", + "name": "47. Сервопривод", "type": "Writing", "subtype": "IoTServo", "id": "servo", @@ -821,11 +719,11 @@ "pin": 12, "apin": -1, "amap": "0, 4096, 0, 180", - "num": 53 + "num": 47 }, { "global": 0, - "name": "54. Расширитель портов Mcp23017", + "name": "48. Расширитель портов Mcp23017", "type": "Reading", "subtype": "Mcp23017", "id": "Mcp", @@ -835,11 +733,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 54 + "num": 48 }, { "global": 0, - "name": "55. MP3 плеер", + "name": "49. MP3 плеер", "type": "Reading", "subtype": "Mp3", "id": "mp3", @@ -849,11 +747,11 @@ "int": 1, "pins": "14,12", "volume": 20, - "num": 55 + "num": 49 }, { "global": 0, - "name": "56. Сенсорная кнопка", + "name": "50. Сенсорная кнопка", "type": "Writing", "subtype": "Multitouch", "id": "impulse", @@ -867,11 +765,11 @@ "pinMode": "INPUT", "debounceDelay": 50, "PWMDelay": 500, - "num": 56 + "num": 50 }, { "global": 0, - "name": "57. Расширитель портов Pcf8574", + "name": "51. Расширитель портов Pcf8574", "type": "Reading", "subtype": "Pcf8574", "id": "Pcf", @@ -881,11 +779,11 @@ "int": "0", "addr": "0x20", "index": 1, - "num": 57 + "num": 51 }, { "global": 0, - "name": "58. PWM ESP8266", + "name": "52. PWM ESP8266", "type": "Writing", "subtype": "Pwm8266", "id": "pwm", @@ -897,11 +795,11 @@ "freq": 5000, "val": 0, "apin": -1, - "num": 58 + "num": 52 }, { "global": 0, - "name": "59. Телеграм-Лайт", + "name": "53. Телеграм-Лайт", "type": "Writing", "subtype": "TelegramLT", "id": "tg", @@ -910,14 +808,14 @@ "descr": "", "token": "", "chatID": "", - "num": 59 + "num": 53 }, { "header": "Экраны" }, { "global": 0, - "name": "60. LCD экран 2004", + "name": "54. LCD экран 2004", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -929,10 +827,10 @@ "size": "20,4", "coord": "0,0", "id2show": "id датчика", - "num": 60 + "num": 54 }, { - "name": "61. LCD экран 1602", + "name": "55. LCD экран 1602", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -944,6 +842,6 @@ "size": "16,2", "coord": "0,0", "id2show": "id датчика", - "num": 61 + "num": 55 } ] \ No newline at end of file diff --git a/data_svelte/myProfile.json b/data_svelte/myProfile.json index 01261688..5db9116e 100644 --- a/data_svelte/myProfile.json +++ b/data_svelte/myProfile.json @@ -118,7 +118,7 @@ }, { "path": "src/modules/sensors/Ds2423", - "active": true + "active": false }, { "path": "src/modules/sensors/Emon", @@ -160,6 +160,10 @@ "path": "src/modules/sensors/IoTWiegand", "active": false }, + { + "path": "src/modules/sensors/ld2410", + "active": false + }, { "path": "src/modules/sensors/Max6675", "active": false @@ -170,7 +174,7 @@ }, { "path": "src/modules/sensors/Ntc", - "active": true + "active": false }, { "path": "src/modules/sensors/Pzem004t", @@ -190,7 +194,7 @@ }, { "path": "src/modules/sensors/Scd40", - "active": true + "active": false }, { "path": "src/modules/sensors/Sds011", @@ -238,6 +242,10 @@ "path": "src/modules/exec/EspCam", "active": false }, + { + "path": "src/modules/exec/Ftp", + "active": false + }, { "path": "src/modules/exec/HttpGet", "active": false @@ -312,6 +320,10 @@ "path": "src/modules/display/NextionUpload", "active": false }, + { + "path": "src/modules/display/Smi2_m", + "active": true + }, { "path": "src/modules/display/Ws2812b", "active": false diff --git a/data_svelte_lite/index.html b/data_svelte_lite/index.html index 538417e1..42845542 100644 --- a/data_svelte_lite/index.html +++ b/data_svelte_lite/index.html @@ -8,14 +8,14 @@