iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'platformio' into platformio

Browse Source
This commit is contained in:
Yuri Trikoz
2020-06-22 03:18:19 +03:00
committed by GitHub
parent 092bec7dde 4967f66238
commit 8cdc271c48
6 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/configs/14-dallas.c.txt
View File

@@ -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 - номер пина датчика

2
data/configs/16-ultrasonic.c.txt
View File

@@ -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

4
include/Global.h
View File

@@ -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
*/

8
src/Cmd.cpp
View File

@@ -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;
}
//=====================================================================================================================================

2
src/Global.cpp
View File

@@ -22,6 +22,8 @@ AsyncWebServer server(80);
DallasTemperature sensors;
/*
* Global vars
*/

14
src/Sensors.cpp
View File

@@ -5,13 +5,13 @@ GMedian<10, int> medianFilter;
DHTesp dht;
Adafruit_BMP280 bmp;
Adafruit_Sensor *bmp_temp;
Adafruit_Sensor *bmp_pressure;
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_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();