From fa3d68c3216a214105d06020827db3f34ca62b4d Mon Sep 17 00:00:00 2001
From: Magnus Persson <magnus@noreply.github.com>
Date: Tue, 26 Apr 2022 19:54:48 +0200
Subject: [PATCH] Added wifi advanced config

---
 html/config.htm     | 22 +++++++++++++++++++++-
 html/config.min.htm |  2 +-
 html/format.min.htm |  4 ++--
 src/config.cpp      |  9 ++++++---
 src/config.hpp      |  4 ++++
 src/resources.hpp   |  3 ++-
 src/webserver.cpp   | 10 +++++++---
 src/wifi.cpp        |  2 +-
 test/adv.json       |  4 +++-
 9 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/html/config.htm b/html/config.htm
index 7b36160..e81a462 100644
--- a/html/config.htm
+++ b/html/config.htm
@@ -485,7 +485,25 @@
               </div>
               <div class="col-sm-5">(1 - 10) - default 1.6 SG</div>
             </div>
-            
+
+            <hr>
+
+            <div class="row mb-3">
+              <label for="wifi-connect-timeout" class="col-sm-3 col-form-label">Wifi connect timeout (s):</label>
+              <div class="col-sm-2">
+                <input type="number" min="1" max="60" class="form-control" name="wifi-connect-timeout" id="wifi-connect-timeout" checked data-bs-toggle="tooltip" title="Max time waiting for a wifi connection before going back to sleep"> 
+              </div>
+              <div class="col-sm-5">(1 - 60) - default 20 s</div>
+            </div>
+
+            <div class="row mb-3">
+              <label for="wifi-portal-timeout" class="col-sm-3 col-form-label">Wifi portal timeout (s):</label>
+              <div class="col-sm-2">
+                <input type="number" min="10" max="240" class="form-control" name="wifi-portal-timeout" id="wifi-portal-timeout" checked data-bs-toggle="tooltip" title="Max time the wifi portal is active before existing"> 
+              </div>
+              <div class="col-sm-5">(10 - 240) - default 120 s</div>
+            </div>
+
             <hr>
 
             <div class="row mb-3">
@@ -715,6 +733,8 @@
         $("#gyro-read-count").val(cfg["gyro-read-count"]);      
         $("#gyro-moving-threashold").val(cfg["gyro-moving-threashold"]);
         $("#formula-max-deviation").val(cfg["formula-max-deviation"]);
+        $("#wifi-portal-timeout").val(cfg["wifi-portal-timeout"]);
+        $("#wifi-connect-timeout").val(cfg["wifi-connect-timeout"]);
         $("#int-http1").val(cfg["int-http1"]);
         $("#int-http2").val(cfg["int-http2"]);
         $("#int-http3").val(cfg["int-http3"]);
