From c670d0cb58ecf779c2f6e29485bc041b0f4ae767 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sun, 21 Jun 2020 15:58:54 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BB=D0=B8=D0=BD=D0=B8=D1=8E=20=D0=BD=D0=B0=20=D0=B4=D0=B0?= =?UTF-8?q?=D0=BB=D0=BB=D0=B0=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/configs/14-dallas.c.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/configs/14-dallas.c.txt b/data/configs/14-dallas.c.txt index e6686b14..916030f9 100644 --- a/data/configs/14-dallas.c.txt +++ b/data/configs/14-dallas.c.txt @@ -1,4 +1,4 @@ -dallas 2 Водонагреватель,#t°C Датчики any-data 1 +dallas temp1 2 123456 Водонагреватель,#t°C Термостат any-data 1 logging dallas 1 100 Температура Датчики 2 //2 - номер пина датчика From 9a5172e4a6fb2ab67ac031f248b940b078818d7a Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sun, 21 Jun 2020 16:22:13 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=83=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=83=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/configs/16-ultrasonic.c.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/configs/16-ultrasonic.c.txt b/data/configs/16-ultrasonic.c.txt index 4eacdf30..1d460a0b 100644 --- a/data/configs/16-ultrasonic.c.txt +++ b/data/configs/16-ultrasonic.c.txt @@ -1,4 +1,4 @@ -ultrasonicPr p 14 12 Уровень#в#баке,#% Датчики fill-gauge 125 25 1 +levelPr p 14 12 Уровень#в#баке,#% Датчики fill-gauge 125 25 1 ultrasonicCm cm 14 12 Дистанция,#см Датчики any-data 2 inputDigit digit1 При#скольки#выключить? Датчики 95 3 inputDigit digit2 При#скольки#включить? Датчики 10 4 From 63e34bf2e21da2408644eb98887d543f3df8d6b6 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sun, 21 Jun 2020 16:27:02 +0200 Subject: [PATCH 3/4] change dallas --- src/Sensors.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Sensors.cpp b/src/Sensors.cpp index 74422070..0786c93e 100644 --- a/src/Sensors.cpp +++ b/src/Sensors.cpp @@ -228,9 +228,9 @@ void analog_reading2() { //=========================================Модуль температурного сенсора ds18b20=========================================================== #ifdef DALLAS_ENABLED void dallas() { - //String value_name = sCmd.next(); + String value_name = sCmd.next(); String pin = sCmd.next(); - //String address = sCmd.next(); + String address = sCmd.next(); String widget_name = sCmd.next(); String page_name = sCmd.next(); String type = sCmd.next(); From f2aabd0349fbc93ccca0f66ac72a19f2db41cc16 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sun, 21 Jun 2020 16:29:30 +0200 Subject: [PATCH 4/4] change --- data/configs/14-dallas.c.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/configs/14-dallas.c.txt b/data/configs/14-dallas.c.txt index 916030f9..e76ce5d6 100644 --- a/data/configs/14-dallas.c.txt +++ b/data/configs/14-dallas.c.txt @@ -1,4 +1,4 @@ -dallas temp1 2 123456 Водонагреватель,#t°C Термостат any-data 1 +dallas temp1 2 123456 Водонагреватель,#t°C Датчики any-data 1 logging dallas 1 100 Температура Датчики 2 //2 - номер пина датчика