|
|
@ -62,37 +62,6 @@ void reconect() { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// prepare a web page to be send to a client (web browser)
|
|
|
|
|
|
String prepareHtmlPage() |
|
|
|
|
|
{ |
|
|
|
|
|
String htmlPage; |
|
|
|
|
|
htmlPage.reserve(1024); // prevent ram fragmentation
|
|
|
|
|
|
htmlPage = F("HTTP/1.1 200 OK\r\n" |
|
|
|
|
|
"Content-Type: text/html\r\n" |
|
|
|
|
|
"Connection: close\r\n" // the connection will be closed after completion of the response
|
|
|
|
|
|
"Refresh: 5\r\n" // refresh the page automatically every 5 sec
|
|
|
|
|
|
"\r\n" |
|
|
|
|
|
"<!DOCTYPE HTML>" |
|
|
|
|
|
"<html>"); |
|
|
|
|
|
htmlPage += F("</p>" |
|
|
|
|
|
"<p><b>Temperatura unutra:</b> "); |
|
|
|
|
|
htmlPage += global_temp_indoor; |
|
|
|
|
|
htmlPage += F("</p>" |
|
|
|
|
|
"<p><b>Vlaznost unutra:</b> "); |
|
|
|
|
|
htmlPage += global_hym_indoor; |
|
|
|
|
|
|
|
|
|
|
|
htmlPage += F("</p>" |
|
|
|
|
|
"<p><b>Temperatura vani:</b> "); |
|
|
|
|
|
htmlPage += global_temp_outdoor; |
|
|
|
|
|
htmlPage += F("</p>" |
|
|
|
|
|
"<p><b>Vlaznost vani:</b> "); |
|
|
|
|
|
htmlPage += global_hym_outdoor; |
|
|
|
|
|
|
|
|
|
|
|
htmlPage += F("</html>" |
|
|
|
|
|
"\r\n"); |
|
|
|
|
|
return htmlPage; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void setup() { |
|
|
void setup() { |
|
|
Serial.begin(115200); |
|
|
Serial.begin(115200); |
|
|
initWiFi(); |
|
|
initWiFi(); |
|
|
@ -183,7 +152,22 @@ void loop() { |
|
|
String line = serverClient.readStringUntil('\r'); |
|
|
String line = serverClient.readStringUntil('\r'); |
|
|
if (line.length() == 1 && line[0] == '\n') |
|
|
if (line.length() == 1 && line[0] == '\n') |
|
|
{ |
|
|
{ |
|
|
serverClient.println(prepareHtmlPage()); |
|
|
// serverClient.println(prepareHtmlPage());
|
|
|
|
|
|
serverClient.println ("HTTP/1.1 200 OK"); |
|
|
|
|
|
serverClient.println ("Content-Type: application/json;charset=utf-8"); |
|
|
|
|
|
serverClient.println ("Server: Arduino"); |
|
|
|
|
|
serverClient.println ("Connection: close"); |
|
|
|
|
|
serverClient.println (); |
|
|
|
|
|
serverClient.println ("{\"temperature_indoor\":"); |
|
|
|
|
|
serverClient.println (global_temp_indoor); |
|
|
|
|
|
serverClient.println (",\"humidity_indoor\":"); |
|
|
|
|
|
serverClient.println (global_hym_indoor); |
|
|
|
|
|
serverClient.println (",\"temperature_outdoor\":"); |
|
|
|
|
|
serverClient.println (global_temp_outdoor); |
|
|
|
|
|
serverClient.println (",\"humidity_outdoor\":"); |
|
|
|
|
|
serverClient.println (global_hym_outdoor); |
|
|
|
|
|
serverClient.print ("}"); |
|
|
|
|
|
serverClient.println (); |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|