From e0312ab3c57b508a04a397d1b56cd69e761df4e3 Mon Sep 17 00:00:00 2001
From: Magnus Persson <magnus@noreply.github.com>
Date: Wed, 4 May 2022 16:31:49 +0200
Subject: [PATCH] Update web pages

---
 html/format.htm     |  4 +--
 html/format.min.htm |  2 +-
 html/index.htm      | 80 +++++++++++++++++++++++----------------------
 html/index.min.htm  |  2 +-
 4 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/html/format.htm b/html/format.htm
index 86e4055..b5235d6 100644
--- a/html/format.htm
+++ b/html/format.htm
@@ -102,7 +102,7 @@
               { "id": "BrewFatherCustom-Post", "format": "%7B%0A%20%20%20%22name%22%3A%20%22%24%7Bmdns%7D%22%2C%0A%20%20%20%22temp%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22aux_temp%22%3A%200%2C%0A%20%20%20%22ext_temp%22%3A%200%2C%0A%20%20%20%22temp_unit%22%3A%20%22%24%7Btemp-unit%7D%22%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22gravity_unit%22%3A%20%22%24%7Bgravity-unit%7D%22%2C%0A%20%20%20%22pressure%22%3A%200%2C%0A%20%20%20%22pressure_unit%22%3A%20%22PSI%22%2C%0A%20%20%20%22ph%22%3A%200%2C%0A%20%20%20%22bpm%22%3A%200%2C%0A%20%20%20%22comment%22%3A%20%22%22%2C%0A%20%20%20%22beer%22%3A%20%22%22%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%0A%7D" },
               { "id": "iSpindle-Mqtt", "format": "ispindel%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Bangle%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Ftemp_units%3A%24%7Btemp-unit%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Finterval%3A%24%7Bsleep-interval%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2FRSSI%3A%24%7Brssi%7D%7C" },
               { "id": "HomeAssistant-Mqtt", "format": "gravmon%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Bangle%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftemp_units%3A%24%7Btemp-unit%7D%7C" },
-              { "id": "UBIDots1-Post", "format": "%7B%0A%20%20%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%20%20%22rssi%22%3A%20%24%7Brssi%7D%0A%7D" } ];
+              { "id": "UBIDots-Post", "format": "%7B%0A%20%20%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%20%20%22rssi%22%3A%20%24%7Brssi%7D%0A%7D" } ];
             </script>
 
           <div class="row mb-3">
@@ -115,7 +115,7 @@
                 <option value="GravityMon-Post">GravityMon (POST)</option>
                 <option value="iSpindle-Mqtt">iSpindle (MQTT)</option>
                 <option value="HomeAssistant-Mqtt">Home Assistant (MQTT)</option>
-                <option value="UBIDots1-Post">UBIdots - Alternative 1 (POST)</option>
+                <option value="UBIDots-Post">UBIdots (POST)</option>
                 <option value="BrewFatherCustom-Post">Brewfather Custom Endpoint (POST)</option>
                 <option value="GravityMon-Get">GravityMon (GET)</option>
               </select>
diff --git a/html/format.min.htm b/html/format.min.htm
index 5c0697f..1f1d603 100644
--- a/html/format.min.htm
+++ b/html/format.min.htm
@@ -6,4 +6,4 @@
               { "id": "BrewFatherCustom-Post", "format": "%7B%0A%20%20%20%22name%22%3A%20%22%24%7Bmdns%7D%22%2C%0A%20%20%20%22temp%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22aux_temp%22%3A%200%2C%0A%20%20%20%22ext_temp%22%3A%200%2C%0A%20%20%20%22temp_unit%22%3A%20%22%24%7Btemp-unit%7D%22%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22gravity_unit%22%3A%20%22%24%7Bgravity-unit%7D%22%2C%0A%20%20%20%22pressure%22%3A%200%2C%0A%20%20%20%22pressure_unit%22%3A%20%22PSI%22%2C%0A%20%20%20%22ph%22%3A%200%2C%0A%20%20%20%22bpm%22%3A%200%2C%0A%20%20%20%22comment%22%3A%20%22%22%2C%0A%20%20%20%22beer%22%3A%20%22%22%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%0A%7D" },
               { "id": "iSpindle-Mqtt", "format": "ispindel%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Bangle%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Ftemp_units%3A%24%7Btemp-unit%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Finterval%3A%24%7Bsleep-interval%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2FRSSI%3A%24%7Brssi%7D%7C" },
               { "id": "HomeAssistant-Mqtt", "format": "gravmon%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Bangle%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftemp_units%3A%24%7Btemp-unit%7D%7C" },
