From fc567c2f4ad9b3c02205dc1a3342c6c2b192673e Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 26 May 2020 17:54:18 +0200 Subject: [PATCH 1/8] Update set.h --- set.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/set.h b/set.h index 01e9cca9..7cb62348 100644 --- a/set.h +++ b/set.h @@ -1,4 +1,10 @@ +<<<<<<< Updated upstream //===============FIRMWARE SETTINGS===================================== +======= +/******************************************************************* + **********************FIRMWARE SETTINGS**************************** + ******************************************************************/ +>>>>>>> Stashed changes String firmware_version = "2.3.3"; boolean mb_4_of_memory = true; //#define OTA_enable From 99a17e4a0c1eed043f28b5d2459ce75a6cc6171c Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 26 May 2020 18:08:55 +0200 Subject: [PATCH 2/8] some --- set.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/set.h b/set.h index 5c0e7d3f..0df81dd1 100644 --- a/set.h +++ b/set.h @@ -1,9 +1,6 @@ -//===============FIRMWARE SETTINGS===================================== -======= /******************************************************************* **********************FIRMWARE SETTINGS**************************** ******************************************************************/ - String firmware_version = "2.3.3"; boolean mb_4_of_memory = true; //#define OTA_enable @@ -12,11 +9,11 @@ boolean mb_4_of_memory = true; //#define layout_in_ram #define UDP_enable /*==========================SENSORS===============================*/ -#define level_enable -#define analog_enable -#define dallas_enable -#define dht_enable //подъедает оперативку сука -#define bmp_enable +//#define level_enable +//#define analog_enable +//#define dallas_enable +//#define dht_enable //подъедает оперативку сука +//#define bmp_enable #define bme_enable /*=========================LOGGING================================*/ #define logging_enable From 130a7fef0bc20f34729d937b584b57d039fe9d25 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 26 May 2020 18:12:05 +0200 Subject: [PATCH 3/8] manage parts of firmware --- set.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/set.h b/set.h index 0df81dd1..00a94f64 100644 --- a/set.h +++ b/set.h @@ -9,11 +9,11 @@ boolean mb_4_of_memory = true; //#define layout_in_ram #define UDP_enable /*==========================SENSORS===============================*/ -//#define level_enable -//#define analog_enable -//#define dallas_enable -//#define dht_enable //подъедает оперативку сука -//#define bmp_enable +#define level_enable +#define analog_enable +#define dallas_enable +#define dht_enable //подъедает оперативку сука +#define bmp_enable #define bme_enable /*=========================LOGGING================================*/ #define logging_enable From 996af08d6e4268e0a2f086c71aaa61c6af1986f6 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 26 May 2020 18:18:51 +0200 Subject: [PATCH 4/8] bme pressure bug fixed --- Sensors.ino | 1 + 1 file changed, 1 insertion(+) diff --git a/Sensors.ino b/Sensors.ino index 822949a0..6f234457 100644 --- a/Sensors.ino +++ b/Sensors.ino @@ -501,6 +501,7 @@ void bme280P() { void bme280P_reading() { float value = 0; value = bme.readPressure(); + value = value / 1.333224; jsonWriteStr(configJson, bme280P_value_name, String(value)); eventGen(bme280P_value_name, ""); sendSTATUS(bme280P_value_name, String(value)); From cf182b2fe71c370ec2d7cedde6c12f092c19ca2b Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 26 May 2020 18:19:04 +0200 Subject: [PATCH 5/8] some changes --- esp32-esp8266_iot-manager_modules_firmware.ino | 2 -- 1 file changed, 2 deletions(-) diff --git a/esp32-esp8266_iot-manager_modules_firmware.ino b/esp32-esp8266_iot-manager_modules_firmware.ino index 005f0a38..2d4b9031 100644 --- a/esp32-esp8266_iot-manager_modules_firmware.ino +++ b/esp32-esp8266_iot-manager_modules_firmware.ino @@ -46,10 +46,8 @@ void setup() { ts.add(TEST, 10000, [&](void*) { - getMemoryLoad("[i] periodic check of"); //ws.textAll(json); - }, nullptr, true); From 44dec6aece0f036fdabeced3ef2f8e2074c71a78 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Thu, 28 May 2020 10:30:36 +0200 Subject: [PATCH 6/8] Readme update --- README.md | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 901dc9b8..1cc044a3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,33 @@ # esp32-esp8266_iot-manager_modules_firmware -Это модульная система автоматизации на базе ESP32/ESP8266 микроконтроллеров и приложения IoT Manager. -Cмотрите страницу wiki для информации + +It is based on esp8266 and esp32 automation system. Each module has a web interface for its initial configuration. The modules are managed using the "iot manager" application. This application is released for both android and ios platform. The application connects to a MQTT broker, you can add several brokers and switch between them. All modules also connect to same broker. All esp8266 esp32 are combined and appear in the application as widgets. + +There are two configuration options in the web interface of the modules: + +1. Select a ready-made preset. + +The following presets are available: + +-On off relay +-On off relay according to the schedule specified in the application +-On off the relay after a period of time specified in the application +-On off relay groups on different devices with one button in the application +-Light switch module +-PWM controlled by the slider in the application +-Reading and logging analog input into graph with scaling function +-Reading and logging in the graph of the following sensors: + +DHT22, DHT33, DHT44, AM2302, RHT03 +DS18B20 +JSN-SR04T, HC-SR04, HY-SRF05 +BME280 BMP280 and other i2c sensors + +-ds18b20 termostat controlled from application with graph (you can use any sensor for termostat any other supported). + +2. Configure with special scripts. A simple programming language was invented which can very flexibly configure the module. + +People who do not know how to program can use ready-made presets (option 1), and people who want to play with the system can use scripts (option 2). + +Scenarios: + +The web interface has the ability to configure Scenarios. An event occurs on one esp, and a reaction to this event can setup to occurs on another. From 2bc3c44b648332dca52952a536f0483e1fe92ffc Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Thu, 28 May 2020 10:32:40 +0200 Subject: [PATCH 7/8] Update eng --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1cc044a3..b3c7ca49 100644 --- a/README.md +++ b/README.md @@ -31,3 +31,7 @@ People who do not know how to program can use ready-made presets (option 1), and Scenarios: The web interface has the ability to configure Scenarios. An event occurs on one esp, and a reaction to this event can setup to occurs on another. + +Logging of sensors data in this project made with out any server. All data for graf storring in esp flash. You can look any time your sensor history for 2 - 3 days or week in mobile app in graf. And for this option needed only esp. + + From 03f0d563eed9803f7dc79649e76f9d57ea3ede2c Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Thu, 28 May 2020 15:54:48 +0200 Subject: [PATCH 8/8] Update README.md --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b3c7ca49..9c112b87 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ There are two configuration options in the web interface of the modules: The following presets are available: --On off relay --On off relay according to the schedule specified in the application --On off the relay after a period of time specified in the application --On off relay groups on different devices with one button in the application --Light switch module --PWM controlled by the slider in the application --Reading and logging analog input into graph with scaling function --Reading and logging in the graph of the following sensors: +- On off relay +- On off relay according to the schedule specified in the application +- On off the relay after a period of time specified in the application +- On off relay groups on different devices with one button in the application +- Light switch module +- PWM controlled by the slider in the application +- Reading and logging analog input into graph with scaling function +- Reading and logging in the graph of the following sensors: DHT22, DHT33, DHT44, AM2302, RHT03 DS18B20