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/7] =?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/7] =?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/7] 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/7] 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 - номер пина датчика From b53660d4bfc1b72cc79b3efae36e34a858b78955 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sun, 21 Jun 2020 16:47:50 +0200 Subject: [PATCH 5/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D1=84=D0=B8=D0=B7=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=BE=D0=B9=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20(=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B8=D0=BB=20?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/Global.h | 3 +++ src/Cmd.cpp | 5 +---- src/Global.cpp | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/Global.h b/include/Global.h index 78e771c0..556ac2c5 100644 --- a/include/Global.h +++ b/include/Global.h @@ -56,6 +56,9 @@ extern AsyncWebServer server; extern DallasTemperature sensors; +extern boolean but[NUM_BUTTONS]; +extern Bounce *buttons; + /* * Global vars */ diff --git a/src/Cmd.cpp b/src/Cmd.cpp index 93ec23cc..8ddfb8b9 100644 --- a/src/Cmd.cpp +++ b/src/Cmd.cpp @@ -3,9 +3,6 @@ Servo myServo1; Servo myServo2; -boolean but[NUM_BUTTONS]; -Bounce *buttons; - void CMD_init() { sCmd.addCommand("button", button); sCmd.addCommand("buttonSet", buttonSet); @@ -257,7 +254,7 @@ void handleButton() { } } switch_number++; - if (switch_number == 6) switch_number = 0; + if (switch_number == NUM_BUTTONS) switch_number = 0; } //===================================================================================================================================== diff --git a/src/Global.cpp b/src/Global.cpp index 1aff5ed0..27ea46bf 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -21,6 +21,9 @@ AsyncWebServer server(80); DallasTemperature sensors; +boolean but[NUM_BUTTONS]; +Bounce *buttons = new Bounce[NUM_BUTTONS]; + /* * Global vars */ From c9c8fc0a317bcb1dec464d2e68991951cae12719 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sun, 21 Jun 2020 17:50:10 +0200 Subject: [PATCH 6/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE!!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/Global.h | 1 + src/Cmd.cpp | 3 +++ src/Global.cpp | 3 +-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/Global.h b/include/Global.h index 556ac2c5..872712a9 100644 --- a/include/Global.h +++ b/include/Global.h @@ -13,6 +13,7 @@ #include "Errors.h" #include "GyverFilters.h" #include "UptimeInterval.h" + #include "Utils\FileUtils.h" #include "Utils\JsonUtils.h" #include "Utils\StringUtils.h" diff --git a/src/Cmd.cpp b/src/Cmd.cpp index 8ddfb8b9..189a6b6f 100644 --- a/src/Cmd.cpp +++ b/src/Cmd.cpp @@ -1,5 +1,8 @@ #include "Global.h" +boolean but[NUM_BUTTONS]; +Bounce *buttons = new Bounce[NUM_BUTTONS]; + Servo myServo1; Servo myServo2; diff --git a/src/Global.cpp b/src/Global.cpp index 27ea46bf..2d5160c3 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -21,8 +21,7 @@ AsyncWebServer server(80); DallasTemperature sensors; -boolean but[NUM_BUTTONS]; -Bounce *buttons = new Bounce[NUM_BUTTONS]; + /* * Global vars From 3a3d27492b8665ad7838870917b9a8ba301976b0 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sun, 21 Jun 2020 18:10:14 +0200 Subject: [PATCH 7/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20bmp280?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Sensors.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Sensors.cpp b/src/Sensors.cpp index 0786c93e..bcdd525c 100644 --- a/src/Sensors.cpp +++ b/src/Sensors.cpp @@ -4,14 +4,14 @@ OneWire *oneWire; GMedian<10, int> medianFilter; DHTesp dht; -Adafruit_BMP280 bmp; -Adafruit_Sensor *bmp_temp; -Adafruit_Sensor *bmp_pressure; +Adafruit_BMP280 bmp; +Adafruit_Sensor *bmp_temp = bmp.getTemperatureSensor(); +Adafruit_Sensor *bmp_pressure = bmp.getPressureSensor(); -Adafruit_BME280 bme; -Adafruit_Sensor *bme_temp; -Adafruit_Sensor *bme_pressure; -Adafruit_Sensor *bme_humidity; +Adafruit_BME280 bme; +Adafruit_Sensor *bme_temp = bme.getTemperatureSensor(); +Adafruit_Sensor *bme_pressure = bme.getPressureSensor(); +Adafruit_Sensor *bme_humidity = bme.getHumiditySensor(); String perception(byte value); void bmp280T_reading();