diff --git a/data/configs/14-dallas.c.txt b/data/configs/14-dallas.c.txt index e6686b14..e76ce5d6 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 - номер пина датчика 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 diff --git a/include/Global.h b/include/Global.h index e4fe7f82..fd2242bd 100644 --- a/include/Global.h +++ b/include/Global.h @@ -15,6 +15,7 @@ #include "GyverFilters.h" #include "UptimeInterval.h" #include "Clock.h" + #include "Utils\FileUtils.h" #include "Utils\JsonUtils.h" #include "Utils\StringUtils.h" @@ -60,6 +61,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 005c35d5..944be403 100644 --- a/src/Cmd.cpp +++ b/src/Cmd.cpp @@ -1,11 +1,11 @@ #include "Global.h" +boolean but[NUM_BUTTONS]; +Bounce *buttons = new Bounce[NUM_BUTTONS]; + Servo myServo1; Servo myServo2; -boolean but[NUM_BUTTONS]; -Bounce *buttons; - void CMD_init() { sCmd.addCommand("button", button); sCmd.addCommand("buttonSet", buttonSet); @@ -257,7 +257,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 d4b9b154..6018191f 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -22,6 +22,8 @@ AsyncWebServer server(80); DallasTemperature sensors; + + /* * Global vars */ diff --git a/src/Sensors.cpp b/src/Sensors.cpp index 74422070..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(); @@ -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();