diff --git a/html/config.min.htm b/html/config.min.htm
index 0e1502b..82a3e60 100644
--- a/html/config.min.htm
+++ b/html/config.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" href="/index.htm">Home</a></li><li class="nav-item"><a class="nav-link active" href="#"><b>Configuration</b></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" id="alert"><div id="alert-msg"></div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><div class="alert alert-warning alert-dismissible hide fade d-none" role="alert" id="warning-sleep"><div>A sleep-interval of less than 300s will reduce battery life, consider using 900s</div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><div class="alert alert-warning alert-dismissible hide fade d-none" role="alert" id="warning-gyro"><div>When using the gyro temperature use a sleep-interval that is greater than 300s for accurate readings</div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><script type="text/javascript">function showError(s){$("#alert").removeClass("alert-success").addClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert-msg").text(s)}function showSuccess(s){$("#alert").addClass("alert-success").removeClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert-msg").text(s)}function showWarningSleep(){$("#warning-sleep").removeClass("d-none").addClass("show").removeClass("hide")}function hideWarningSleep(){$("#warning-sleep").addClass("d-none").removeClass("show").addClass("hide")}function showWarningGyro(){$("#warning-gyro").removeClass("d-none").addClass("show").removeClass("hide")}function hideWarningGyro(){$("#warning-gyro").addClass("d-none").removeClass("show").addClass("hide")}$("#alert-btn").click(function(s){$("#alert").addClass("hide").removeClass("show").addClass("d-none")})</script><div class="accordion" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingDevice"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDevice" aria-expanded="true" aria-controls="collapseDevice"><b>Device settings</b></button></h2><div id="collapseDevice" class="accordion-collapse collapse show" aria-labelledby="headingDevice" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/device" method="post"><input type="text" name="id" id="id1" hidden><div class="row mb-3"><label for="mdns" class="col-sm-2 col-form-label">Device name:</label><div class="col-sm-3"><input type="text" maxlength="12" class="form-control" name="mdns" id="mdns" data-bs-toggle="tooltip" title="Name of the device. Will be used for identifying the device when pushing data and on the local network."></div></div><div class="row mb-3"><fieldset class="form-group row"><legend class="col-form-label col-sm-2 float-sm-left pt-0">Temperature Format:</legend><div class="col-sm-4"><div class="form-check"><input class="form-check-input" type="radio" name="temp-format" id="temp-format-c" value="C" checked data-bs-toggle="tooltip" title="Temperature format used with displaying data"> <label class="form-check-label" for="temp-format-c">Celsius</label></div><div class="form-check"><input class="form-check-input" type="radio" name="temp-format" id="temp-format-f" value="F" data-bs-toggle="tooltip" title="Temperature format used with displaying data"> <label class="form-check-label" for="temp-format-f">Farenheight</label></div></div></fieldset></div><div class="row mb-3"><label for="sleep-interval" class="col-sm-2 col-form-label">Interval (seconds):</label><div class="col-sm-2"><input type="number" min="10" max="3600" class="form-control" name="sleep-interval" id="sleep-interval" data-bs-toggle="tooltip" title="The number of seconds that the device will sleep between gravity readings. Recommended value is 300s"></div><label for="sleep-interval" class="col-sm-4 col-form-label" id="sleep-interval-info"></label></div><div class="row mb-3"><div class="col-sm-4 offset-sm-2"><button type="submit" class="btn btn-primary" id="device-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form><hr class="my-2"><div class="row mb-3"><label for="calibrate-btn" class="col-sm-2 col-form-label">Current calibration:</label> <label for="calibrate-btn" class="col-sm-2 col-form-label" id="gyro-calibration-data">Loading...</label> <label for="gyro-calibration-data" class="col-sm-2 col-form-label" id="angle">Loading...</label><div class="col-sm-8 offset-sm-2"><button type="button" class="btn btn-warning" id="calibrate-btn" data-bs-toggle="tooltip" title="Perform a calibration. The device should be flat on a surface (90 degrees) with the battery down">Calibrate device</button></div></div></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingPush"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePush" aria-expanded="false" aria-controls="collapsePush"><b>Push settings</b></button></h2><div id="collapsePush" class="accordion-collapse collapse" aria-labelledby="headingPush" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/push" method="post"><input type="text" name="id" id="id2" hidden> <input type="text" name="section" value="collapsePush" hidden> <input type="text" name="http-push-h1" id="http-push-h1" hidden> <input type="text" name="http-push-h2" id="http-push-h2" hidden> <input type="text" name="http-push2-h1" id="http-push2-h1" hidden> <input type="text" name="http-push2-h2" id="http-push2-h2" hidden><div class="row mb-3"><label for="http-push" class="col-sm-2 col-form-label">HTTP 1 (POST):</label><div class="col-sm-8"><input type="url" maxlength="120" class="form-control" name="http-push" id="http-push" placeholder="http://www.internet.com/path" data-bs-toggle="tooltip" title="URL to push target, use format http://servername.com/resource (Supports http and https)"></div><div class="col-sm-2"><button type="button" class="btn btn-secondary" data-field1="#http-push-h1" data-field2="#http-push-h2" data-bs-toggle="modal" data-bs-target="#modal-http" data-bs-toggle="tooltip" title="Edit the http headers for data format and authentication">Headers</button></div></div><div class="row mb-3"><label for="http-push2" class="col-sm-2 col-form-label">HTTP 2 (POST):</label><div class="col-sm-8"><input type="url" maxlength="120" class="form-control" name="http-push2" id="http-push2" placeholder="http://www.internet.com/path" data-bs-toggle="tooltip" title="URL to push target, use format http://servername.com/resource (Supports http and https)"></div><div class="col-sm-2"><button type="button" class="btn btn-secondary" data-field1="#http-push2-h1" data-field2="#http-push2-h2" data-bs-toggle="modal" data-bs-target="#modal-http" data-bs-toggle="tooltip" title="Edit the http headers for data format and authentication">Headers</button></div></div><div class="row mb-3"><label for="token" class="col-sm-2 col-form-label">Token:</label><div class="col-sm-4"><input type="text" maxlength="50" class="form-control" name="token" id="token" data-bs-toggle="tooltip" title="Token can be used in the format template as a variable, some services use this for authentication"></div></div><div class="row mb-3"><label for="http-push3" class="col-sm-2 col-form-label">HTTP 3 (GET):</label><div class="col-sm-8"><input type="url" maxlength="120" class="form-control" name="http-push3" id="http-push3" placeholder="http://www.internet.com/path" data-bs-toggle="tooltip" title="URL to push target, use format http://servername.com/resource (Supports http and https). Do not add the query string, that will be added via the format template"></div></div><div class="row mb-3"><label for="token2" class="col-sm-2 col-form-label">Token 2:</label><div class="col-sm-4"><input type="text" maxlength="50" class="form-control" name="token2" id="token2" data-bs-toggle="tooltip" title="Token can be used in the format template as a variable, some services use this for authentication"></div></div><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button type="submit" class="btn btn-primary" id="push-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button class="btn btn-secondary" id="format-btn" data-bs-toggle="tooltip" title="Open up the format editor to change data format posted">Format editor</button> <button class="btn btn-secondary" id="test-btn" data-bs-toggle="tooltip" title="Test posting data to defined push targets">Test Push</button></div></div></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingPush2"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePush2" aria-expanded="false" aria-controls="collapsePush2"><b>Push settings (2)</b></button></h2><div id="collapsePush2" class="accordion-collapse collapse" aria-labelledby="headingPush2" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/push" method="post"><input type="text" name="id" id="id5" hidden> <input type="text" name="section" value="collapsePush2" hidden><div class="row mb-3"><label for="influxdb2-push" class="col-sm-2 col-form-label">InfluxDB v2 URL:</label><div class="col-sm-8"><input type="url" maxlength="40" class="form-control" name="influxdb2-push" placeholder="http://www.internet.com" id="influxdb2-push" data-bs-toggle="tooltip" title="URL to push target, use format http://servername.com (Supports http and https)"></div></div><div class="row mb-3"><label for="influxdb2-org" class="col-sm-2 col-form-label">InfluxDB v2 Org:</label><div class="col-sm-4"><input type="text" maxlength="50" class="form-control" name="influxdb2-org" id="influxdb2-org" data-bs-toggle="tooltip" title="Identifier to what organisation to use"></div></div><div class="row mb-3"><label for="influxdb2-bucket" class="col-sm-2 col-form-label">InfluxDB v2 Bucket:</label><div class="col-sm-4"><input type="text" maxlength="50" class="form-control" name="influxdb2-bucket" id="influxdb2-bucket" data-bs-toggle="tooltip" title="Identifier for the data bucket to use"></div></div><div class="row mb-3"><label for="influxdb2-auth" class="col-sm-2 col-form-label">InfluxDB v2 Auth:</label><div class="col-sm-4"><input type="text" maxlength="100" class="form-control" name="influxdb2-auth" id="influxdb2-auth" data-bs-toggle="tooltip" title="Authentication token for accessing data bucket"></div></div><hr class="my-2"><div class="row mb-3"><label for="mqtt-push" class="col-sm-2 col-form-label">MQTT Server:</label><div class="col-sm-4"><input type="text" maxlength="40" class="form-control" name="mqtt-push" id="mqtt-push" placeholder="www.internet.com" data-bs-toggle="tooltip" title="Name of server to connect to, use format servername.com"></div></div><div class="row mb-3"><label for="mqtt-topic" class="col-sm-2 col-form-label">MQTT Port:</label><div class="col-sm-4"><input type="number" min="1" max="65535" class="form-control" name="mqtt-port" id="mqtt-port" placeholder="1138" data-bs-toggle="tooltip" title="Port number to use, 1138 is standard. Ports higher than 8000 will assume to use SSL"></div></div><div class="row mb-3"><label for="mqtt-user" class="col-sm-2 col-form-label">MQTT User:</label><div class="col-sm-4"><input type="text" maxlength="20" class="form-control" name="mqtt-user" id="mqtt-user" data-bs-toggle="tooltip" title="Username to use. Leave blank if authentication is disabled"></div></div><div class="row mb-3"><label for="mqtt-pass" class="col-sm-2 col-form-label">MQTT Password:</label><div class="col-sm-4"><input type="text" maxlength="20" class="form-control" name="mqtt-pass" id="mqtt-pass" data-bs-toggle="tooltip" title="Password to use. Leave blank if authentication is disabled"></div></div><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button type="submit" class="btn btn-primary" id="push-btn2" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button class="btn btn-secondary" id="format-btn2" data-bs-toggle="tooltip" title="Open up the format editor to change data format posted">Format editor</button> <button class="btn btn-secondary" id="test-btn2" data-bs-toggle="tooltip" title="Test posting data to defined push targets">Test Push</button></div></div></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingGravity"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseGravity" aria-expanded="false" aria-controls="collapseGravity"><b>Gravity</b></button></h2><div id="collapseGravity" class="accordion-collapse collapse" aria-labelledby="headingGravity" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/gravity" method="post"><input type="text" name="id" id="id3" hidden><div class="row mb-3"><fieldset class="form-group row"><legend class="col-form-label col-sm-2 float-sm-left pt-0">Gravity Format:</legend><div class="col-sm-4"><div class="form-check"><input class="form-check-input" type="radio" name="gravity-format" id="gravity-format-g" value="G" checked data-bs-toggle="tooltip" title="Present gravity in SG format"> <label class="form-check-label" for="gravity-format-g">SG</label></div><div class="form-check"><input class="form-check-input" type="radio" name="gravity-format" id="gravity-format-p" value="P" checked data-bs-toggle="tooltip" title="Present gravity in Plato format"> <label class="form-check-label" for="gravity-format-p">Plato</label></div></div></fieldset></div><div class="row mb-3"><label for="gravity-formula" class="col-sm-2 col-form-label">Formula</label><div class="col-sm-10"><input type="text" maxlength="200" class="form-control" name="gravity-formula" id="gravity-formula" checked data-bs-toggle="tooltip" title="Formula used to convert angle to gravity"></div></div><div class="row mb-3"><div class="col-sm-4 offset-sm-2"><div class="form-check"><input class="form-check-input" type="checkbox" name="gravity-temp-adjustment" id="gravity-temp-adjustment" checked data-bs-toggle="tooltip" title="Adjust the calculated gravity based on the current temperature. Assumes that calibration is done using 20C / 68F"> <label class="form-check-label" for="gravity-temp-adjustment">Temperature adjust gravity</label></div></div></div><div class="row mb-3"><div class="col-sm-4 offset-sm-2"><button type="submit" class="btn btn-primary" id="gravity-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingHardware"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseHardware" aria-expanded="false" aria-controls="collapseHardware"><b>Hardware</b></button></h2><div id="collapseHardware" class="accordion-collapse collapse" aria-labelledby="headingHardware" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/hardware" method="post"><input type="text" name="id" id="id4" hidden><div class="row mb-3"><label for="voltage-factor" class="col-sm-2 col-form-label">Voltage factor:</label><div class="col-sm-2"><input type="number" step=".01" class="form-control" name="voltage-factor" id="voltage-factor" data-bs-toggle="tooltip" title="Factor used to calculate the battery voltage. When running on battery, the voltage should be less than 4.15V"></div><label for="voltage-factor" class="col-sm-3 col-form-label" id="battery">Loading...</label></div><div class="row mb-3"><label for="temp-adjustment-value" class="col-sm-2 col-form-label">Temp Sensor Adj:</label><div class="col-sm-2"><input type="number" step=".1" class="form-control" name="temp-adjustment-value" id="temp-adjustment-value" data-bs-toggle="tooltip" title="This value will be added to the sensor value in case the sensor dont show the correct temperature"></div></div><div class="row mb-3"><div class="col-sm-3 offset-sm-2"><div class="form-check"><input class="form-check-input" type="checkbox" name="gyro-temp" id="gyro-temp" data-bs-toggle="tooltip" title="Use the temperature sensor in the gyro instead of DS18B20, require 300s update interval to be accurate"> <label class="form-check-label" for="gyro-temp">Use gyro temperature</label></div></div></div><div class="row mb-3"><label class="col-sm-2 col-form-label" for="ble">Bluetooth tilt color:</label><div class="col-sm-2"><select class="form-select" id="ble" name="ble" disabled data-bs-toggle="tooltip" title="Select the BLE token to be used when sending data over bluetooth"><option value="">-not active-</option><option value="red">red</option><option value="green">green</option><option value="black">black</option><option value="purple">purple</option><option value="orange">orange</option><option value="blue">blue</option><option value="yellow">yellow</option><option value="pink">pink</option></select></div></div><div class="row mb-3"><label for="ota-url" class="col-sm-2 col-form-label">OTA base URL:</label><div class="col-sm-8"><input type="url" maxlength="90" class="form-control" name="ota-url" id="ota-url" placeholder="http://www.local.com/path/" data-bs-toggle="tooltip" title="Base URL to where firmware and version.json file can be found. Needs to end with '/', example: http://www.mysite.com/firmware/"></div></div><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button type="submit" class="btn btn-primary" id="hardware-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button class="btn btn-secondary" id="firmware-btn" checked data-bs-toggle="tooltip" title="Manually upload a new firmware version to the device">Upload firmware</button></div></div></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingAdvanced"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced"><b>Advanced (use with caution)</b></button></h2><div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/advanced" method="post"><input type="text" name="id" id="id6" hidden><div class="row mb-3"><label for="gyro-read-count" class="col-sm-3 col-form-label">Gyro reads:</label><div class="col-sm-2"><input type="number" min="10" max="100" class="form-control" name="gyro-read-count" id="gyro-read-count" checked data-bs-toggle="tooltip" title="How many times should we read the gyro to get an accurate angle. More reads = better accuracy but higher battery drain"></div><div class="col-sm-5">(10-100) - default 50</div></div><div class="row mb-3"><label for="gyro-moving-threashold" class="col-sm-3 col-form-label">Gyro moving theashold:</label><div class="col-sm-2"><input type="number" min="50" max="1000" class="form-control" name="gyro-moving-threashold" id="gyro-moving-threashold" checked data-bs-toggle="tooltip" title="How much deviation between gyro reads are acceptable in order to regard this as a valid angle"></div><div class="col-sm-5">(50-1000) - default 500</div></div><div class="row mb-3"><label for="formula-max-deviation" class="col-sm-3 col-form-label">Formula max deviation (SG):</label><div class="col-sm-2"><input type="number" step=".1" min="1" max="10" class="form-control" name="formula-max-deviation" id="formula-max-deviation" checked data-bs-toggle="tooltip" title="When validating the derived formula this is the maximum accepted deviation for the supplied values"></div><div class="col-sm-5">(1 - 10) - default 1.6 SG</div></div><hr><div class="row mb-3"><label for="int-http1" class="col-sm-3 col-form-label">Skip interval - HTTP 1 (POST):</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-http1" id="int-http1" checked data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><label for="int-http2" class="col-sm-3 col-form-label">Skip interval - HTTP 2 (POST):</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-http2" id="int-http2" data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><label for="int-http3" class="col-sm-3 col-form-label">Skip interval - HTTP 3 (GET):</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-http3" id="int-http3" data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><label for="int-influx" class="col-sm-3 col-form-label">Skip interval - InfluxDB v2:</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-influx" id="int-influx" data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><label for="int-mqtt" class="col-sm-3 col-form-label">Skip interval - MQTT:</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-mqtt" id="int-mqtt" data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><div class="col-sm-8 offset-sm-3"><button type="submit" class="btn btn-primary" id="advanced-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form></div></div></div></div><div class="modal fade" id="modal-http" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="modal-header" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="modal-header">Define HTTP headers</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><label for="http-header" class="col-form-label">Header 1 (Header: value)</label> <input type="text" maxlength="100" class="form-control" id="header1" oninput="checkHeader(this)" placeholder="Content-Type: application/json" data-bs-toggle="tooltip" title="Set a http headers, empty string is skipped"> <label for="http-header" class="col-form-label">Header 2 (Header: value)</label> <input type="text" maxlength="100" class="form-control" id="header2" oninput="checkHeader(this)" data-bs-toggle="tooltip" title="Set a http headers, empty string is skipped"> <input type="text" id="field1" hidden> <input type="text" id="field2" hidden></div><div class="modal-footer"><button type="button" class="btn btn-primary" data-bs-dismiss="modal" data-bs-toggle="tooltip" title="Close dialog, press the save button in the section to save data">Close</button></div></div></div></div><script>function checkHeader(d){console.log(d.value),""!=d.value&&-1==d.value.indexOf(":")?($("#btn-close").prop("disabled",!0),$(d).removeClass("is-valid").addClass("is-invalid")):($("#btn-close").prop("disabled",!1),$(d).removeClass("is-invalid").addClass("is-valid"))}$("#modal-http").on("show.bs.modal",function(d){var l=$(d.relatedTarget),a=l.data("field1"),e=l.data("field2"),o=$(this);o.find(".modal-body #header1").val($(a).val()),o.find(".modal-body #header2").val($(e).val()),o.find(".modal-body #field1").val(a),o.find(".modal-body #field2").val(e)}),$("#modal-http").on("hide.bs.modal",function(d){console.log("2");var l=$(this);field1=l.find(".modal-body #field1").val(),field2=l.find(".modal-body #field2").val(),$(field1).val(l.find(".modal-body #header1").val()),$(field2).val(l.find(".modal-body #header2").val())})</script><script type="text/javascript">function estimateBatteryLife(t,a){var e=170,o=15,i=2e3;a<1&&(a=2);var n=86400/(t+a)*(a/3600)*e+o;return i/n}function updateSleepInfo(){var t=parseInt($("#sleep-interval").val()),a=parseInt($("#runtime-average").val()),e=0;0<a&&(e=estimateBatteryLife(t,a));var o=Math.floor(t/60)+" m "+t%60+" s",i=Math.floor(e/7)+" weeks "+Math.floor(e%7)+" days";e?$("#sleep-interval-info").text(o+"  -  Estimated runtime: "+i):$("#sleep-interval-info").text(o),hideWarningGyro(),0<t&&t<300?($("#gyro-temp").is(":checked")&&showWarningGyro(),showWarningSleep()):hideWarningSleep()}function setButtonDisabled(t){$("#device-btn").prop("disabled",t),$("#calibrate-btn").prop("disabled",t),$("#push-btn").prop("disabled",t),$("#format-btn").prop("disabled",t),$("#test-btn").prop("disabled",t),$("#gravity-btn").prop("disabled",t),$("#hardware-btn").prop("disabled",t),$("#push-btn2").prop("disabled",t),$("#format-btn2").prop("disabled",t),$("#test-btn2").prop("disabled",t),$("#advanced-btn").prop("disabled",t)}function getAdvancedConfig(){setButtonDisabled(!0);var t="/api/config/advanced";$("#spinner").show(),$.getJSON(t,function(t){console.log(t),$("#gyro-read-count").val(t["gyro-read-count"]),$("#gyro-moving-threashold").val(t["gyro-moving-threashold"]),$("#formula-max-deviation").val(t["formula-max-deviation"]),$("#int-http1").val(t["int-http1"]),$("#int-http2").val(t["int-http2"]),$("#int-http3").val(t["int-http3"]),$("#int-influx").val(t["int-influx"]),$("#int-mqtt").val(t["int-mqtt"])}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1)})}function getConfig(){setButtonDisabled(!0);var t="/api/config";$("#spinner").show(),$.getJSON(t,function(t){console.log(t),"esp32"==t.platform&&($("#ble").prop("disabled",!1),$("#ble").val(t.ble)),$("#id1").val(t.id),$("#id2").val(t.id),$("#id3").val(t.id),$("#id4").val(t.id),$("#id5").val(t.id),$("#id6").val(t.id),$("#mdns").val(t.mdns),"C"==t["temp-format"]?$("#temp-format-c").click():$("#temp-format-f").click(),"G"==t["gravity-format"]?$("#gravity-format-g").click():$("#gravity-format-p").click(),$("#ota-url").val(t["ota-url"]),$("#token").val(t.token),$("#token2").val(t.token2),$("#http-push").val(t["http-push"]),$("#http-push-h1").val(t["http-push-h1"]),$("#http-push-h2").val(t["http-push-h2"]),$("#http-push2").val(t["http-push2"]),$("#http-push2-h1").val(t["http-push2-h1"]),$("#http-push2-h2").val(t["http-push2-h2"]),$("#http-push3").val(t["http-push3"]),$("#influxdb2-push").val(t["influxdb2-push"]),$("#influxdb2-org").val(t["influxdb2-org"]),$("#influxdb2-bucket").val(t["influxdb2-bucket"]),$("#influxdb2-auth").val(t["influxdb2-auth"]),$("#mqtt-push").val(t["mqtt-push"]),$("#mqtt-port").val(t["mqtt-port"]),$("#mqtt-user").val(t["mqtt-user"]),$("#mqtt-pass").val(t["mqtt-pass"]),$("#sleep-interval").val(t["sleep-interval"]),$("#voltage-factor").val(t["voltage-factor"]),$("#gravity-formula").val(t["gravity-formula"]),$("#temp-adjustment-value").val(t["temp-adjustment-value"]),$("#gravity-temp-adjustment").prop("checked",t["gravity-temp-adjustment"]),$("#gyro-temp").prop("checked",t["gyro-temp"]),$("#gyro-calibration-data").text(t["gyro-calibration-data"].ax+","+t["gyro-calibration-data"].ay+","+t["gyro-calibration-data"].az+","+t["gyro-calibration-data"].gx+","+t["gyro-calibration-data"].gy+","+t["gyro-calibration-data"].gz),$("#battery").text(t.battery+" V"),$("#angle").text(t.angle),$("#runtime-average").val(t["runtime-average"])}).fail(function(){showError("Unable to get data from the device.")}).always(function(){updateSleepInfo(),getAdvancedConfig()})}window.onload=getConfig,setButtonDisabled(!0),$(document).ready(function(){null!=location.hash&&""!=location.hash&&($(".collapse").removeClass("in"),$(location.hash+".collapse").collapse("show"))}),$("#calibrate-btn").click(function(t){console.log("Calibrating..."),$.ajax({type:"POST",url:"/api/calibrate",data:{id:$("#id1").val()},success:function(t){showSuccess("Calibration of device was completed successfully."),getConfig()},error:function(t){showError("Unable to calibrate device.")}})}),$("#firmware-btn").click(function(t){window.location.href="/firmware.htm"}),$("#format-btn").click(function(t){window.location.href="/format.htm"}),$("#format-btn2").click(function(t){window.location.href="/format.htm"}),$("#test-btn").click(function(t){window.location.href="/test.htm"}),$("#test-btn2").click(function(t){window.location.href="/test.htm"}),$("#sleep-interval").keyup(updateSleepInfo),$("#gyro-temp").change(updateSleepInfo)</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></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" href="/index.htm">Home</a></li><li class="nav-item"><a class="nav-link active" href="#"><b>Configuration</b></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" id="alert"><div id="alert-msg"></div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><div class="alert alert-warning alert-dismissible hide fade d-none" role="alert" id="warning-sleep"><div>A sleep-interval of less than 300s will reduce battery life, consider using 900s</div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><div class="alert alert-warning alert-dismissible hide fade d-none" role="alert" id="warning-gyro"><div>When using the gyro temperature use a sleep-interval that is greater than 300s for accurate readings</div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><script type="text/javascript">function showError(s){$("#alert").removeClass("alert-success").addClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert-msg").text(s)}function showSuccess(s){$("#alert").addClass("alert-success").removeClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert-msg").text(s)}function showWarningSleep(){$("#warning-sleep").removeClass("d-none").addClass("show").removeClass("hide")}function hideWarningSleep(){$("#warning-sleep").addClass("d-none").removeClass("show").addClass("hide")}function showWarningGyro(){$("#warning-gyro").removeClass("d-none").addClass("show").removeClass("hide")}function hideWarningGyro(){$("#warning-gyro").addClass("d-none").removeClass("show").addClass("hide")}$("#alert-btn").click(function(s){$("#alert").addClass("hide").removeClass("show").addClass("d-none")})</script><div class="accordion" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingDevice"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDevice" aria-expanded="true" aria-controls="collapseDevice"><b>Device settings</b></button></h2><div id="collapseDevice" class="accordion-collapse collapse show" aria-labelledby="headingDevice" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/device" method="post"><input type="text" name="id" id="id1" hidden><div class="row mb-3"><label for="mdns" class="col-sm-2 col-form-label">Device name:</label><div class="col-sm-3"><input type="text" maxlength="12" class="form-control" name="mdns" id="mdns" data-bs-toggle="tooltip" title="Name of the device. Will be used for identifying the device when pushing data and on the local network."></div></div><div class="row mb-3"><fieldset class="form-group row"><legend class="col-form-label col-sm-2 float-sm-left pt-0">Temperature Format:</legend><div class="col-sm-4"><div class="form-check"><input class="form-check-input" type="radio" name="temp-format" id="temp-format-c" value="C" checked data-bs-toggle="tooltip" title="Temperature format used with displaying data"> <label class="form-check-label" for="temp-format-c">Celsius</label></div><div class="form-check"><input class="form-check-input" type="radio" name="temp-format" id="temp-format-f" value="F" data-bs-toggle="tooltip" title="Temperature format used with displaying data"> <label class="form-check-label" for="temp-format-f">Farenheight</label></div></div></fieldset></div><div class="row mb-3"><label for="sleep-interval" class="col-sm-2 col-form-label">Interval (seconds):</label><div class="col-sm-2"><input type="number" min="10" max="3600" class="form-control" name="sleep-interval" id="sleep-interval" data-bs-toggle="tooltip" title="The number of seconds that the device will sleep between gravity readings. Recommended value is 300s"></div><label for="sleep-interval" class="col-sm-4 col-form-label" id="sleep-interval-info"></label></div><div class="row mb-3"><div class="col-sm-4 offset-sm-2"><button type="submit" class="btn btn-primary" id="device-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form><hr class="my-2"><div class="row mb-3"><label for="calibrate-btn" class="col-sm-2 col-form-label">Current calibration:</label> <label for="calibrate-btn" class="col-sm-2 col-form-label" id="gyro-calibration-data">Loading...</label> <label for="gyro-calibration-data" class="col-sm-2 col-form-label" id="angle">Loading...</label><div class="col-sm-8 offset-sm-2"><button type="button" class="btn btn-warning" id="calibrate-btn" data-bs-toggle="tooltip" title="Perform a calibration. The device should be flat on a surface (90 degrees) with the battery down">Calibrate device</button></div></div></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingPush"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePush" aria-expanded="false" aria-controls="collapsePush"><b>Push settings</b></button></h2><div id="collapsePush" class="accordion-collapse collapse" aria-labelledby="headingPush" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/push" method="post"><input type="text" name="id" id="id2" hidden> <input type="text" name="section" value="collapsePush" hidden> <input type="text" name="http-push-h1" id="http-push-h1" hidden> <input type="text" name="http-push-h2" id="http-push-h2" hidden> <input type="text" name="http-push2-h1" id="http-push2-h1" hidden> <input type="text" name="http-push2-h2" id="http-push2-h2" hidden><div class="row mb-3"><label for="http-push" class="col-sm-2 col-form-label">HTTP 1 (POST):</label><div class="col-sm-8"><input type="url" maxlength="120" class="form-control" name="http-push" id="http-push" placeholder="http://www.internet.com/path" data-bs-toggle="tooltip" title="URL to push target, use format http://servername.com/resource (Supports http and https)"></div><div class="col-sm-2"><button type="button" class="btn btn-secondary" data-field1="#http-push-h1" data-field2="#http-push-h2" data-bs-toggle="modal" data-bs-target="#modal-http" data-bs-toggle="tooltip" title="Edit the http headers for data format and authentication">Headers</button></div></div><div class="row mb-3"><label for="http-push2" class="col-sm-2 col-form-label">HTTP 2 (POST):</label><div class="col-sm-8"><input type="url" maxlength="120" class="form-control" name="http-push2" id="http-push2" placeholder="http://www.internet.com/path" data-bs-toggle="tooltip" title="URL to push target, use format http://servername.com/resource (Supports http and https)"></div><div class="col-sm-2"><button type="button" class="btn btn-secondary" data-field1="#http-push2-h1" data-field2="#http-push2-h2" data-bs-toggle="modal" data-bs-target="#modal-http" data-bs-toggle="tooltip" title="Edit the http headers for data format and authentication">Headers</button></div></div><div class="row mb-3"><label for="token" class="col-sm-2 col-form-label">Token:</label><div class="col-sm-4"><input type="text" maxlength="50" class="form-control" name="token" id="token" data-bs-toggle="tooltip" title="Token can be used in the format template as a variable, some services use this for authentication"></div></div><div class="row mb-3"><label for="http-push3" class="col-sm-2 col-form-label">HTTP 3 (GET):</label><div class="col-sm-8"><input type="url" maxlength="120" class="form-control" name="http-push3" id="http-push3" placeholder="http://www.internet.com/path" data-bs-toggle="tooltip" title="URL to push target, use format http://servername.com/resource (Supports http and https). Do not add the query string, that will be added via the format template"></div></div><div class="row mb-3"><label for="token2" class="col-sm-2 col-form-label">Token 2:</label><div class="col-sm-4"><input type="text" maxlength="50" class="form-control" name="token2" id="token2" data-bs-toggle="tooltip" title="Token can be used in the format template as a variable, some services use this for authentication"></div></div><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button type="submit" class="btn btn-primary" id="push-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button class="btn btn-secondary" id="format-btn" data-bs-toggle="tooltip" title="Open up the format editor to change data format posted">Format editor</button> <button class="btn btn-secondary" id="test-btn" data-bs-toggle="tooltip" title="Test posting data to defined push targets">Test Push</button></div></div></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingPush2"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePush2" aria-expanded="false" aria-controls="collapsePush2"><b>Push settings (2)</b></button></h2><div id="collapsePush2" class="accordion-collapse collapse" aria-labelledby="headingPush2" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/push" method="post"><input type="text" name="id" id="id5" hidden> <input type="text" name="section" value="collapsePush2" hidden><div class="row mb-3"><label for="influxdb2-push" class="col-sm-2 col-form-label">InfluxDB v2 URL:</label><div class="col-sm-8"><input type="url" maxlength="40" class="form-control" name="influxdb2-push" placeholder="http://www.internet.com" id="influxdb2-push" data-bs-toggle="tooltip" title="URL to push target, use format http://servername.com (Supports http and https)"></div></div><div class="row mb-3"><label for="influxdb2-org" class="col-sm-2 col-form-label">InfluxDB v2 Org:</label><div class="col-sm-4"><input type="text" maxlength="50" class="form-control" name="influxdb2-org" id="influxdb2-org" data-bs-toggle="tooltip" title="Identifier to what organisation to use"></div></div><div class="row mb-3"><label for="influxdb2-bucket" class="col-sm-2 col-form-label">InfluxDB v2 Bucket:</label><div class="col-sm-4"><input type="text" maxlength="50" class="form-control" name="influxdb2-bucket" id="influxdb2-bucket" data-bs-toggle="tooltip" title="Identifier for the data bucket to use"></div></div><div class="row mb-3"><label for="influxdb2-auth" class="col-sm-2 col-form-label">InfluxDB v2 Auth:</label><div class="col-sm-4"><input type="text" maxlength="100" class="form-control" name="influxdb2-auth" id="influxdb2-auth" data-bs-toggle="tooltip" title="Authentication token for accessing data bucket"></div></div><hr class="my-2"><div class="row mb-3"><label for="mqtt-push" class="col-sm-2 col-form-label">MQTT Server:</label><div class="col-sm-4"><input type="text" maxlength="40" class="form-control" name="mqtt-push" id="mqtt-push" placeholder="www.internet.com" data-bs-toggle="tooltip" title="Name of server to connect to, use format servername.com"></div></div><div class="row mb-3"><label for="mqtt-topic" class="col-sm-2 col-form-label">MQTT Port:</label><div class="col-sm-4"><input type="number" min="1" max="65535" class="form-control" name="mqtt-port" id="mqtt-port" placeholder="1138" data-bs-toggle="tooltip" title="Port number to use, 1138 is standard. Ports higher than 8000 will assume to use SSL"></div></div><div class="row mb-3"><label for="mqtt-user" class="col-sm-2 col-form-label">MQTT User:</label><div class="col-sm-4"><input type="text" maxlength="20" class="form-control" name="mqtt-user" id="mqtt-user" data-bs-toggle="tooltip" title="Username to use. Leave blank if authentication is disabled"></div></div><div class="row mb-3"><label for="mqtt-pass" class="col-sm-2 col-form-label">MQTT Password:</label><div class="col-sm-4"><input type="text" maxlength="20" class="form-control" name="mqtt-pass" id="mqtt-pass" data-bs-toggle="tooltip" title="Password to use. Leave blank if authentication is disabled"></div></div><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button type="submit" class="btn btn-primary" id="push-btn2" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button class="btn btn-secondary" id="format-btn2" data-bs-toggle="tooltip" title="Open up the format editor to change data format posted">Format editor</button> <button class="btn btn-secondary" id="test-btn2" data-bs-toggle="tooltip" title="Test posting data to defined push targets">Test Push</button></div></div></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingGravity"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseGravity" aria-expanded="false" aria-controls="collapseGravity"><b>Gravity</b></button></h2><div id="collapseGravity" class="accordion-collapse collapse" aria-labelledby="headingGravity" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/gravity" method="post"><input type="text" name="id" id="id3" hidden><div class="row mb-3"><fieldset class="form-group row"><legend class="col-form-label col-sm-2 float-sm-left pt-0">Gravity Format:</legend><div class="col-sm-4"><div class="form-check"><input class="form-check-input" type="radio" name="gravity-format" id="gravity-format-g" value="G" checked data-bs-toggle="tooltip" title="Present gravity in SG format"> <label class="form-check-label" for="gravity-format-g">SG</label></div><div class="form-check"><input class="form-check-input" type="radio" name="gravity-format" id="gravity-format-p" value="P" checked data-bs-toggle="tooltip" title="Present gravity in Plato format"> <label class="form-check-label" for="gravity-format-p">Plato</label></div></div></fieldset></div><div class="row mb-3"><label for="gravity-formula" class="col-sm-2 col-form-label">Formula</label><div class="col-sm-10"><input type="text" maxlength="200" class="form-control" name="gravity-formula" id="gravity-formula" checked data-bs-toggle="tooltip" title="Formula used to convert angle to gravity"></div></div><div class="row mb-3"><div class="col-sm-4 offset-sm-2"><div class="form-check"><input class="form-check-input" type="checkbox" name="gravity-temp-adjustment" id="gravity-temp-adjustment" checked data-bs-toggle="tooltip" title="Adjust the calculated gravity based on the current temperature. Assumes that calibration is done using 20C / 68F"> <label class="form-check-label" for="gravity-temp-adjustment">Temperature adjust gravity</label></div></div></div><div class="row mb-3"><div class="col-sm-4 offset-sm-2"><button type="submit" class="btn btn-primary" id="gravity-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingHardware"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseHardware" aria-expanded="false" aria-controls="collapseHardware"><b>Hardware</b></button></h2><div id="collapseHardware" class="accordion-collapse collapse" aria-labelledby="headingHardware" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/hardware" method="post"><input type="text" name="id" id="id4" hidden><div class="row mb-3"><label for="voltage-factor" class="col-sm-2 col-form-label">Voltage factor:</label><div class="col-sm-2"><input type="number" step=".01" class="form-control" name="voltage-factor" id="voltage-factor" data-bs-toggle="tooltip" title="Factor used to calculate the battery voltage. When running on battery, the voltage should be less than 4.15V"></div><label for="voltage-factor" class="col-sm-3 col-form-label" id="battery">Loading...</label></div><div class="row mb-3"><label for="temp-adjustment-value" class="col-sm-2 col-form-label">Temp Sensor Adj:</label><div class="col-sm-2"><input type="number" step=".1" class="form-control" name="temp-adjustment-value" id="temp-adjustment-value" data-bs-toggle="tooltip" title="This value will be added to the sensor value in case the sensor dont show the correct temperature"></div></div><div class="row mb-3"><div class="col-sm-3 offset-sm-2"><div class="form-check"><input class="form-check-input" type="checkbox" name="gyro-temp" id="gyro-temp" data-bs-toggle="tooltip" title="Use the temperature sensor in the gyro instead of DS18B20, require 300s update interval to be accurate"> <label class="form-check-label" for="gyro-temp">Use gyro temperature</label></div></div></div><div class="row mb-3"><label class="col-sm-2 col-form-label" for="ble">Bluetooth tilt color:</label><div class="col-sm-2"><select class="form-select" id="ble" name="ble" disabled data-bs-toggle="tooltip" title="Select the BLE token to be used when sending data over bluetooth"><option value="">-not active-</option><option value="red">red</option><option value="green">green</option><option value="black">black</option><option value="purple">purple</option><option value="orange">orange</option><option value="blue">blue</option><option value="yellow">yellow</option><option value="pink">pink</option></select></div></div><div class="row mb-3"><label for="ota-url" class="col-sm-2 col-form-label">OTA base URL:</label><div class="col-sm-8"><input type="url" maxlength="90" class="form-control" name="ota-url" id="ota-url" placeholder="http://www.local.com/path/" data-bs-toggle="tooltip" title="Base URL to where firmware and version.json file can be found. Needs to end with '/', example: http://www.mysite.com/firmware/"></div></div><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button type="submit" class="btn btn-primary" id="hardware-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form><div class="row mb-3"><div class="col-sm-8 offset-sm-2"><button class="btn btn-secondary" id="firmware-btn" checked data-bs-toggle="tooltip" title="Manually upload a new firmware version to the device">Upload firmware</button></div></div></div></div></div><div class="accordion-item"><h2 class="accordion-header" id="headingAdvanced"><button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced"><b>Advanced (use with caution)</b></button></h2><div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced" data-bs-parent="#accordion"><div class="accordion-body"><form action="/api/config/advanced" method="post"><input type="text" name="id" id="id6" hidden><div class="row mb-3"><label for="gyro-read-count" class="col-sm-3 col-form-label">Gyro reads:</label><div class="col-sm-2"><input type="number" min="10" max="100" class="form-control" name="gyro-read-count" id="gyro-read-count" checked data-bs-toggle="tooltip" title="How many times should we read the gyro to get an accurate angle. More reads = better accuracy but higher battery drain"></div><div class="col-sm-5">(10-100) - default 50</div></div><div class="row mb-3"><label for="gyro-moving-threashold" class="col-sm-3 col-form-label">Gyro moving theashold:</label><div class="col-sm-2"><input type="number" min="50" max="1000" class="form-control" name="gyro-moving-threashold" id="gyro-moving-threashold" checked data-bs-toggle="tooltip" title="How much deviation between gyro reads are acceptable in order to regard this as a valid angle"></div><div class="col-sm-5">(50-1000) - default 500</div></div><div class="row mb-3"><label for="formula-max-deviation" class="col-sm-3 col-form-label">Formula max deviation (SG):</label><div class="col-sm-2"><input type="number" step=".1" min="1" max="10" class="form-control" name="formula-max-deviation" id="formula-max-deviation" checked data-bs-toggle="tooltip" title="When validating the derived formula this is the maximum accepted deviation for the supplied values"></div><div class="col-sm-5">(1 - 10) - default 1.6 SG</div></div><hr><div class="row mb-3"><label for="wifi-connect-timeout" class="col-sm-3 col-form-label">Wifi connect timeout (s):</label><div class="col-sm-2"><input type="number" min="1" max="60" class="form-control" name="wifi-connect-timeout" id="wifi-connect-timeout" checked data-bs-toggle="tooltip" title="Max time waiting for a wifi connection before going back to sleep"></div><div class="col-sm-5">(1 - 60) - default 20 s</div></div><div class="row mb-3"><label for="wifi-portal-timeout" class="col-sm-3 col-form-label">Wifi portal timeout (s):</label><div class="col-sm-2"><input type="number" min="10" max="240" class="form-control" name="wifi-portal-timeout" id="wifi-portal-timeout" checked data-bs-toggle="tooltip" title="Max time the wifi portal is active before existing"></div><div class="col-sm-5">(10 - 240) - default 120 s</div></div><hr><div class="row mb-3"><label for="int-http1" class="col-sm-3 col-form-label">Skip interval - HTTP 1 (POST):</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-http1" id="int-http1" checked data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><label for="int-http2" class="col-sm-3 col-form-label">Skip interval - HTTP 2 (POST):</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-http2" id="int-http2" data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><label for="int-http3" class="col-sm-3 col-form-label">Skip interval - HTTP 3 (GET):</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-http3" id="int-http3" data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><label for="int-influx" class="col-sm-3 col-form-label">Skip interval - InfluxDB v2:</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-influx" id="int-influx" data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><label for="int-mqtt" class="col-sm-3 col-form-label">Skip interval - MQTT:</label><div class="col-sm-2"><input type="number" min="0" max="5" class="form-control" name="int-mqtt" id="int-mqtt" data-bs-toggle="tooltip" title="Defines how many sleep cycles to skip between pushing data to this target, 1 = every second cycle"></div><div class="col-sm-5">(0 - 5) - default 0</div></div><div class="row mb-3"><div class="col-sm-8 offset-sm-3"><button type="submit" class="btn btn-primary" id="advanced-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button></div></div></form></div></div></div></div><div class="modal fade" id="modal-http" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="modal-header" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="modal-header">Define HTTP headers</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><label for="http-header" class="col-form-label">Header 1 (Header: value)</label> <input type="text" maxlength="100" class="form-control" id="header1" oninput="checkHeader(this)" placeholder="Content-Type: application/json" data-bs-toggle="tooltip" title="Set a http headers, empty string is skipped"> <label for="http-header" class="col-form-label">Header 2 (Header: value)</label> <input type="text" maxlength="100" class="form-control" id="header2" oninput="checkHeader(this)" data-bs-toggle="tooltip" title="Set a http headers, empty string is skipped"> <input type="text" id="field1" hidden> <input type="text" id="field2" hidden></div><div class="modal-footer"><button type="button" class="btn btn-primary" data-bs-dismiss="modal" data-bs-toggle="tooltip" title="Close dialog, press the save button in the section to save data">Close</button></div></div></div></div><script>function checkHeader(d){console.log(d.value),""!=d.value&&-1==d.value.indexOf(":")?($("#btn-close").prop("disabled",!0),$(d).removeClass("is-valid").addClass("is-invalid")):($("#btn-close").prop("disabled",!1),$(d).removeClass("is-invalid").addClass("is-valid"))}$("#modal-http").on("show.bs.modal",function(d){var l=$(d.relatedTarget),a=l.data("field1"),e=l.data("field2"),o=$(this);o.find(".modal-body #header1").val($(a).val()),o.find(".modal-body #header2").val($(e).val()),o.find(".modal-body #field1").val(a),o.find(".modal-body #field2").val(e)}),$("#modal-http").on("hide.bs.modal",function(d){console.log("2");var l=$(this);field1=l.find(".modal-body #field1").val(),field2=l.find(".modal-body #field2").val(),$(field1).val(l.find(".modal-body #header1").val()),$(field2).val(l.find(".modal-body #header2").val())})</script><script type="text/javascript">function estimateBatteryLife(t,a){var e=170,i=15,o=2e3;a<1&&(a=2);var n=86400/(t+a)*(a/3600)*e+i;return o/n}function updateSleepInfo(){var t=parseInt($("#sleep-interval").val()),a=parseInt($("#runtime-average").val()),e=0;0<a&&(e=estimateBatteryLife(t,a));var i=Math.floor(t/60)+" m "+t%60+" s",o=Math.floor(e/7)+" weeks "+Math.floor(e%7)+" days";e?$("#sleep-interval-info").text(i+"  -  Estimated runtime: "+o):$("#sleep-interval-info").text(i),hideWarningGyro(),0<t&&t<300?($("#gyro-temp").is(":checked")&&showWarningGyro(),showWarningSleep()):hideWarningSleep()}function setButtonDisabled(t){$("#device-btn").prop("disabled",t),$("#calibrate-btn").prop("disabled",t),$("#push-btn").prop("disabled",t),$("#format-btn").prop("disabled",t),$("#test-btn").prop("disabled",t),$("#gravity-btn").prop("disabled",t),$("#hardware-btn").prop("disabled",t),$("#push-btn2").prop("disabled",t),$("#format-btn2").prop("disabled",t),$("#test-btn2").prop("disabled",t),$("#advanced-btn").prop("disabled",t)}function getAdvancedConfig(){setButtonDisabled(!0);var t="/api/config/advanced";$("#spinner").show(),$.getJSON(t,function(t){console.log(t),$("#gyro-read-count").val(t["gyro-read-count"]),$("#gyro-moving-threashold").val(t["gyro-moving-threashold"]),$("#formula-max-deviation").val(t["formula-max-deviation"]),$("#wifi-portal-timeout").val(t["wifi-portal-timeout"]),$("#wifi-connect-timeout").val(t["wifi-connect-timeout"]),$("#int-http1").val(t["int-http1"]),$("#int-http2").val(t["int-http2"]),$("#int-http3").val(t["int-http3"]),$("#int-influx").val(t["int-influx"]),$("#int-mqtt").val(t["int-mqtt"])}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1)})}function getConfig(){setButtonDisabled(!0);var t="/api/config";$("#spinner").show(),$.getJSON(t,function(t){console.log(t),"esp32"==t.platform&&($("#ble").prop("disabled",!1),$("#ble").val(t.ble)),$("#id1").val(t.id),$("#id2").val(t.id),$("#id3").val(t.id),$("#id4").val(t.id),$("#id5").val(t.id),$("#id6").val(t.id),$("#mdns").val(t.mdns),"C"==t["temp-format"]?$("#temp-format-c").click():$("#temp-format-f").click(),"G"==t["gravity-format"]?$("#gravity-format-g").click():$("#gravity-format-p").click(),$("#ota-url").val(t["ota-url"]),$("#token").val(t.token),$("#token2").val(t.token2),$("#http-push").val(t["http-push"]),$("#http-push-h1").val(t["http-push-h1"]),$("#http-push-h2").val(t["http-push-h2"]),$("#http-push2").val(t["http-push2"]),$("#http-push2-h1").val(t["http-push2-h1"]),$("#http-push2-h2").val(t["http-push2-h2"]),$("#http-push3").val(t["http-push3"]),$("#influxdb2-push").val(t["influxdb2-push"]),$("#influxdb2-org").val(t["influxdb2-org"]),$("#influxdb2-bucket").val(t["influxdb2-bucket"]),$("#influxdb2-auth").val(t["influxdb2-auth"]),$("#mqtt-push").val(t["mqtt-push"]),$("#mqtt-port").val(t["mqtt-port"]),$("#mqtt-user").val(t["mqtt-user"]),$("#mqtt-pass").val(t["mqtt-pass"]),$("#sleep-interval").val(t["sleep-interval"]),$("#voltage-factor").val(t["voltage-factor"]),$("#gravity-formula").val(t["gravity-formula"]),$("#temp-adjustment-value").val(t["temp-adjustment-value"]),$("#gravity-temp-adjustment").prop("checked",t["gravity-temp-adjustment"]),$("#gyro-temp").prop("checked",t["gyro-temp"]),$("#gyro-calibration-data").text(t["gyro-calibration-data"].ax+","+t["gyro-calibration-data"].ay+","+t["gyro-calibration-data"].az+","+t["gyro-calibration-data"].gx+","+t["gyro-calibration-data"].gy+","+t["gyro-calibration-data"].gz),$("#battery").text(t.battery+" V"),$("#angle").text(t.angle),$("#runtime-average").val(t["runtime-average"])}).fail(function(){showError("Unable to get data from the device.")}).always(function(){updateSleepInfo(),getAdvancedConfig()})}window.onload=getConfig,setButtonDisabled(!0),$(document).ready(function(){null!=location.hash&&""!=location.hash&&($(".collapse").removeClass("in"),$(location.hash+".collapse").collapse("show"))}),$("#calibrate-btn").click(function(t){console.log("Calibrating..."),$.ajax({type:"POST",url:"/api/calibrate",data:{id:$("#id1").val()},success:function(t){showSuccess("Calibration of device was completed successfully."),getConfig()},error:function(t){showError("Unable to calibrate device.")}})}),$("#firmware-btn").click(function(t){window.location.href="/firmware.htm"}),$("#format-btn").click(function(t){window.location.href="/format.htm"}),$("#format-btn2").click(function(t){window.location.href="/format.htm"}),$("#test-btn").click(function(t){window.location.href="/test.htm"}),$("#test-btn2").click(function(t){window.location.href="/test.htm"}),$("#sleep-interval").keyup(updateSleepInfo),$("#gyro-temp").change(updateSleepInfo)</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></div></body></html>
\ No newline at end of file
diff --git a/html/format.min.htm b/html/format.min.htm
index 3ab73e1..5c0697f 100644
--- a/html/format.min.htm
+++ b/html/format.min.htm
@@ -1,8 +1,8 @@
 <!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 mr-auto"><li class="nav-item"><a class="nav-link" href="javascript:history.back()">Back to configuration</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){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("hide").removeClass("show").addClass("d-none")})</script><div class="accordion" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingFormat"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFormat" aria-expanded="true" aria-controls="collapseFormat"><b>Push Format Templates</b></button></h2><div id="collapseFormat" class="accordion-collapse collapse show" aria-labelledby="headingFormat" data-bs-parent="#accordion"><div class="accordion-body"><input type="text" name="id" id="id" hidden> <input type="text" name="http-1" id="http-1" hidden> <input type="text" name="http-2" id="http-2" hidden> <input type="text" name="http-3" id="http-3" hidden> <input type="text" name="influxdb" id="influxdb" hidden> <input type="text" name="mqtt" id="mqtt" hidden><div class="row mb-3"><label for="push-target" class="col-sm-2 col-form-label">Push target:</label> <select class="custom-select col-sm-4" required name="push-target" id="push-target" data-bs-toggle="tooltip" title="Select the push target to edit format template for"><option value="http-1">HTTP option 1 (post)</option><option value="http-2">HTTP option 2 (post)</option><option value="http-3">HTTP option 3 (get)</option><option value="influxdb">Influx DB</option><option value="mqtt">MQTT</option></select></div><div class="row mb-3"><div class="col-sm-12"><textarea rows="10" class="form-control" name="format" id="format">  
                 </textarea></div></div><script>let formatTemplates = [
-              { "id": "GravityMon-Post", "format": "%7B%0A%20%22name%22%20%3A%20%22%24%7Bmdns%7D%22%2C%0A%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%0A%20%22token%22%20%3A%20%22gravmon%22%2C%0A%20%22interval%22%3A%20%24%7Bsleep-interval%7D%2C%0A%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%22temp_units%22%3A%20%22%24%7Btemp-unit%7D%22%2C%0A%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%22rssi%22%3A%20%24%7Brssi%7D%2C%0A%20%22corr-gravity%22%3A%20%24%7Bcorr-gravity%7D%2C%0A%20%22gravity-unit%22%3A%20%22%24%7Bgravity-unit%7D%22%2C%0A%20%22run-time%22%3A%20%24%7Brun-time%7D%0A%7D" },
+              { "id": "GravityMon-Post", "format": "%7B%0A%20%22name%22%20%3A%20%22%24%7Bmdns%7D%22%2C%0A%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%0A%20%22token%22%20%3A%20%22gravmon%22%2C%0A%20%22interval%22%3A%20%24%7Bsleep-interval%7D%2C%0A%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%22temp_units%22%3A%20%22%24%7Btemp-unit%7D%22%2C%0A%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%22RSSI%22%3A%20%24%7Brssi%7D%2C%0A%20%22corr-gravity%22%3A%20%24%7Bcorr-gravity%7D%2C%0A%20%22gravity-unit%22%3A%20%22%24%7Bgravity-unit%7D%22%2C%0A%20%22run-time%22%3A%20%24%7Brun-time%7D%0A%7D" },
               { "id": "GravityMon-Get", "format": "%3Fname%3D%24%7Bmdns%7D%26id%3D%24%7Bid%7D%26token%3D%24%7Btoken2%7D%26interval%3D%24%7Bsleep-interval%7D%26temperature%3D%24%7Btemp%7D%26%0Atemp-units%3D%24%7Btemp-unit%7D%26gravity%3D%24%7Bgravity%7D%26angle%3D%24%7Bangle%7D%26battery%3D%24%7Bbattery%7D%26rssi%3D%24%7Brssi%7D%26%0Acorr-gravity%3D%24%7Bcorr-gravity%7D%26gravity-unit%3D%24%7Bgravity-unit%7D%26run-time%3D%24%7Brun-time%7D" },
-              { "id": "iSpindle-Post", "format": "%7B%0A%20%22name%22%20%3A%20%22%24%7Bmdns%7D%22%2C%0A%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%0A%20%22token%22%20%3A%20%22gravmon%22%2C%0A%20%22interval%22%3A%20%24%7Bsleep-interval%7D%2C%0A%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%22temp_units%22%3A%20%22%24%7Btemp-unit%7D%22%2C%0A%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%22rssi%22%3A%20%24%7Brssi%7D%0A%7D" },
+              { "id": "iSpindle-Post", "format": "%7B%0A%20%22name%22%20%3A%20%22%24%7Bmdns%7D%22%2C%0A%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%0A%20%22token%22%20%3A%20%22gravmon%22%2C%0A%20%22interval%22%3A%20%24%7Bsleep-interval%7D%2C%0A%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%22temp_units%22%3A%20%22%24%7Btemp-unit%7D%22%2C%0A%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%22RSSI%22%3A%20%24%7Brssi%7D%0A%7D" },
               { "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" },
diff --git a/src/config.cpp b/src/config.cpp
index 1738d9e..b21e768 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -378,7 +378,8 @@ bool AdvancedConfig::saveFile() {
   doc[PARAM_HW_GYRO_READ_DELAY] = this->getGyroReadDelay();
   doc[PARAM_HW_GYRO_MOVING_THREASHOLD] = this->getGyroSensorMovingThreashold();
   doc[PARAM_HW_FORMULA_DEVIATION] = this->getMaxFormulaCreationDeviation();
-  doc[PARAM_HW_WIFI_PORTALTIMEOUT] = this->getWifiPortalTimeout();
+  doc[PARAM_HW_WIFI_PORTAL_TIMEOUT] = this->getWifiPortalTimeout();
+  doc[PARAM_HW_WIFI_CONNECT_TIMEOUT] = this->getWifiConnectTimeout();
   doc[PARAM_HW_FORMULA_CALIBRATION_TEMP] = this->getDefaultCalibrationTemp();
   doc[PARAM_HW_PUSH_INTERVAL_HTTP1] = this->getPushIntervalHttp1();
   doc[PARAM_HW_PUSH_INTERVAL_HTTP2] = this->getPushIntervalHttp2();
@@ -455,8 +456,10 @@ bool AdvancedConfig::loadFile() {
   if (!doc[PARAM_HW_FORMULA_CALIBRATION_TEMP].isNull())
     this->SetDefaultCalibrationTemp(
         doc[PARAM_HW_FORMULA_CALIBRATION_TEMP].as<float>());
-  if (!doc[PARAM_HW_WIFI_PORTALTIMEOUT].isNull())
-    this->setWifiPortalTimeout(doc[PARAM_HW_WIFI_PORTALTIMEOUT].as<int>());
+  if (!doc[PARAM_HW_WIFI_PORTAL_TIMEOUT].isNull())
+    this->setWifiPortalTimeout(doc[PARAM_HW_WIFI_PORTAL_TIMEOUT].as<int>());
+  if (!doc[PARAM_HW_WIFI_CONNECT_TIMEOUT].isNull())
+    this->setWifiConnectTimeout(doc[PARAM_HW_WIFI_CONNECT_TIMEOUT].as<int>());
   if (!doc[PARAM_HW_PUSH_TIMEOUT].isNull())
     this->setPushTimeout(doc[PARAM_HW_PUSH_TIMEOUT].as<int>());
   if (!doc[PARAM_HW_PUSH_INTERVAL_HTTP1].isNull())
diff --git a/src/config.hpp b/src/config.hpp
index 9f5346b..d9aacda 100644
--- a/src/config.hpp
+++ b/src/config.hpp
@@ -57,6 +57,7 @@ struct RawFormulaData {
 class AdvancedConfig {
  private:
   int _wifiPortalTimeout = 120;
+  int _wifiConnectTimeout = 20;
   float _maxFormulaCreationDeviation = 1.6;
   float _defaultCalibrationTemp = 20.0;
   int _gyroSensorMovingThreashold = 500;
@@ -73,6 +74,9 @@ class AdvancedConfig {
   int getWifiPortalTimeout() { return _wifiPortalTimeout; }
   void setWifiPortalTimeout(int t) { _wifiPortalTimeout = t; }
 
+  int getWifiConnectTimeout() { return _wifiConnectTimeout; }
+  void setWifiConnectTimeout(int t) { _wifiConnectTimeout = t; }
+
   float getMaxFormulaCreationDeviation() {
     return _maxFormulaCreationDeviation;
   }
diff --git a/src/resources.hpp b/src/resources.hpp
index 51f53a7..f787e28 100644
--- a/src/resources.hpp
+++ b/src/resources.hpp
@@ -79,7 +79,8 @@ SOFTWARE.
 #define PARAM_HW_GYRO_MOVING_THREASHOLD "gyro-moving-threashold"
 #define PARAM_HW_FORMULA_DEVIATION "formula-max-deviation"
 #define PARAM_HW_FORMULA_CALIBRATION_TEMP "formula-calibration-temp"
-#define PARAM_HW_WIFI_PORTALTIMEOUT "wifi-portaltimeout"
+#define PARAM_HW_WIFI_PORTAL_TIMEOUT "wifi-portal-timeout"
+#define PARAM_HW_WIFI_CONNECT_TIMEOUT "wifi-connect-timeout"
 #define PARAM_HW_PUSH_TIMEOUT "push-timeout"
 #define PARAM_HW_PUSH_INTERVAL_HTTP1 "int-http1"
 #define PARAM_HW_PUSH_INTERVAL_HTTP2 "int-http2"
diff --git a/src/webserver.cpp b/src/webserver.cpp
index bee61a5..d16bf54 100644
--- a/src/webserver.cpp
+++ b/src/webserver.cpp
@@ -651,8 +651,10 @@ void WebServerHandler::webHandleConfigAdvancedWrite() {
     myAdvancedConfig.setMaxFormulaCreationDeviation(_server->arg(PARAM_HW_FORMULA_DEVIATION).toFloat());
   if (_server->hasArg(PARAM_HW_FORMULA_CALIBRATION_TEMP))
     myAdvancedConfig.SetDefaultCalibrationTemp(_server->arg(PARAM_HW_FORMULA_CALIBRATION_TEMP).toFloat());
-  if (_server->hasArg(PARAM_HW_WIFI_PORTALTIMEOUT))
-    myAdvancedConfig.setWifiPortalTimeout(_server->arg(PARAM_HW_WIFI_PORTALTIMEOUT).toInt());
+  if (_server->hasArg(PARAM_HW_WIFI_PORTAL_TIMEOUT))
+    myAdvancedConfig.setWifiPortalTimeout(_server->arg(PARAM_HW_WIFI_PORTAL_TIMEOUT).toInt());
+  if (_server->hasArg(PARAM_HW_WIFI_CONNECT_TIMEOUT))
+    myAdvancedConfig.setWifiConnectTimeout(_server->arg(PARAM_HW_WIFI_CONNECT_TIMEOUT).toInt());
   if (_server->hasArg(PARAM_HW_PUSH_TIMEOUT))
     myAdvancedConfig.setPushTimeout(_server->arg(PARAM_HW_PUSH_TIMEOUT).toInt());
   if (_server->hasArg(PARAM_HW_PUSH_INTERVAL_HTTP1))
@@ -688,7 +690,9 @@ void WebServerHandler::webHandleConfigAdvancedRead() {
       myAdvancedConfig.getGyroSensorMovingThreashold();
   doc[PARAM_HW_FORMULA_DEVIATION] =
       myAdvancedConfig.getMaxFormulaCreationDeviation();
-  doc[PARAM_HW_WIFI_PORTALTIMEOUT] = myAdvancedConfig.getWifiPortalTimeout();
+  doc[PARAM_HW_WIFI_PORTAL_TIMEOUT] = myAdvancedConfig.getWifiPortalTimeout();
+  doc[PARAM_HW_WIFI_CONNECT_TIMEOUT] = myAdvancedConfig.getWifiConnectTimeout();
+  doc[PARAM_HW_PUSH_TIMEOUT] = myAdvancedConfig.getPushTimeout();
   doc[PARAM_HW_FORMULA_CALIBRATION_TEMP] =
       myAdvancedConfig.getDefaultCalibrationTemp();
   doc[PARAM_HW_PUSH_INTERVAL_HTTP1] = myAdvancedConfig.getPushIntervalHttp1();
diff --git a/src/wifi.cpp b/src/wifi.cpp
index ee3678a..aafa962 100644
--- a/src/wifi.cpp
+++ b/src/wifi.cpp
@@ -221,7 +221,7 @@ bool WifiConnection::waitForConnection(int maxTime) {
 //
 bool WifiConnection::connect() {
   connectAsync();
-  return waitForConnection(20);  // 20 seconds.
+  return waitForConnection(myAdvancedConfig.getWifiConnectTimeout());
 }
 
 //
diff --git a/test/adv.json b/test/adv.json
index b9e2398..dfda261 100644
--- a/test/adv.json
+++ b/test/adv.json
@@ -3,8 +3,10 @@
   "gyro-read-delay": 3151,
   "gyro-moving-threashold": 501,
   "formula-max-deviation": 1.7,
-  "wifi-portaltimeout": 121,
+  "wifi-portal-timeout": 121,
+  "wifi-connect-timeout": 21,
   "formula-calibration-temp": 21,
+  "push-timeout": 10,
   "int-http1": 1,
   "int-http2": 2,
   "int-http3": 3,
