diff --git a/include/Global.h b/include/Global.h index 19c43cfa..331d95cd 100644 --- a/include/Global.h +++ b/include/Global.h @@ -298,7 +298,7 @@ extern void sensors_init(); extern void levelPr(); extern void ultrasonicCm(); -extern void level_reading(); +extern void ultrasonic_reading(); extern void analog(); diff --git a/src/Global.cpp b/src/Global.cpp index a190e014..337258c6 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -37,7 +37,8 @@ String order_loop; String analog_value_names_list; int enter_to_analog_counter; -String level_value_name; +String levelPr_value_name; +String ultrasonicCm_value_name; String dhtT_value_name; String dhtH_value_name; diff --git a/src/Sensors.cpp b/src/Sensors.cpp index 3a27aad4..badfc9a2 100644 --- a/src/Sensors.cpp +++ b/src/Sensors.cpp @@ -13,7 +13,7 @@ void sensors_init() { #ifdef level_enable if (sensors_reading_map[0] == 1) - level_reading(); + ultrasonic_reading(); #endif if (counter > 10) { @@ -387,13 +387,12 @@ void dhtC() { sensors_reading_map[7] = 1; } -void dhtC_reading() { - float value; +void dhtC_reading() { ComfortState cf; if (dht.getStatus() != 0) { sendSTATUS("dhtComfort", String(dht.getStatusString())); } 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); jsonWriteStr(configLiveJson, "dhtComfort", final_line); eventGen("dhtComfort", "");