From 2d2d9f5677b3cd781078d47029f9a00e67844aa5 Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Wed, 30 Aug 2023 22:08:16 +0200 Subject: [PATCH] added json --- tata_station/tata_station.ino | 48 ++++++++++++----------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/tata_station/tata_station.ino b/tata_station/tata_station.ino index 69509de..0d87b1f 100644 --- a/tata_station/tata_station.ino +++ b/tata_station/tata_station.ino @@ -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" - "" - ""); - htmlPage += F("

" - "

Temperatura unutra: "); - htmlPage += global_temp_indoor; - htmlPage += F("

" - "

Vlaznost unutra: "); - htmlPage += global_hym_indoor; - - htmlPage += F("

" - "

Temperatura vani: "); - htmlPage += global_temp_outdoor; - htmlPage += F("

" - "

Vlaznost vani: "); - htmlPage += global_hym_outdoor; - - htmlPage += F("" - "\r\n"); - return htmlPage; -} - void setup() { Serial.begin(115200); initWiFi(); @@ -183,7 +152,22 @@ void loop() { String line = serverClient.readStringUntil('\r'); 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; } }