diff --git a/html/about.min.htm b/html/about.min.htm index 36cdb1a..c016646 100644 --- a/html/about.min.htm +++ b/html/about.min.htm @@ -1 +1 @@ -Beer Gravity Monitor

Beer Gravity Monitor

This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.

MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor

Beer Gravity Monitor
This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.
MIT License
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/html/calibration.htm b/html/calibration.htm index 3ed1be4..07c8bbd 100644 --- a/html/calibration.htm +++ b/html/calibration.htm @@ -312,9 +312,7 @@ setButtonDisabled( true ); var url = "/api/formula"; - var url = "/test/formula.json"; - showError(url); - //showSuccess(url); + //var url = "/test/formula.json"; $('#spinner').show(); $.getJSON(url, function (cfg) { console.log( cfg ); diff --git a/html/calibration.min.htm b/html/calibration.min.htm index dfe3c24..4e9537e 100644 --- a/html/calibration.min.htm +++ b/html/calibration.min.htm @@ -1,52 +1,52 @@ -Beer Gravity Monitor

Here you can create your gravity formula by entering angles/tilt and the corresponding gravity. These values will be saved for future use. Angles with 0 (zero) will be skipped. The values below will be used to check the formula and if the deviation is more than 1.5SG / 0.38P on any of the provided points then the forumla will be rejected. On the bottom of the page you can see a graph over the entered values + values calcualated by the formula.

Here you can create your gravity formula by entering angles/tilt and the corresponding gravity. These values will be saved for future use. Angles with 0 (zero) will be skipped. The values below will be used to check the formula and if the deviation is more than 1.5SG / 0.38P on any of the provided points then the forumla will be rejected. On the bottom of the page you can see a graph over the entered values + values calcualated by the formula.

(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file + var myChart = 0;
(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/html/config.htm b/html/config.htm index bf8e6e0..b9cc120 100644 --- a/html/config.htm +++ b/html/config.htm @@ -585,7 +585,7 @@ $("#sleep-interval-info").text( t1 + " - Estimated runtime: " + t2); else $("#sleep-interval-info").text( t1 ); -/* + hideWarningGyro(); if(i>0 && i<300) { if( $("#gyro-temp").is(":checked") ) @@ -593,7 +593,7 @@ showWarningSleep(); } else { hideWarningSleep(); - }*/ + } } // Trigger the calibration and show warnings if needed @@ -618,11 +618,7 @@ setButtonDisabled( true ); var url = "/api/config"; - var url = "/test/config.json"; - showError(url); - //showSuccess(url); - showWarningGyro(); - showWarningSleep(); + //var url = "/test/config.json"; $('#spinner').show(); $.getJSON(url, function (cfg) { console.log( cfg ); diff --git a/html/config.min.htm b/html/config.min.htm index 799f564..488f064 100644 --- a/html/config.min.htm +++ b/html/config.min.htm @@ -1 +1 @@ -Beer Gravity Monitor

Temperature Format:

Gravity Format:

