diff --git a/html/index.htm b/html/index.htm index 82b17d4..f9435cf 100644 --- a/html/index.htm +++ b/html/index.htm @@ -112,11 +112,11 @@ }); setInterval(function() { loadLog(); - }, 3000); //5 seconds + }, 5000); function loadLog() { $("#logContent").load("/log"); - //$("#logContent").load("/test/status.json"); + //$("#logContent").load("/test/log"); }; @@ -124,12 +124,26 @@ View error log + + + +
- + +
+
+
+
+
+ @@ -177,8 +191,78 @@

Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
Platform:
Loading...
SSID:
Loading...

Gravity:
Loading...
Temperature:
Loading...
Angle/Tilt:
Loading...
Battery:
Loading...
Average runtime:
Loading...
(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor

Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
Platform:
Loading...
SSID:
Loading...

Gravity:
Loading...
Temperature:
Loading...
Angle/Tilt:
Loading...
Battery:
Loading...
Average runtime:
Loading...
(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/src/webserver.cpp b/src/webserver.cpp index fc3a5cf..ee2f474 100644 --- a/src/webserver.cpp +++ b/src/webserver.cpp @@ -1130,17 +1130,17 @@ const char* WebServerHandler::getHtmlFileName(HtmlFile item) { Log.notice(F("WEB : Looking up filename for %d." CR), item); switch (item) { - case HTML_INDEX: + case HtmlFile::HTML_INDEX: return "index.min.htm"; - case HTML_CONFIG: + case HtmlFile::HTML_CONFIG: return "config.min.htm"; - case HTML_CALIBRATION: + case HtmlFile::HTML_CALIBRATION: return "calibration.min.htm"; - case HTML_FORMAT: + case HtmlFile::HTML_FORMAT: return "format.min.htm"; - case HTML_ABOUT: + case HtmlFile::HTML_ABOUT: return "about.min.htm"; - case HTML_TEST: + case HtmlFile::HTML_TEST: return "test.min.htm"; } diff --git a/src_docs/source/releases.rst b/src_docs/source/releases.rst index c3c7508..e5df889 100644 --- a/src_docs/source/releases.rst +++ b/src_docs/source/releases.rst @@ -5,8 +5,11 @@ Releases v1.0.0-beta2 ------------ -* Moved applying sensor resolution in loop so we dont need to reboot. -* Updated docs with information from beta1 +* Moved applying temp sensor resolution in loop so there is no need to reboot. +* Advanced software settings is only disabled if settings contain default values. +* Added button on indexpage to direct to github issues. +* Added button to extract important information for support requests. +* Updated docs with information from beta1. v1.0.0-beta1 ------------ diff --git a/test/log b/test/log new file mode 100644 index 0000000..e73e515 --- /dev/null +++ b/test/log @@ -0,0 +1,4 @@ +Line 1 +Line 2 +Line 3 +Line 4 \ No newline at end of file diff --git a/test/upload.json b/test/upload.json index cade73f..0e5ec49 100644 --- a/test/upload.json +++ b/test/upload.json @@ -1,8 +1,22 @@ { - "index": false, + "index": true, "config": false, - "calibration": false, - "format": false, + "calibration": true, + "format": true, + "about": false, "test": false, - "about": true + "files": [ + { + "file-name": "calibration.min.htm", + "file-size": 0 + }, + { + "file-name": "drd.dat", + "file-size": 4 + }, + { + "file-name": "error.log", + "file-size": 839 + } + ] } \ No newline at end of file