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

changed

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-06-19 15:22:22 +02:00
parent 48ba3c99dd
commit 446809355b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Global.h
View File

@@ -298,7 +298,7 @@ extern void sensors_init();
extern void levelPr(); extern void levelPr();
extern void ultrasonicCm(); extern void ultrasonicCm();
extern void level_reading(); extern void ultrasonic_reading();
extern void analog(); extern void analog();

3
src/Global.cpp
View File

@@ -37,7 +37,8 @@ String order_loop;
String analog_value_names_list; String analog_value_names_list;
int enter_to_analog_counter; int enter_to_analog_counter;
String level_value_name; String levelPr_value_name;
String ultrasonicCm_value_name;
String dhtT_value_name; String dhtT_value_name;
String dhtH_value_name; String dhtH_value_name;

7
src/Sensors.cpp
View File

@@ -13,7 +13,7 @@ void sensors_init() {
#ifdef level_enable #ifdef level_enable
if (sensors_reading_map[0] == 1) if (sensors_reading_map[0] == 1)
level_reading(); ultrasonic_reading();
#endif #endif
if (counter > 10) { if (counter > 10) {
@@ -387,13 +387,12 @@ void dhtC() {
sensors_reading_map[7] = 1; sensors_reading_map[7] = 1;
} }
void dhtC_reading() { void dhtC_reading() {
float value;
ComfortState cf; ComfortState cf;
if (dht.getStatus() != 0) { if (dht.getStatus() != 0) {
sendSTATUS("dhtComfort", String(dht.getStatusString())); sendSTATUS("dhtComfort", String(dht.getStatusString()));
} else { } else {
value = dht.getComfortRatio(cf, jsonReadStr(configLiveJson, dhtT_value_name).toFloat(), jsonReadStr(configLiveJson, dhtH_value_name).toFloat(), false); float value = dht.getComfortRatio(cf, jsonReadStr(configLiveJson, dhtT_value_name).toFloat(), jsonReadStr(configLiveJson, dhtH_value_name).toFloat(), false);
String final_line = get_comfort_status(cf); String final_line = get_comfort_status(cf);
jsonWriteStr(configLiveJson, "dhtComfort", final_line); jsonWriteStr(configLiveJson, "dhtComfort", final_line);
eventGen("dhtComfort", ""); eventGen("dhtComfort", "");