-              { "id": "UBIDots1-Post", "format": "%7B%0A%20%20%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%20%20%22rssi%22%3A%20%24%7Brssi%7D%0A%7D" } ];</script><div class="row mb-3"><div class="col-sm-2"><button class="btn btn-primary" id="format-btn" data-bs-toggle="tooltip" title="Save the format template, saving an empty form will reset the template to default">Save</button> <button class="btn btn-secondary" id="test-btn" data-bs-toggle="tooltip" title="Apply device data to template to see how it works">Test</button></div><select class="custom-select col-sm-4" required name="predefined" id="predefined" data-bs-toggle="tooltip" title="Select a pre-defined format template"><option value="iSpindle-Post">iSpindle (POST)</option><option value="GravityMon-Post">GravityMon (POST)</option><option value="iSpindle-Mqtt">iSpindle (MQTT)</option><option value="HomeAssistant-Mqtt">Home Assistant (MQTT)</option><option value="UBIDots1-Post">UBIdots - Alternative 1 (POST)</option><option value="BrewFatherCustom-Post">Brewfather Custom Endpoint (POST)</option><option value="GravityMon-Get">GravityMon (GET)</option></select><div class="col-sm-4"><button class="btn btn-secondary" id="copy-btn" data-bs-toggle="tooltip" title="Copy the selected format template to the selected push target">Copy format</button> <button class="btn btn-secondary" id="clear-btn" data-bs-toggle="tooltip" title="Clear the current format template">Clear format</button></div></div><hr class="my-2"><pre class="card-preview" id="preview" name="preview"></pre></div></div></div></div></div><script type="text/javascript">function setButtonDisabled(e){$("#format-btn").prop("disabled",e),$("#test-btn").prop("disabled",e)}function selectFormat(){var e="#"+$("#push-target").val();console.log(e),e=decodeURIComponent($(e).val()),console.log(e),e=e.replaceAll("|","|\n"),console.log(e),$("#format").val(e),$("#preview").text("")}function getConfig(){setButtonDisabled(!0);var e="/api/config/format";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#id").val(e.id),$("#http-1").val(e["http-1"]),$("#http-2").val(e["http-2"]),$("#http-3").val(e["http-3"]),$("#influxdb").val(e.influxdb),$("#mqtt").val(e.mqtt),selectFormat()}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1)})}window.onload=getConfig,setButtonDisabled(!0),$(document).ready(function(){null!=location.hash&&""!=location.hash&&($(".collapse").removeClass("in"),$(location.hash+".collapse").collapse("show"))}),$("#push-target").change(function(e){console.log(e),selectFormat()}),$("#copy-btn").click(function(e){var t=$("#predefined").val();formatTemplates.forEach(function(e,l){e.id==t&&$("#format").val(decodeURIComponent(e.format))})}),$("#clear-btn").click(function(e){$("#format").val("")}),$("#format-btn").click(function(e){var l=$("#format").val();l=l.replaceAll("\n","");var t="id="+$("#id").val()+"&"+$("#push-target").val()+"="+encodeURIComponent(l);console.log(t),$.ajax({type:"POST",url:"/api/config/format",data:t,success:function(e){showSuccess("Format stored successfully."),getConfig()},error:function(e){showError("Unable to store format.")}})}),$("#test-btn").click(function(e){var l="/api/status";$("#spinner").show(),$.getJSON(l,function(e){console.log(e);var l=$("#format").val();if(l="C"==e["temp-format"]?l.replaceAll("${temp}",e["temp-c"]):l.replaceAll("${temp}",e["temp-f"]),"G"==e["gravity-format"]){var t=e.gravity;l=l.replaceAll("${gravity-sg}",t),l=l.replaceAll("${corr-gravity-sg}",t);var a=259-(259-t);l=l.replaceAll("${gravity-plato}",a),l=l.replaceAll("${corr-gravity-plato}",a)}else{a=e.gravity;l=l.replaceAll("${gravity-plato}",a),l=l.replaceAll("${corr-gravity-plato}",a);t=259/(259-a);l=l.replaceAll("${gravity-sg}",t),l=l.replaceAll("${corr-gravity-sg}",t)}l=l.replaceAll("${mdns}",e.mdns),l=l.replaceAll("${id}",e.id),l=l.replaceAll("${sleep-interval}",e["sleep-interval"]),l=l.replaceAll("${token}",e.token),l=l.replaceAll("${token2}",e.token2),l=l.replaceAll("${temp-c}",e["temp-c"]),l=l.replaceAll("${temp-f}",e["temp-f"]),l=l.replaceAll("${temp-unit}",e["temp-format"]),l=l.replaceAll("${battery}",e.battery),l=l.replaceAll("${rssi}",e.rssi),l=l.replaceAll("${run-time}",e["runtime-average"]),l=l.replaceAll("${gravity}",e.gravity),l=l.replaceAll("${gravity-unit}",e["gravity-format"]),l=l.replaceAll("${corr-gravity}",e.gravity),l=l.replaceAll("${angle}",e.angle),l=l.replaceAll("${tilt}",e.angle);try{var o=JSON.parse(l);l=JSON.stringify(o,null,2)}catch(e){console.log("Not a javascript object!")}$("#preview").text(l)}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})})</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></body></html>
\ No newline at end of file
+              { "id": "UBIDots-Post", "format": "%7B%0A%20%20%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%20%20%22rssi%22%3A%20%24%7Brssi%7D%0A%7D" } ];</script><div class="row mb-3"><div class="col-sm-2"><button class="btn btn-primary" id="format-btn" data-bs-toggle="tooltip" title="Save the format template, saving an empty form will reset the template to default">Save</button> <button class="btn btn-secondary" id="test-btn" data-bs-toggle="tooltip" title="Apply device data to template to see how it works">Test</button></div><select class="custom-select col-sm-4" required name="predefined" id="predefined" data-bs-toggle="tooltip" title="Select a pre-defined format template"><option value="iSpindle-Post">iSpindle (POST)</option><option value="GravityMon-Post">GravityMon (POST)</option><option value="iSpindle-Mqtt">iSpindle (MQTT)</option><option value="HomeAssistant-Mqtt">Home Assistant (MQTT)</option><option value="UBIDots-Post">UBIdots (POST)</option><option value="BrewFatherCustom-Post">Brewfather Custom Endpoint (POST)</option><option value="GravityMon-Get">GravityMon (GET)</option></select><div class="col-sm-4"><button class="btn btn-secondary" id="copy-btn" data-bs-toggle="tooltip" title="Copy the selected format template to the selected push target">Copy format</button> <button class="btn btn-secondary" id="clear-btn" data-bs-toggle="tooltip" title="Clear the current format template">Clear format</button></div></div><hr class="my-2"><pre class="card-preview" id="preview" name="preview"></pre></div></div></div></div></div><script type="text/javascript">function setButtonDisabled(e){$("#format-btn").prop("disabled",e),$("#test-btn").prop("disabled",e)}function selectFormat(){var e="#"+$("#push-target").val();console.log(e),e=decodeURIComponent($(e).val()),console.log(e),e=e.replaceAll("|","|\n"),console.log(e),$("#format").val(e),$("#preview").text("")}function getConfig(){setButtonDisabled(!0);var e="/api/config/format";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#id").val(e.id),$("#http-1").val(e["http-1"]),$("#http-2").val(e["http-2"]),$("#http-3").val(e["http-3"]),$("#influxdb").val(e.influxdb),$("#mqtt").val(e.mqtt),selectFormat()}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1)})}window.onload=getConfig,setButtonDisabled(!0),$(document).ready(function(){null!=location.hash&&""!=location.hash&&($(".collapse").removeClass("in"),$(location.hash+".collapse").collapse("show"))}),$("#push-target").change(function(e){console.log(e),selectFormat()}),$("#copy-btn").click(function(e){var t=$("#predefined").val();formatTemplates.forEach(function(e,l){e.id==t&&$("#format").val(decodeURIComponent(e.format))})}),$("#clear-btn").click(function(e){$("#format").val("")}),$("#format-btn").click(function(e){var l=$("#format").val();l=l.replaceAll("\n","");var t="id="+$("#id").val()+"&"+$("#push-target").val()+"="+encodeURIComponent(l);console.log(t),$.ajax({type:"POST",url:"/api/config/format",data:t,success:function(e){showSuccess("Format stored successfully."),getConfig()},error:function(e){showError("Unable to store format.")}})}),$("#test-btn").click(function(e){var l="/api/status";$("#spinner").show(),$.getJSON(l,function(e){console.log(e);var l=$("#format").val();if(l="C"==e["temp-format"]?l.replaceAll("${temp}",e["temp-c"]):l.replaceAll("${temp}",e["temp-f"]),"G"==e["gravity-format"]){var t=e.gravity;l=l.replaceAll("${gravity-sg}",t),l=l.replaceAll("${corr-gravity-sg}",t);var a=259-(259-t);l=l.replaceAll("${gravity-plato}",a),l=l.replaceAll("${corr-gravity-plato}",a)}else{a=e.gravity;l=l.replaceAll("${gravity-plato}",a),l=l.replaceAll("${corr-gravity-plato}",a);t=259/(259-a);l=l.replaceAll("${gravity-sg}",t),l=l.replaceAll("${corr-gravity-sg}",t)}l=l.replaceAll("${mdns}",e.mdns),l=l.replaceAll("${id}",e.id),l=l.replaceAll("${sleep-interval}",e["sleep-interval"]),l=l.replaceAll("${token}",e.token),l=l.replaceAll("${token2}",e.token2),l=l.replaceAll("${temp-c}",e["temp-c"]),l=l.replaceAll("${temp-f}",e["temp-f"]),l=l.replaceAll("${temp-unit}",e["temp-format"]),l=l.replaceAll("${battery}",e.battery),l=l.replaceAll("${rssi}",e.rssi),l=l.replaceAll("${run-time}",e["runtime-average"]),l=l.replaceAll("${gravity}",e.gravity),l=l.replaceAll("${gravity-unit}",e["gravity-format"]),l=l.replaceAll("${corr-gravity}",e.gravity),l=l.replaceAll("${angle}",e.angle),l=l.replaceAll("${tilt}",e.angle);try{var o=JSON.parse(l);l=JSON.stringify(o,null,2)}catch(e){console.log("Not a javascript object!")}$("#preview").text(l)}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})})</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></body></html>
\ No newline at end of file
diff --git a/html/index.htm b/html/index.htm
index 88a26f2..0aea2d4 100644
--- a/html/index.htm
+++ b/html/index.htm
@@ -73,6 +73,47 @@
     </script>
 
     <div class="accordion" id="accordion">
+
+      <h2 class="accordion-header" id="headingData">
+        <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseData" aria-expanded="true" aria-controls="collapseData">
+          <b>Measurement</b>
+        </button>
+      </h2>
+      <div id="collapseData" class="accordion-collapse collapse show" aria-labelledby="headingData" data-bs-parent="#accordion">
+        <div class="accordion-body">
+
+          <div class="row mb-3">
+            <div class="col-md-4 bg-light">Gravity:</div>
+            <div class="col-md-4 bg-light" id="gravity">Loading...</div>
+          </div>
+          <div class="row mb-3">
+            <div class="col-md-4 bg-light">Temperature:</div>
+            <div class="col-md-4 bg-light" id="temp">Loading...</div>
+          </div>
+          <div class="row mb-3">
+            <div class="col-md-4 bg-light">Angle/Tilt:</div>
+            <div class="col-md-4 bg-light" id="angle">Loading...</div>
+          </div>
+          <div class="row mb-3">
+            <div class="col-md-4 bg-light">Battery:</div>
+            <div class="col-md-4 bg-light" id="battery">Loading...</div>
+          </div>
+      
+          <div class="row mb-3">
+            <div class="col-md-4 bg-light">Average runtime:</div>
+            <div class="col-md-4 bg-light" id="runtime">Loading...</div>
+          </div>
+      
+          <div class="row mb-3">
+            <div class="col-md-8 bg-light custom-control custom-checkbox">
+              <input type="checkbox" class="custom-control-input" name="sleep-mode" id="sleep-mode" disabled>
+              <label class="custom-control-label" for="sleep-mode">Do not enter sleep mode when floating (check this if you are collecting angles/tilt for calibration).</label>
+            </div>        
+          </div>      
+      
+        </div>
+      </div>
+
       <div class="accordion-item">
         <h2 class="accordion-header" id="headingSoftware">
           <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSoftware" aria-expanded="true" aria-controls="collapseSoftware">
@@ -148,45 +189,6 @@
         </div>
       </div>
 
-      <h2 class="accordion-header" id="headingData">
-        <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseData" aria-expanded="true" aria-controls="collapseData">
-          <b>Measurement</b>
-        </button>
-      </h2>
-      <div id="collapseData" class="accordion-collapse collapse show" aria-labelledby="headingData" data-bs-parent="#accordion">
-        <div class="accordion-body">
-
-          <div class="row mb-3">
-            <div class="col-md-4 bg-light">Gravity:</div>
-            <div class="col-md-4 bg-light" id="gravity">Loading...</div>
-          </div>
-          <div class="row mb-3">
-            <div class="col-md-4 bg-light">Temperature:</div>
-            <div class="col-md-4 bg-light" id="temp">Loading...</div>
-          </div>
-          <div class="row mb-3">
-            <div class="col-md-4 bg-light">Angle/Tilt:</div>
-            <div class="col-md-4 bg-light" id="angle">Loading...</div>
-          </div>
-          <div class="row mb-3">
-            <div class="col-md-4 bg-light">Battery:</div>
-            <div class="col-md-4 bg-light" id="battery">Loading...</div>
-          </div>
-      
-          <div class="row mb-3">
-            <div class="col-md-4 bg-light">Average runtime:</div>
-            <div class="col-md-4 bg-light" id="runtime">Loading...</div>
-          </div>
-      
-          <div class="row mb-3">
-            <div class="col-md-8 bg-light custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" name="sleep-mode" id="sleep-mode" disabled>
-              <label class="custom-control-label" for="sleep-mode">Do not enter sleep mode when floating (check this if you are collecting angles/tilt for calibration).</label>
-            </div>        
-          </div>      
-      
-        </div>
-      </div>
     </div>
   </div>
 
diff --git a/html/index.min.htm b/html/index.min.htm
index 910b40d..1f36add 100644
--- a/html/index.min.htm
+++ b/html/index.min.htm
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"><style>.row-margin-10{margin-top:1em}</style></head><body class="py-4"><script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><!-- START MENU --><nav class="navbar navbar-expand-lg navbar-dark bg-primary"><div class="container"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbarNav"><ul class="navbar-nav"><li class="nav-item"><a class="nav-link active" href="#"><b>Home</b></a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container row-margin-10"><div class="alert alert-success alert-dismissible hide fade d-none" role="alert"><div id="alert"></div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><script type="text/javascript">function showError(s){console.log("Error:"+s),$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert").text(s)}function showSuccess(s){console.log("Success:"+s),$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert").text(s)}$("#alert-btn").click(function(s){console.log("Disable"),$(".alert").addClass("hide").removeClass("show").addClass("d-none")})</script><div class="accordion" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingSoftware"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSoftware" aria-expanded="true" aria-controls="collapseSoftware"><b>Device</b></button></h2><div id="collapseSoftware" class="accordion-collapse collapse show" aria-labelledby="headingSoftware" data-bs-parent="#accordion"><div class="accordion-body"><div class="row mb-3"><div class="col-md-4 bg-light">Current version:</div><div class="col-md-4 bg-light" id="app-ver">Loading...</div></div><div class="row mb-3" id="h-app-ver-new" hidden><div class="col-md-4 bg-light">New version:</div><div class="col-md-4 bg-light" id="app-ver-new">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Host name:</div><div class="col-md-4 bg-light" id="mdns">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Device ID:</div><div class="col-md-4 bg-light" id="id">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Platform:</div><div class="col-md-4 bg-light" id="platform">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">SSID:</div><div class="col-md-4 bg-light" id="wifi-ssid">Loading...</div></div><script>function loadLog(){$("#logContent").load("/log")}$("#log-btn").click(function(o){loadLog()}),setInterval(function(){loadLog()},5e3)</script><button class="btn btn-primary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#collapseLog" aria-expanded="false" aria-controls="collapseLog" data-bs-toggle="tooltip" title="Load and show the last 10 errors that has occured on the device">View error log</button> <button class="btn btn-secondary btn-sm" type="button" data-bs-toggle="tooltip" name="github-btn" id="github-btn" title="Go to github and place a issue">Submit a issue on github</button> <button class="btn btn-secondary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSupport" aria-expanded="false" aria-controls="collapseSupport" data-bs-toggle="tooltip" name="support-btn" id="support-btn" title="Collect data relevant for a support case">Gather support information</button><div class="collapse row-margin-10" id="collapseLog"><div class="card card-body"><pre><code class="card-text" id="logContent"></code></pre></div></div><div class="collapse row-margin-10" id="collapseSupport"><div class="card card-body"><pre><code class="card-text" id="supportContent"></code></pre></div></div></div></div></div><h2 class="accordion-header" id="headingData"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseData" aria-expanded="true" aria-controls="collapseData"><b>Measurement</b></button></h2><div id="collapseData" class="accordion-collapse collapse show" aria-labelledby="headingData" data-bs-parent="#accordion"><div class="accordion-body"><div class="row mb-3"><div class="col-md-4 bg-light">Gravity:</div><div class="col-md-4 bg-light" id="gravity">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Temperature:</div><div class="col-md-4 bg-light" id="temp">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Angle/Tilt:</div><div class="col-md-4 bg-light" id="angle">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Battery:</div><div class="col-md-4 bg-light" id="battery">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Average runtime:</div><div class="col-md-4 bg-light" id="runtime">Loading...</div></div><div class="row mb-3"><div class="col-md-8 bg-light custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" name="sleep-mode" id="sleep-mode" disabled> <label class="custom-control-label" for="sleep-mode">Do not enter sleep mode when floating (check this if you are collecting angles/tilt for calibration).</label></div></div></div></div></div></div><script type="text/javascript">function getStatus(){var e="/api/status";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#app-ver").text(e["app-ver"]+" ("+e["app-build"]+")"),$("#mdns").text(e.mdns),$("#id").text(e.id),$("#platform").text(e.platform),$("#wifi-ssid").text(e["wifi-ssid"]),$("#runtime").text(e["runtime-average"]+" seconds");var t=e.angle;0==t?($("#angle").text("Gyro moving"),$("#gravity").text("Gyro moving")):($("#angle").text(e.angle),"G"==e["gravity-format"]?$("#gravity").text(e.gravity+" SG"):$("#gravity").text(e.gravity+" °P"));var a=e.battery,i=0;4.15<a?i=100:4.05<a?i=90:3.97<a?i=80:3.91<a?i=70:3.86<a?i=60:3.81<a?i=50:3.78<a?i=40:3.76<a?i=30:3.73<a?i=20:3.67<a?i=10:3.44<a&&(i=5),$("#battery").text(a+" V ("+i+"%)"),"C"==e["temp-format"]?$("#temp").text(e["temp-c"]+" C"):$("#temp").text(e["temp-f"]+" F"),e["sleep-mode"]?$("#sleep-mode").attr("checked",!0):$("#sleep-mode").attr("checked",!1),$("#sleep-mode").removeAttr("disabled")}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}function start(){setInterval(getStatus,3e3)}var debug={};window.onload=start,$("#github-btn").click(function(e){window.location.href="https://github.com/mp-se/gravitymon/issues"}),$("#support-btn").click(function(e){$("#spinner").show();var t="/api/config";$.getJSON(t,function(e){debug={},debug.mdns=e.mdns,debug.id=e.id,debug["sleep-interval"]=e["sleep-interval"],debug["temp-format"]=e["temp-format"],debug["gravity-format"]=e["gravity-format"],debug["gravity-temp-adjustment"]=e["gravity-temp-adjustment"],debug["voltage-factor"]=e["voltage-factor"],debug.platform=e.platform,debug.ble=e.ble,debug["gyro-temp"]=e["gyro-temp"],debug["gyro-calibration-data"]=e["gyro-calibration-data"],debug["temp-adjustment-value"]=e["temp-adjustment-value"];var t="/api/status";$.getJSON(t,function(e){debug["runtime-average"]=e["runtime-average"],debug.rssi=e.rssi,debug["app-ver"]=e["app-ver"],debug["app-build"]=e["app-build"]});t="/api/config/format";$.getJSON(t,function(e){debug.formats=e;var t="/api/config/advanced";$.getJSON(t,function(e){debug.advanced=e;var t="/api/upload";$.getJSON(t,function(e){debug.files=e;var t="/log";$.ajax({url:t,method:"get",success:function(e){debug.log=e.split("\n");var t=JSON.stringify(debug,null,2);$("#supportContent").text(t),$("#spinner").hide()}})})})})})}),$("#sleep-mode").click(function(e){console.log("Blocking sleep mode = "+$("#sleep-mode").is(":checked")),$.ajax({type:"POST",url:"/api/status/sleepmode",data:{id:$("#id").text(),"sleep-mode":$("#sleep-mode").is(":checked")},success:function(e){},error:function(e){showError("Could not update sleep mode for device.")}})})</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></body></html>
\ No newline at end of file
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"><style>.row-margin-10{margin-top:1em}</style></head><body class="py-4"><script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><!-- START MENU --><nav class="navbar navbar-expand-lg navbar-dark bg-primary"><div class="container"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbarNav"><ul class="navbar-nav"><li class="nav-item"><a class="nav-link active" href="#"><b>Home</b></a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container row-margin-10"><div class="alert alert-success alert-dismissible hide fade d-none" role="alert"><div id="alert"></div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><script type="text/javascript">function showError(s){console.log("Error:"+s),$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert").text(s)}function showSuccess(s){console.log("Success:"+s),$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert").text(s)}$("#alert-btn").click(function(s){console.log("Disable"),$(".alert").addClass("hide").removeClass("show").addClass("d-none")})</script><div class="accordion" id="accordion"><h2 class="accordion-header" id="headingData"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseData" aria-expanded="true" aria-controls="collapseData"><b>Measurement</b></button></h2><div id="collapseData" class="accordion-collapse collapse show" aria-labelledby="headingData" data-bs-parent="#accordion"><div class="accordion-body"><div class="row mb-3"><div class="col-md-4 bg-light">Gravity:</div><div class="col-md-4 bg-light" id="gravity">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Temperature:</div><div class="col-md-4 bg-light" id="temp">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Angle/Tilt:</div><div class="col-md-4 bg-light" id="angle">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Battery:</div><div class="col-md-4 bg-light" id="battery">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Average runtime:</div><div class="col-md-4 bg-light" id="runtime">Loading...</div></div><div class="row mb-3"><div class="col-md-8 bg-light custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" name="sleep-mode" id="sleep-mode" disabled> <label class="custom-control-label" for="sleep-mode">Do not enter sleep mode when floating (check this if you are collecting angles/tilt for calibration).</label></div></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingSoftware"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSoftware" aria-expanded="true" aria-controls="collapseSoftware"><b>Device</b></button></h2><div id="collapseSoftware" class="accordion-collapse collapse show" aria-labelledby="headingSoftware" data-bs-parent="#accordion"><div class="accordion-body"><div class="row mb-3"><div class="col-md-4 bg-light">Current version:</div><div class="col-md-4 bg-light" id="app-ver">Loading...</div></div><div class="row mb-3" id="h-app-ver-new" hidden><div class="col-md-4 bg-light">New version:</div><div class="col-md-4 bg-light" id="app-ver-new">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Host name:</div><div class="col-md-4 bg-light" id="mdns">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Device ID:</div><div class="col-md-4 bg-light" id="id">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">Platform:</div><div class="col-md-4 bg-light" id="platform">Loading...</div></div><div class="row mb-3"><div class="col-md-4 bg-light">SSID:</div><div class="col-md-4 bg-light" id="wifi-ssid">Loading...</div></div><script>function loadLog(){$("#logContent").load("/log")}$("#log-btn").click(function(o){loadLog()}),setInterval(function(){loadLog()},5e3)</script><button class="btn btn-primary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#collapseLog" aria-expanded="false" aria-controls="collapseLog" data-bs-toggle="tooltip" title="Load and show the last 10 errors that has occured on the device">View error log</button> <button class="btn btn-secondary btn-sm" type="button" data-bs-toggle="tooltip" name="github-btn" id="github-btn" title="Go to github and place a issue">Submit a issue on github</button> <button class="btn btn-secondary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSupport" aria-expanded="false" aria-controls="collapseSupport" data-bs-toggle="tooltip" name="support-btn" id="support-btn" title="Collect data relevant for a support case">Gather support information</button><div class="collapse row-margin-10" id="collapseLog"><div class="card card-body"><pre><code class="card-text" id="logContent"></code></pre></div></div><div class="collapse row-margin-10" id="collapseSupport"><div class="card card-body"><pre><code class="card-text" id="supportContent"></code></pre></div></div></div></div></div></div></div><script type="text/javascript">function getStatus(){var e="/api/status";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#app-ver").text(e["app-ver"]+" ("+e["app-build"]+")"),$("#mdns").text(e.mdns),$("#id").text(e.id),$("#platform").text(e.platform),$("#wifi-ssid").text(e["wifi-ssid"]),$("#runtime").text(e["runtime-average"]+" seconds");var t=e.angle;0==t?($("#angle").text("Gyro moving"),$("#gravity").text("Gyro moving")):($("#angle").text(e.angle),"G"==e["gravity-format"]?$("#gravity").text(e.gravity+" SG"):$("#gravity").text(e.gravity+" °P"));var a=e.battery,i=0;4.15<a?i=100:4.05<a?i=90:3.97<a?i=80:3.91<a?i=70:3.86<a?i=60:3.81<a?i=50:3.78<a?i=40:3.76<a?i=30:3.73<a?i=20:3.67<a?i=10:3.44<a&&(i=5),$("#battery").text(a+" V ("+i+"%)"),"C"==e["temp-format"]?$("#temp").text(e["temp-c"]+" C"):$("#temp").text(e["temp-f"]+" F"),e["sleep-mode"]?$("#sleep-mode").attr("checked",!0):$("#sleep-mode").attr("checked",!1),$("#sleep-mode").removeAttr("disabled")}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}function start(){setInterval(getStatus,3e3)}var debug={};window.onload=start,$("#github-btn").click(function(e){window.location.href="https://github.com/mp-se/gravitymon/issues"}),$("#support-btn").click(function(e){$("#spinner").show();var t="/api/config";$.getJSON(t,function(e){debug={},debug.mdns=e.mdns,debug.id=e.id,debug["sleep-interval"]=e["sleep-interval"],debug["temp-format"]=e["temp-format"],debug["gravity-format"]=e["gravity-format"],debug["gravity-temp-adjustment"]=e["gravity-temp-adjustment"],debug["voltage-factor"]=e["voltage-factor"],debug.platform=e.platform,debug.ble=e.ble,debug["gyro-temp"]=e["gyro-temp"],debug["gyro-calibration-data"]=e["gyro-calibration-data"],debug["temp-adjustment-value"]=e["temp-adjustment-value"];var t="/api/status";$.getJSON(t,function(e){debug["runtime-average"]=e["runtime-average"],debug.rssi=e.rssi,debug["app-ver"]=e["app-ver"],debug["app-build"]=e["app-build"]});t="/api/config/format";$.getJSON(t,function(e){debug.formats=e;var t="/api/config/advanced";$.getJSON(t,function(e){debug.advanced=e;var t="/api/upload";$.getJSON(t,function(e){debug.files=e;var t="/log";$.ajax({url:t,method:"get",success:function(e){debug.log=e.split("\n");var t=JSON.stringify(debug,null,2);$("#supportContent").text(t),$("#spinner").hide()}})})})})})}),$("#sleep-mode").click(function(e){console.log("Blocking sleep mode = "+$("#sleep-mode").is(":checked")),$.ajax({type:"POST",url:"/api/status/sleepmode",data:{id:$("#id").text(),"sleep-mode":$("#sleep-mode").is(":checked")},success:function(e){},error:function(e){showError("Could not update sleep mode for device.")}})})</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></body></html>
\ No newline at end of file