(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor

Temperature Format:

Gravity Format:

(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/html/firmware.htm b/html/firmware.htm index f887e77..169eb8f 100644 --- a/html/firmware.htm +++ b/html/firmware.htm @@ -166,7 +166,7 @@ setButtonDisabled( true ); var url = "/api/status"; - var url = "/test/status.json"; + //var url = "/test/status.json"; $('#spinner').show(); $.getJSON(url, function (cfg) { console.log( cfg ); diff --git a/html/firmware.min.htm b/html/firmware.min.htm index 5bd8ab8..6e7bf8a 100644 --- a/html/firmware.min.htm +++ b/html/firmware.min.htm @@ -1,87 +1,79 @@ -Beer Gravity Monitor
Here you can upload a new firmware version, it will not check the version number so you can also downgrade the firmware here.
Current version:
Loading...
Platform:
Loading...

Here you can upload a new firmware version, it will not check the version number so you can also downgrade the firmware here.
Current version:
Loading...
Platform:
Loading...
(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file + function start() { + setInterval(getStatus, 3000); + }
(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/html/format.htm b/html/format.htm index 19e42d4..356a76b 100644 --- a/html/format.htm +++ b/html/format.htm @@ -235,7 +235,7 @@ setButtonDisabled( true ); var url = "/api/config/format"; - var url = "/test/format.json"; + //var url = "/test/format.json"; $('#spinner').show(); $.getJSON(url, function (cfg) { console.log( cfg ); diff --git a/html/format.min.htm b/html/format.min.htm index 6c06b7e..ec828aa 100644 --- a/html/format.min.htm +++ b/html/format.min.htm @@ -1,2 +1,2 @@ -Beer Gravity Monitor

(C) Copyright 2021-22 Magnus Persson

\ No newline at end of file
+Beer Gravity Monitor
     
 
 
(C) Copyright 2021-22 Magnus Persson

\ No newline at end of file
diff --git a/html/index.htm b/html/index.htm
index 2a7c9ec..981ea10 100644
--- a/html/index.htm
+++ b/html/index.htm
@@ -112,8 +112,8 @@
               }, 3000); //5 seconds  
             
               function loadLog() {
-                //$("#logContent").load("/log");
-                $("#logContent").load("/test/status.json");
+                $("#logContent").load("/log");
+                //$("#logContent").load("/test/status.json");
               };
             
           
@@ -189,9 +189,7 @@
 
     function getStatus() {
       var url = "/api/status";
-      var url = "/test/status.json";
-      showError(url);
-      //showSuccess(url);
+      //var url = "/test/status.json";
       $('#spinner').show(); 
 
       $.getJSON(url, function (cfg) {
diff --git a/html/index.min.htm b/html/index.min.htm
index b80fa87..0ee0e5f 100644
--- a/html/index.min.htm
+++ b/html/index.min.htm
@@ -1 +1 @@
-Beer Gravity Monitor
Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
Platform:
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...
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/html/test.htm b/html/test.htm
index c7028e6..3a75ba4 100644
--- a/html/test.htm
+++ b/html/test.htm
@@ -115,7 +115,6 @@
         testHttp( id, "http-1" );
         testHttp( id, "http-2" );
         testHttp( id, "http-3" );
-        testHttp( id, "brewfather" );
         testInfluxdb( id );
         testMqtt( id );
         $('#spinner').hide(); 
@@ -155,7 +154,7 @@
         }
       })
       .fail(function () {
-        appendLog( "Failed to test push target 'influxdb'");
+        appendLog( "Failed to test push target 'mqtt'");
       })
     }
   
diff --git a/html/test.min.htm b/html/test.min.htm
index 3d6ee27..f1eefb5 100644
--- a/html/test.min.htm
+++ b/html/test.min.htm
@@ -1 +1 @@
-Beer Gravity Monitor
(C) Copyright 2021-22 Magnus Persson

\ No newline at end of file
+Beer Gravity Monitor
Press test button to start testing all defined push targets.
(C) Copyright 2021-22 Magnus Persson

\ No newline at end of file
diff --git a/html/upload.htm b/html/upload.htm
index 9e3d578..7cdfb87 100644
--- a/html/upload.htm
+++ b/html/upload.htm
@@ -127,7 +127,7 @@
 
   function getUpload() {
       var url = "/api/upload";
-      var url = "/test/upload.json";
+      //var url = "/test/upload.json";
       $('#spinner').show(); 
       $.getJSON(url, function (cfg) {
         console.log( cfg );
diff --git a/html/upload.min.htm b/html/upload.min.htm
index 08f7198..13de03d 100644
--- a/html/upload.min.htm
+++ b/html/upload.min.htm
@@ -1 +1 @@
-Beer Gravity Monitor
The listed files below needs to be uploaded to the FileSystem in order for the GUI to work. You can also flash the LittleFS filesystem but in that case you will loose your device settings. An OTA upgrade will automatically download the files if they are found in the same location as the firmware.bin. This page is a fallback option.

Once all the files are confirmed, please reboot the device for normal operation.
index.min.htm
Checking...
config.min.htm
Checking...
calibration.min.htm
Checking...
format.min.htm
Checking...
test.min.htm
Checking...
about.min.htm
Checking...
 
(C) Copyright 2021-22 Magnus Persson

\ No newline at end of file
+Beer Gravity Monitor
The listed files below needs to be uploaded to the FileSystem in order for the GUI to work. You can also flash the LittleFS filesystem but in that case you will loose your device settings. An OTA upgrade will automatically download the files if they are found in the same location as the firmware.bin. This page is a fallback option.

Once all the files are confirmed, please reboot the device for normal operation.
index.min.htm
Checking...
config.min.htm
Checking...
calibration.min.htm
Checking...
format.min.htm
Checking...
test.min.htm
Checking...
about.min.htm
Checking...
(C) Copyright 2021-22 Magnus Persson

\ No newline at end of file