From d57d8dd692419f240deb1fc13d98393e16f42b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Sat, 26 Mar 2016 18:51:28 +0100 Subject: [PATCH] readout prototype --- esp_meas.pro | 6 +- html/favicon.ico | Bin 0 -> 318 bytes html/json/samples.tpl.json | 4 + html/multipart.tpl | 14 --- html/pages/{home.tpl => home.tpl.html} | 0 html/pages/{wifi.tpl => wifi.tpl.html} | 0 html/style.css | 17 ---- html_build.sh | 5 +- html_src/package.json | 1 + libesphttpd/core/httpd.c | 23 +++-- libesphttpd/core/httpdespfs.c | 2 +- libesphttpd/include/esp8266.h | 6 ++ libesphttpd/include/httpd.h | 2 +- libesphttpd/include/logging.h | 4 +- user/cgi.c | 116 +++++++++++++-------- user/cgi.h | 2 +- user/routes.c | 99 ++++++++++++++++++ user/routes.h | 8 ++ user/user_main.c | 134 ++++--------------------- 19 files changed, 235 insertions(+), 208 deletions(-) create mode 100644 html/favicon.ico create mode 100644 html/json/samples.tpl.json delete mode 100644 html/multipart.tpl rename html/pages/{home.tpl => home.tpl.html} (100%) rename html/pages/{wifi.tpl => wifi.tpl.html} (100%) delete mode 100644 html/style.css create mode 100644 html_src/package.json create mode 100644 user/routes.c create mode 100644 user/routes.h diff --git a/esp_meas.pro b/esp_meas.pro index 8857ce0..f425de1 100644 --- a/esp_meas.pro +++ b/esp_meas.pro @@ -57,7 +57,8 @@ SOURCES += \ sbmp/library/payload_parser.c \ user/sampling.c \ user/page_home.c \ - user/ftoa.c + user/ftoa.c \ + user/routes.c HEADERS += \ include/uart_hw.h \ @@ -137,7 +138,8 @@ HEADERS += \ user/timeout.h \ user/sbmp_config.h \ sbmp/library/sbmp_config.example.h \ - user/ftoa.h + user/ftoa.h \ + user/routes.h DISTFILES += \ style.astylerc \ diff --git a/html/favicon.ico b/html/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..0985f59cf0be7290a2332e7f1527f919d4e0cb27 GIT binary patch literal 318 zcmZQzU<5(|0RbS%!l1#(z#zuJz@P!d0zj+)#2|58;BX2P!+~^OhU1k|45wT587}sF zGF+V*#BghI8pGYyWej)LH!wWd(a-So@H~dsXV)_Pcy*8A&zIK>zyJRM8ws)lWP<=B zBhY3+fkZ~x+(NOt0ha`H?_Sc*op7DOxA+m$+yYsKi(J=iZx!$gUgCOpH&8(Q%AL}x zvv&houHC(R_v+=Vj5jak-n~1QmvQgiyLaw(Tw?6qD5!h4_9A2N0_MASZEXcj4Fzp) O2nvF2GX`5q6#@V?Pfa%f literal 0 HcmV?d00001 diff --git a/html/json/samples.tpl.json b/html/json/samples.tpl.json new file mode 100644 index 0000000..1516cfd --- /dev/null +++ b/html/json/samples.tpl.json @@ -0,0 +1,4 @@ +{ + "samples": [%values%], + "success": %success% +} diff --git a/html/multipart.tpl b/html/multipart.tpl deleted file mode 100644 index 9ce194e..0000000 --- a/html/multipart.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - -ESP8266 web server - - - -
-

Multipart

- -