|
@@ -5,7 +5,6 @@ bool serverStarted = false;
|
|
HttpServer server;
|
|
HttpServer server;
|
|
|
|
|
|
extern float SensorT, SensorH, SensorHI, SensorCR;
|
|
extern float SensorT, SensorH, SensorHI, SensorCR;
|
|
-extern uint32_t SensorLux;
|
|
|
|
extern String StrCF;
|
|
extern String StrCF;
|
|
extern time_t NTPLastUpdate;
|
|
extern time_t NTPLastUpdate;
|
|
|
|
|
|
@@ -19,7 +18,6 @@ void onIndex(HttpRequest& request, HttpResponse& response)
|
|
vars["HI"] = String(SensorHI, 0);
|
|
vars["HI"] = String(SensorHI, 0);
|
|
vars["CR"] = String(SensorCR, 0);
|
|
vars["CR"] = String(SensorCR, 0);
|
|
vars["CF"] = StrCF; // это первое место, где оно используется
|
|
vars["CF"] = StrCF; // это первое место, где оно используется
|
|
- vars["LUX"] = String((float)SensorLux/1000, 3);
|
|
|
|
vars["VDD"] = String(system_get_vdd33 ());
|
|
vars["VDD"] = String(system_get_vdd33 ());
|
|
vars["LASTNTP"] = String (SystemClock.now () - NTPLastUpdate);
|
|
vars["LASTNTP"] = String (SystemClock.now () - NTPLastUpdate);
|
|
|
|
|
|
@@ -144,7 +142,6 @@ void onApiSensors(HttpRequest& request, HttpResponse& response)
|
|
sensors["heatindex"] = String(SensorHI, 2);
|
|
sensors["heatindex"] = String(SensorHI, 2);
|
|
sensors["comfortp"] = String(SensorCR, 2);
|
|
sensors["comfortp"] = String(SensorCR, 2);
|
|
sensors["comforts"] = StrCF.c_str (); //??? второе место
|
|
sensors["comforts"] = StrCF.c_str (); //??? второе место
|
|
- sensors["luxvalue"] = String(SensorLux, 0);
|
|
|
|
sensors["vddvalue"] = String(system_get_vdd33 ());
|
|
sensors["vddvalue"] = String(system_get_vdd33 ());
|
|
time_t now = SystemClock.now();
|
|
time_t now = SystemClock.now();
|
|
sensors["datetime"] = String(now);
|
|
sensors["datetime"] = String(now);
|