Updated release notes for beta 2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. ...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Software:**
+ - Platform (esp8266, esp32)
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/stale.yaml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 14
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - on-hold
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/doc-build.yaml

@@ -16,8 +16,12 @@ jobs:
         with:
           docs-folder: "src_docs/"
           pre-build-command: |
-            pip install sphinx_rtd_theme
-            pip install furo
+            pip install --upgrade pip
+            pip install sphinx==4.3.2
+            pip install docutils==0.16
+            pip install pygments==2.11.1
+            pip install furo==2022.1.2
+            pip list
           build-command: "sphinx-build -b html ./source ../docs"
 
       - name: Commit documentation changes

.github/workflows/pre-commit.yaml

@@ -0,0 +1,19 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: 
+      - master
+      - dev
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2 
+    - name: clang format support
+      run: |
+        sudo apt install clang-format cppcheck
+    - uses: pre-commit/action@v2.0.3

.pre-commit-config.yaml

@@ -4,7 +4,10 @@ repos:
     hooks:
     -   id: clang-format
         files: ^src/
+        exclude: 'lib/'
     -   id: cpplint
         files: ^src/
+        exclude: 'lib/'
     -   id: cppcheck
         files: ^src/
+        exclude: 'lib/'

CONTRIBUTING.md

@@ -0,0 +1,35 @@
+## How to contribute to GravityMon
+
+#### **Did you find a bug?**
+
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/mp-se/gravitymon/issues). Dont forget to look under closed issues. There might be a fix but not yet included in the released version.
+
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/mp-se/gravitymon/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, Use the function on the device to extract configuration and device information (does not contain any sensitive data). This can help to pinpoint the issue. 
+
+#### **Did you write a patch that fixes a bug?**
+
+* Open a new GitHub pull request with the patch.
+
+* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+* Before submitting, please use `pre-commit` to validate that your code contribution complies with the formatting standards for C++ and C. 
+
+* Check the contribution section under the documentation for additional information.
+
+#### **Do you intend to add a new feature or change an existing one?**
+
+* Suggest your change in the [Discussion forums](https://github.com/mp-se/gravitymon/discussions) and start writing code.
+
+* Do not open an issue on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes.
+
+#### **Do you have questions about the source software?**
+
+* Start a discussion in the [Discussion forums](https://github.com/mp-se/gravitymon/discussions) and start writing code.
+
+#### **Do you want to contribute to the documentation?**
+
+* Open a new GitHub pull request with the updated documentation changes.
+
+* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+Thanks! 

README.md

@@ -12,9 +12,11 @@ GravityMon is a replacement firmware for the iSpindle firmware. It's 100% compat
 
 Now also works with ESP32 (use ESP32 d1 mini which is compatible with ESP8266)
 
-Installation can be made using https://www.brewflasher.com
+Installation can be made using https://www.brewflasher.com or https://web.brewflasher.com
 
-Note! If its being flagged as malware, try the older version.
+The documenation can be found here: https://mp-se.github.io/gravitymon/index.html
+
+Note! If Brewflasher being flagged as malware by your antivirus software, try the web version.
 
 The main differences:
 ---------------------
@@ -23,17 +25,14 @@ The main differences:
 * Efficient software, long lifespan (+45 days with 5min update frequencey)
 * Send data to multiple endpoints (http-post, http-get, influxdb v2, mqtt)
 * Instructions for service such as; Brewfather, Fermentrack, Ubidots, Home Assistant, Brewers Friend, Brewspy, Thingspeak, Blynk. 
-* SSL support in standard HTTP and MQTT connections.
+* SSL support for all remote endpoints
 * ESP32 support with Bluetooth push
 * Customize data format to be pushed
 * Automatic temperature adjustment of gravity when enabled
 * Use the temperature sensor in gyro instead of DS18B20
 * Built in function to create gravity formulas, no need for additional software, just enter tilt/gravity. 
 * Visual graph showing how gravity formula will be interpreted
-* OTA support 
-* Built in performance measurements (used to optimise code)
-* REST API for scripting 
+* OTA support or firmware upload via web interface
+* REST API for scripting
 
 No code has been reused from the iSpindle project. 
-
-The documenation can be found here: https://mp-se.github.io/gravitymon/index.html

bin/about.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://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></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 active"><a class="nav-link" href="/about.htm">About</a></li></ul></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="row mb-3"><h3>Beer Gravity Monitor</h3>This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.</div><div class="row mb-3"><h3>MIT License</h3>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><hr class="my-4"></div><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>
+<!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"><!-- START MENU --><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><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" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item active"><a class="nav-link" href="#"><b>About</b></a></li></ul></div></div></nav><!-- START BODY --><div class="container row-margin-10"><div class="accordion row-margin-10" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingAbout"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAbout" aria-expanded="true" aria-controls="collapseAbout"><b>About</b></button></h2><div id="collapseAbout" class="accordion-collapse collapse show" aria-labelledby="headingAbout" data-bs-parent="#accordion"><div class="accordion-body"><div class="row h3 col-sm-8">Beer Gravity Monitor</div><div class="row col-sm-8 mb-3">This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.</div><div class="row h3 col-sm-8 mb-3">MIT License</div><div class="row col-sm-8 mb-3">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class="row h3 col-sm-8 mb-3">Credits to</div><div class="row col-sm-8 mb-3">This software uses the following libraries and without these this software would have been much more difficult to acheive:<br><br><ul><li>https://github.com/jrowberg/i2cdevlib</li><li>https://github.com/codeplea/tinyexpr</li><li>https://github.com/graphitemaster/incbin</li><li>https://github.com/khoih-prog/ESP_DoubleResetDetector</li><li>https://github.com/khoih-prog/ESP_WiFiManager</li><li>https://github.com/thijse/Arduino-Log</li><li>https://github.com/bblanchon/ArduinoJson</li><li>https://github.com/PaulStoffregen/OneWire</li><li>https://github.com/milesburton/Arduino-Temperature-Control-Library</li><li>https://github.com/Rotario</li><li>https://github.com/256dpi/arduino-mqtt</li><li>https://graphjs.com</li><li>https://getbootstrap.com</li><li>https://github.com/lorol/LITTLEFS</li><li>https://github.com/h2zero/NimBLE-Arduino</li><li>https://github.com/spouliot/tilt-sim</li></ul></div></div></div></div></div></div><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></body></html>

bin/version.json

@@ -1 +1 @@
-{ "project":"gravmon", "version":"0.9.0",  "html": [ ] }
+{ "project":"gravmon", "version":"1.1.0",  "html": [ ] }

html/about.htm

@@ -5,74 +5,117 @@
   <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://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script>
+  <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: 1.0em; }
+  </style>
 </head>
 
 <body class="py-4">
 
   <!-- START MENU -->
 
-<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
-  <a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
+  <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>
 
-  <div class="collapse navbar-collapse" id="navbar"> 
-    <ul class="navbar-nav mr-auto">
-      <li class="nav-item">
-        <a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></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 active">
-        <a class="nav-link" href="/about.htm">About</a>
-      </li>
-    </ul>
-  </div>
-</nav>
+  <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" href="/config.htm">Configuration</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="/calibration.htm">Calibration</a>
+          </li>
+          <li class="nav-item active">
+            <a class="nav-link" href="#"><b>About</b></a>
+          </li> 
+        </ul>
+      </div>
+    </div>
+  </nav>
 
-<!-- START MAIN INDEX -->
+  <!-- START BODY -->
 
-<div class="container">
-  <hr class="my-4">
-  <div class="row mb-3">
-    <h3>Beer Gravity Monitor</h3>
-    This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.
-  </div>
-  <div class="row mb-3">
-    <h3>MIT License</h3>
+  <div class="container row-margin-10">
 
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-    
-    The copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-    
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
+    <div class="accordion row-margin-10" id="accordion">
+      <div class="accordion-item">
+        <h2 class="accordion-header" id="headingAbout">
+          <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAbout" aria-expanded="true" aria-controls="collapseAbout">
+            <b>About</b>
+          </button>
+        </h2>
+        <div id="collapseAbout" class="accordion-collapse collapse show" aria-labelledby="headingAbout" data-bs-parent="#accordion">
+          <div class="accordion-body">
+            <div class="row h3 col-sm-8">
+              Beer Gravity Monitor
+            </div>
+            <div class="row col-sm-8 mb-3">
+                This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.
+            </div>
+            <div class="row h3 col-sm-8 mb-3">
+              MIT License
+            </div>
+            <div class="row col-sm-8 mb-3">
+              Permission is hereby granted, free of charge, to any person obtaining a copy
+              of this software and associated documentation files (the "Software"), to deal
+              in the Software without restriction, including without limitation the rights
+              to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+              copies of the Software, and to permit persons to whom the Software is
+              furnished to do so, subject to the following conditions:
+              
+              The copyright notice and this permission notice shall be included in all
+              copies or substantial portions of the Software.
+              
+              THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+              IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+              FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+              AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+              LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+              OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+              SOFTWARE.
+            </div>       
+
+            <div class="row h3 col-sm-8 mb-3">
+              Credits to
+            </div>
+            <div class="row col-sm-8 mb-3">
+              This software uses 
+              the following libraries and without these this software would have been much more difficult to acheive:<br><br>
+              <ul>
+                <li>https://github.com/jrowberg/i2cdevlib</li> 
+                <li>https://github.com/codeplea/tinyexpr</li>
+                <li>https://github.com/graphitemaster/incbin</li>
+                <li>https://github.com/khoih-prog/ESP_DoubleResetDetector</li>
+                <li>https://github.com/khoih-prog/ESP_WiFiManager</li>
+                <li>https://github.com/thijse/Arduino-Log</li>
+                <li>https://github.com/bblanchon/ArduinoJson</li>
+                <li>https://github.com/PaulStoffregen/OneWire</li>
+                <li>https://github.com/milesburton/Arduino-Temperature-Control-Library</li>
+                <li>https://github.com/Rotario</li>
+                <li>https://github.com/256dpi/arduino-mqtt</li>
+                <li>https://graphjs.com</li>
+                <li>https://getbootstrap.com</li>
+                <li>https://github.com/lorol/LITTLEFS</li>
+                <li>https://github.com/h2zero/NimBLE-Arduino</li>
+                <li>https://github.com/spouliot/tilt-sim</li>
+            </div>          
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 
-  <hr class="my-4">
-</div>
+  <!-- START FOOTER -->
 
-<!-- START FOOTER -->
-
-<div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div>
+  <div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div>
 </body>
 </html>

html/about.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://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></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 active"><a class="nav-link" href="/about.htm">About</a></li></ul></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="row mb-3"><h3>Beer Gravity Monitor</h3>This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.</div><div class="row mb-3"><h3>MIT License</h3>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><hr class="my-4"></div><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>
+<!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"><!-- START MENU --><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><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" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item active"><a class="nav-link" href="#"><b>About</b></a></li></ul></div></div></nav><!-- START BODY --><div class="container row-margin-10"><div class="accordion row-margin-10" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingAbout"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAbout" aria-expanded="true" aria-controls="collapseAbout"><b>About</b></button></h2><div id="collapseAbout" class="accordion-collapse collapse show" aria-labelledby="headingAbout" data-bs-parent="#accordion"><div class="accordion-body"><div class="row h3 col-sm-8">Beer Gravity Monitor</div><div class="row col-sm-8 mb-3">This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.</div><div class="row h3 col-sm-8 mb-3">MIT License</div><div class="row col-sm-8 mb-3">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class="row h3 col-sm-8 mb-3">Credits to</div><div class="row col-sm-8 mb-3">This software uses the following libraries and without these this software would have been much more difficult to acheive:<br><br><ul><li>https://github.com/jrowberg/i2cdevlib</li><li>https://github.com/codeplea/tinyexpr</li><li>https://github.com/graphitemaster/incbin</li><li>https://github.com/khoih-prog/ESP_DoubleResetDetector</li><li>https://github.com/khoih-prog/ESP_WiFiManager</li><li>https://github.com/thijse/Arduino-Log</li><li>https://github.com/bblanchon/ArduinoJson</li><li>https://github.com/PaulStoffregen/OneWire</li><li>https://github.com/milesburton/Arduino-Temperature-Control-Library</li><li>https://github.com/Rotario</li><li>https://github.com/256dpi/arduino-mqtt</li><li>https://graphjs.com</li><li>https://getbootstrap.com</li><li>https://github.com/lorol/LITTLEFS</li><li>https://github.com/h2zero/NimBLE-Arduino</li><li>https://github.com/spouliot/tilt-sim</li></ul></div></div></div></div></div></div><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></body></html>

html/calibration.htm

@@ -5,379 +5,425 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="description" content="">
   <title>Beer Gravity Monitor</title>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">  
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+  <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: 1.0em; }
+  </style>
 </head> 
 <body class="py-4">
 
-<!-- START MENU -->
+  <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>
+  <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 
-<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
+  <!-- START MENU -->
 
-  <a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-  
-  <div class="collapse navbar-collapse" id="navbar"> 
-    <ul class="navbar-nav mr-auto">
-      <li class="nav-item">
-        <a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" href="/config.htm">Configuration</a>
-      </li>
-      <li class="nav-item active">
-        <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>
-</nav>
+  <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" href="/config.htm">Configuration</a>
+          </li>
+          <li class="nav-item active">
+            <a class="nav-link" href="#"><b>Calibration</b></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 -->
+  <!-- START BODY -->
 
-<div class="container">
+  <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>
 
-  <hr class="my-2">
+    <script type="text/javascript">
+      function showError( msg ) {
+        $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
 
-  <div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert">
-    <div id="alert-msg">...</div>
-    <button type="button" id="alert-btn" class="close" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
+      function showSuccess( msg ) {
+        $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
 
-  <script type="text/javascript">
-    function showError( msg ) {
-      $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('d-none').addClass('show')
-      $('#alert-msg').text( msg );
-    }
+      $("#alert-btn").click(function(e){
+        $('.alert').addClass('hide').removeClass('show').addClass('d-none');
+      });    
+    </script>
 
-    function showSuccess( msg ) {
-      $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('d-none').addClass('show')
-      $('#alert-msg').text( msg );
-    }
-
-    $("#alert-btn").click(function(e){
-      $('.alert').addClass('d-none').removeClass('show')
-    });    
-  </script>
-
-  <div class="accordion" id="accordion">
-
-    <div class="card">
-      <div class="card-header" id="headingOne">
-        <h2 class="mb-0">
-          <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseCalibration" aria-expanded="true" aria-controls="collapseCalibration">
-            Formula calculation
+    <div class="accordion" id="accordion">
+      <div class="accordion-item">
+        <h2 class="accordion-header" id="headingFormula">
+          <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFormula" aria-expanded="true" aria-controls="collapseFormula">
+            <b>Formula calculation</b>
           </button>
         </h2>
-      </div>  
+        <div id="collapseFormula" class="accordion-collapse collapse show" aria-labelledby="headingFormula" data-bs-parent="#accordion">
+          <div class="accordion-body">
+            <form action="/api/formula" method="post">
+              <input type="text" name="gravity-format" id="gravity-format" hidden>
+              <input type="text" name="id" id="id" hidden>
 
-      <div id="collapseCalibration" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-        <div class="card-body">
-          <form action="/api/formula" method="post">
-            <input type="text" name="gravity-format" id="gravity-format" hidden>
-            <input type="text" name="id" id="id" hidden>
+              <div class="row mb-3">
+                  Here you can create your gravity formula by entering angles/tilt and the corresponding gravity. These values
+                  will be saved for future use. Angles with 0 (zero) will be skipped. The values below will be used to check the 
+                  formula and if the deviation is more than 1.5SG / 0.38P on any of the provided points then the forumla will be 
+                  rejected. On the bottom of the page you can see a graph over the entered values + values calcualated by the formula.
+              </div>
 
-            <div class="row mb-3">
-                Here you can create your gravity formula by entering angles/tilt and the corresponding gravity. These values
-                will be saved for future use. Angles with 0 (zero) will be skipped. The values below will be used to check the 
-                formula and if the deviation is more than 1.5SG / 0.38P on any of the provided points then the forumla will be 
-                rejected. On the bottom of the page you can see a graph over the entered values + values calcualated by the formula.
-            </div>
+              <div class="row">
+                <label class="col-sm-1 col-form-label">#</label>
+                <label class="col-sm-4 col-form-label">Angle/Tilt</label>
+                <label class="col-sm-4 col-form-label" id="gravity-header">Gravity</label>
+              </div>
 
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label">#:</label>
-              <label class="col-sm-4 col-form-label">Angle/Tilt:</label>
-              <label class="col-sm-4 col-form-label" id="gravity-header">Gravity (SG):</label>
-            </div>
+              <div class="row mb-3">
+                <label for="angle1" class="col-sm-1 col-form-label">1.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a1" id="a1" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <input hidden type="number" name="g1" id="g1">
+                <div class="col-sm-4"><input disabled type="number" class="form-control" name="g1a" id="g1a" data-bs-toggle="tooltip" title="The first value is reserved for water gravity."></div>
+              </div>
 
-            <div class="form-group row">
-              <label for="angle1" class="col-sm-2 col-form-label">1.</label>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a1" id="a1">
+              <div class="row mb-3">
+                <label for="angle2" class="col-sm-1 col-form-label">2.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a2" id="a2" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <div class="col-sm-4"><input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g2" id="g2" data-bs-toggle="tooltip" title="Enter the gravity for the angle."></div>
               </div>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g1" id="g1">
-              </div>
-            </div>
 
-            <div class="form-group row">
-              <label for="angle2" class="col-sm-2 col-form-label">2.</label>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a2" id="a2">
+              <div class="row mb-3">
+                <label for="angle3" class="col-sm-1 col-form-label">3.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a3" id="a3" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <div class="col-sm-4"><input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g3" id="g3" data-bs-toggle="tooltip" title="Enter the gravity for the angle."></div>
               </div>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g2" id="g2">
-              </div>
-            </div>
 
-            <div class="form-group row">
-              <label for="angle3" class="col-sm-2 col-form-label">3.</label>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a3" id="a3">
+              <div class="row mb-3">
+                <label for="angle4" class="col-sm-1 col-form-label">4.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a4" id="a4" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <div class="col-sm-4"><input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g4" id="g4" data-bs-toggle="tooltip" title="Enter the gravity for the angle."></div>
               </div>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g3" id="g3">
-              </div>
-            </div>
 
-            <div class="form-group row">
-              <label for="angle4" class="col-sm-2 col-form-label">4.</label>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a4" id="a4">
+              <div class="row mb-3">
+                <label for="angle5" class="col-sm-1 col-form-label">5.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a5" id="a5" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <div class="col-sm-4"><input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g5" id="g5" data-bs-toggle="tooltip" title="Enter the gravity for the angle."></div>
               </div>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g4" id="g4">
-              </div>
-            </div>
 
-            <div class="form-group row">
-              <label for="angle5" class="col-sm-2 col-form-label">5.</label>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a5" id="a5">
+              <div class="row mb-3">
+                <label for="angle6" class="col-sm-1 col-form-label">6.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a6" id="a6" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <div class="col-sm-4"><input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g6" id="g6" data-bs-toggle="tooltip" title="Enter the gravity for the angle."></div>
               </div>
-              <div class="col-sm-4">
-                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g5" id="g5">
-              </div>
-            </div>
 
-            <div class="form-group row">
-              <div class="col-sm-8 offset-sm-0">
-                <button type="submit" class="btn btn-primary" id="calculate-btn">Save & Calculate</button>
+              <div class="row mb-3">
+                <label for="angle7" class="col-sm-1 col-form-label">7.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a7" id="a7" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <div class="col-sm-4"><input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g7" id="g7" data-bs-toggle="tooltip" title="Enter the gravity for the angle."></div>
               </div>
-            </div>
 
-            <div class="form-group row">
-              <label for="calculate-btn" class="col-sm-2 col-form-label">Current angle: </label>
-              <label for="calculate-btn" class="col-sm-2 col-form-label" id="angle"></label>
-            </div>
-            <div class="form-group row">
+              <div class="row mb-3">
+                <label for="angle8" class="col-sm-1 col-form-label">8.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a8" id="a8" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <div class="col-sm-4"><input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g8" id="g8" data-bs-toggle="tooltip" title="Enter the gravity for the angle."></div>
+              </div>
+
+              <div class="row mb-3">
+                <label for="angle9" class="col-sm-1 col-form-label">9.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a9" id="a9" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <div class="col-sm-4"><input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g9" id="g9" data-bs-toggle="tooltip" title="Enter the gravity for the angle."></div>
+              </div>
+
+              <div class="row mb-3">
+                <label for="angle10" class="col-sm-1 col-form-label">10.</label>
+                <div class="col-sm-4"><input type="number" min="0" max="90" step="0.001" class="form-control" name="a10" id="a10" data-bs-toggle="tooltip" title="Enter the angle for the gravity. Zero value will be ignored"></div>
+                <div class="col-sm-4"><input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g10" id="g10" data-bs-toggle="tooltip" title="Enter the gravity for the angle."></div>
+              </div>
+
+              <div class="row mb-3">
+                <div class="col-sm-8 offset-sm-1"><button type="submit" class="btn btn-primary" id="calculate-btn" data-bs-toggle="tooltip" title="Save the values and try to create a formula">Save & Create</button></div>
+              </div>
+
+              <hr class="my-2">
+
+              <div class="row">
+                <label for="calculate-btn" class="col-sm-2 col-form-label">Current angle: </label>
+                <label for="calculate-btn" class="col-sm-2 col-form-label" id="angle"></label>
+              </div>
+              <div class="row">
                 <label for="calculate-btn" class="col-sm-2 col-form-label">Formula: </label>
-              <label for="calculate-btn" class="col-sm-8 col-form-label" id="formula">Loading...</label>
-            </div>
-          </form>
+                <label for="calculate-btn" class="col-sm-8 col-form-label" id="formula">Loading...</label>
+              </div>
+            </form>
+          </div>
+        </div>
+      </div>
+
+      <div class="accordion-item">
+        <h2 class="accordion-header" id="headingGraph">
+          <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseGraph" aria-expanded="false" aria-controls="collapseGraph">
+            <b>Formula graph</b>
+          </button>
+        </h2>
+        <div id="collapseGraph" class="accordion-collapse collapse" aria-labelledby="headingGraph" data-bs-parent="#accordion">
+          <div class="accordion-body">
+            <canvas id="gravityChart"></canvas>
+          </div>  
         </div>
       </div>
     </div>
   </div>
-  <hr class="my-4">
-  <div>
-    <canvas id="gravityChart"></canvas>
-  </div>
-  <hr class="my-4">
-</div>
 
-<script type="text/javascript">
-  var chartDataForm = [];
-  var chartDataCalc = [];
+  <script type="text/javascript">
+    var chartDataForm = [];
+    var chartDataCalc = [];
 
-  const dataSetChart = {
-    datasets: [{
-      label: 'Raw data',
-      borderColor: 'blue',
-      backgroundColor: 'blue',
-      data: chartDataForm
-    }, {
-      label: 'Calculated',
-      borderColor: 'green',
-      backgroundColor: 'green',
-      data: chartDataCalc
-    }]
-  }
+    const dataSetChart = {
+      datasets: [{
+        label: 'Raw data',
+        borderColor: 'blue',
+        backgroundColor: 'blue',
+        data: chartDataForm
+      }, {
+        label: 'Calculated',
+        borderColor: 'green',
+        backgroundColor: 'green',
+        data: chartDataCalc
+      }]
+    }
 
-  const configChart = {
-    type: 'line',
-    data: dataSetChart,
-    options: {
-      responsive: true,
-      interaction: {
-        intersect: false,
-      },
-      scales: {
-        x: {
-          display: true,
-          type: 'linear',
-          grace: '5%',
-          title: {
-            display: true,
-            text: 'Angle/Tilt'
-          },
-          ticks: {
-            crossAlign: 'far'
-          },
-          suggestedMin: 25
+    const configChart = {
+      type: 'line',
+      data: dataSetChart,
+      options: {
+        responsive: true,
+        interaction: {
+          intersect: false,
         },
-        y: {
-          display: true,
-          title: {
+        scales: {
+          x: {
             display: true,
-            text: 'Gravity'
+            type: 'linear',
+            grace: '5%',
+            title: {
+              display: true,
+              text: 'Angle/Tilt'
+            },
+            ticks: {
+              crossAlign: 'far'
+            },
+            suggestedMin: 25
           },
-          suggestedMin: 1.000
+          y: {
+            display: true,
+            title: {
+              display: true,
+              text: 'Gravity'
+            },
+            suggestedMin: 1.000
+          }
         }
       }
-    }
-  };
+    };
 
-  var myChart = 0;
-</script>
+    var myChart = 0;
+  </script>
 
-<script type="text/javascript">
-  g1.onchange = setGravityDecimal
-  g2.onchange = setGravityDecimal
-  g3.onchange = setGravityDecimal
-  g4.onchange = setGravityDecimal
-  g5.onchange = setGravityDecimal
+  <script type="text/javascript">
+    g1.onchange = setGravityDecimal
+    g2.onchange = setGravityDecimal
+    g3.onchange = setGravityDecimal
+    g4.onchange = setGravityDecimal
+    g5.onchange = setGravityDecimal
+    g6.onchange = setGravityDecimal
+    g7.onchange = setGravityDecimal
+    g8.onchange = setGravityDecimal
+    g9.onchange = setGravityDecimal
+    g10.onchange = setGravityDecimal
 
-  a1.onchange = setAngleDecimal
-  a2.onchange = setAngleDecimal
-  a3.onchange = setAngleDecimal
-  a4.onchange = setAngleDecimal
-  a5.onchange = setAngleDecimal
+    a1.onchange = setAngleDecimal
+    a2.onchange = setAngleDecimal
+    a3.onchange = setAngleDecimal
+    a4.onchange = setAngleDecimal
+    a5.onchange = setAngleDecimal
+    a6.onchange = setAngleDecimal
+    a7.onchange = setAngleDecimal
+    a8.onchange = setAngleDecimal
+    a9.onchange = setAngleDecimal
+    a10.onchange = setAngleDecimal
 
-  window.onload = getConfig;
-  setButtonDisabled( true );
-
-  function convertToPlato(sg) {
-    return 259-(259/sg);
-  }
-
-  function convertToSG(plato) {
-    return 259/(259-plato);
-  }
-
-  function setAngleDecimal(event) {
-    this.value = parseFloat(this.value).toFixed(2);
-    populateChart();
-  } 
-
-  function setGravityDecimal(event) {
-    if(isPlato()) 
-      this.value = parseFloat(this.value).toFixed(1);
-    else
-      this.value = parseFloat(this.value).toFixed(4);
-
-    populateChart();
-  } 
-
-  function populateChartForm(a, g) {
-    if( a != 0)
-      chartDataForm.push( { x: parseFloat(a), y: parseFloat(g) });
-
-    chartDataForm.sort(function (a, b) {
-      return a.x - b.x;
-    });      
-  }
-
-  function populateChartCalc(a, g) {
-    chartDataCalc.push( { x: parseFloat(a), y: parseFloat(g) });
-  }
-
-  function isPlato() {
-    return $("#gravity-format").text() == "P";
-  }
-
-  function populateChart() {
-
-    chartDataCalc.length = 0
-
-    for( i = 25.0; i<80.0; i+=5.0) {
-      var formula = $("#formula").text();
-      var angle = i.toString();
-      formula=formula.replaceAll( "tilt^3", angle+"*"+angle+"*"+angle );
-      formula=formula.replaceAll( "tilt^2", angle+"*"+angle );
-      formula=formula.replaceAll( "tilt", angle );
-      var g = eval( formula );
-
-      if(isPlato())
-        g = convertToPlato(g);
-
-      populateChartCalc( i, g );
-    }
-
-    chartDataForm.length = 0
-    populateChartForm( $("#a1").val(), $("#g1").val() );
-    populateChartForm( $("#a2").val(), $("#g2").val() );
-    populateChartForm( $("#a3").val(), $("#g3").val() );
-    populateChartForm( $("#a4").val(), $("#g4").val() );
-    populateChartForm( $("#a5").val(), $("#g5").val() );
-
-    if( myChart )
-      myChart.destroy();
-
-    myChart = new Chart(
-      document.getElementById('gravityChart'),
-      configChart
-    );
-  }
-
-  function setButtonDisabled( b ) {
-    $("#calculate-btn").prop("disabled", b);
-  }
-
-  // Get the configuration values from the API
-  function getConfig() {
+    window.onload = getConfig;
     setButtonDisabled( true );
 
-    var url = "/api/formula";
-    //var url = "/test/formula.json";
-    $('#spinner').show(); 
-    $.getJSON(url, function (cfg) {
-      console.log( cfg );
-     
-      $("#id").val(cfg["id"]);
-      $("#angle").text(cfg["angle"]);
-      $("#formula").text(cfg["gravity-formula"]);
-      $("#gravity-format").text(cfg["gravity-format"]); // Sets the variable used by isPlato()
+    function convertToPlato(sg) {
+      return 259-(259/sg);
+    }
 
-      if(isPlato()) {
-        $("#gravity-header").text("Gravity (Plato):");
-        $("#g1").val( parseFloat(cfg["g1"]).toFixed(1) );
-        $("#g2").val( parseFloat(cfg["g2"]).toFixed(1) );
-        $("#g3").val( parseFloat(cfg["g3"]).toFixed(1) );
-        $("#g4").val( parseFloat(cfg["g4"]).toFixed(1) );
-        $("#g5").val( parseFloat(cfg["g5"]).toFixed(1) );
-      } else {
-        $("#gravity-header").text("Gravity (SG):");
-        $("#g1").val( parseFloat(cfg["g1"]).toFixed(4) );
-        $("#g2").val( parseFloat(cfg["g2"]).toFixed(4) );
-        $("#g3").val( parseFloat(cfg["g3"]).toFixed(4) );
-        $("#g4").val( parseFloat(cfg["g4"]).toFixed(4) );
-        $("#g5").val( parseFloat(cfg["g5"]).toFixed(4) );
-      }
+    function convertToSG(plato) {
+      return 259/(259-plato);
+    }
 
-      $("#a1").val( parseFloat(cfg["a1"]).toFixed(2) );
-      $("#a2").val( parseFloat(cfg["a2"]).toFixed(2) );
-      $("#a3").val( parseFloat(cfg["a3"]).toFixed(2) );
-      $("#a4").val( parseFloat(cfg["a4"]).toFixed(2) );
-      $("#a5").val( parseFloat(cfg["a5"]).toFixed(2) );
+    function setAngleDecimal(event) {
+      this.value = parseFloat(this.value).toFixed(2);
+      populateChart();
+    } 
 
-      if( cfg["error"]!="" ) {
-        showError(cfg["error"]);
-      }
+    function setGravityDecimal(event) {
+      if(isPlato()) 
+        this.value = parseFloat(this.value).toFixed(1);
+      else
+        this.value = parseFloat(this.value).toFixed(4);
 
       populateChart();
-    })
-    .fail(function () {
-      showError('Unable to get data from the device.');
-    })
-    .always(function() {
-      $('#spinner').hide(); 
-      setButtonDisabled( false );
-    });
-  }
-</script>
+    } 
 
-<!-- START FOOTER -->
+    function populateChartForm(a, g) {
+      if( a != 0)
+        chartDataForm.push( { x: parseFloat(a), y: parseFloat(g) });
 
-<div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div>
+      chartDataForm.sort(function (a, b) {
+        return a.x - b.x;
+      });      
+    }
+
+    function populateChartCalc(a, g) {
+      chartDataCalc.push( { x: parseFloat(a), y: parseFloat(g) });
+    }
+
+    function isPlato() {
+      return $("#gravity-format").text() == "P";
+    }
+
+    function populateChart() {
+
+      chartDataCalc.length = 0
+
+      for( i = 25.0; i<80.0; i+=5.0) {
+        var formula = $("#formula").text();
+        var angle = i.toString();
+        formula=formula.replaceAll( "tilt^3", angle+"*"+angle+"*"+angle );
+        formula=formula.replaceAll( "tilt^2", angle+"*"+angle );
+        formula=formula.replaceAll( "tilt", angle );
+        var g = eval( formula );
+
+        if(isPlato())
+          g = convertToPlato(g);
+
+        populateChartCalc( i, g );
+      }
+
+      chartDataForm.length = 0
+      populateChartForm( $("#a1").val(), $("#g1").val() );
+      populateChartForm( $("#a2").val(), $("#g2").val() );
+      populateChartForm( $("#a3").val(), $("#g3").val() );
+      populateChartForm( $("#a4").val(), $("#g4").val() );
+      populateChartForm( $("#a5").val(), $("#g5").val() );
+      populateChartForm( $("#a6").val(), $("#g6").val() );
+      populateChartForm( $("#a7").val(), $("#g7").val() );
+      populateChartForm( $("#a8").val(), $("#g8").val() );
+      populateChartForm( $("#a9").val(), $("#g9").val() );
+      populateChartForm( $("#a10").val(), $("#g10").val() );
+
+      if( myChart )
+        myChart.destroy();
+
+      myChart = new Chart(
+        document.getElementById('gravityChart'),
+        configChart
+      );
+    }
+
+    function setButtonDisabled( b ) {
+      $("#calculate-btn").prop("disabled", b);
+    }
+
+    // Get the configuration values from the API
+    function getConfig() {
+      setButtonDisabled( true );
+
+      var url = "/api/formula";
+      //var url = "/test/formula.json";
+      $('#spinner').show(); 
+      $.getJSON(url, function (cfg) {
+        console.log( cfg );
+      
+        $("#id").val(cfg["id"]);
+        $("#angle").text(cfg["angle"]);
+        $("#formula").text(cfg["gravity-formula"]);
+        $("#gravity-format").text(cfg["gravity-format"]); // Sets the variable used by isPlato()
+
+        if(isPlato()) {
+          $("#gravity-header").text("Gravity (Plato):");
+          $("#g1").val( parseFloat(cfg["g1"]).toFixed(1) );
+          $("#g1a").val( "0.0" );
+          $("#g2").val( parseFloat(cfg["g2"]).toFixed(1) );
+          $("#g3").val( parseFloat(cfg["g3"]).toFixed(1) );
+          $("#g4").val( parseFloat(cfg["g4"]).toFixed(1) );
+          $("#g5").val( parseFloat(cfg["g5"]).toFixed(1) );
+          $("#g6").val( parseFloat(cfg["g6"]).toFixed(1) );
+          $("#g7").val( parseFloat(cfg["g7"]).toFixed(1) );
+          $("#g8").val( parseFloat(cfg["g8"]).toFixed(1) );
+          $("#g9").val( parseFloat(cfg["g9"]).toFixed(1) );
+          $("#g10").val( parseFloat(cfg["g10"]).toFixed(1) );
+        } else {
+          $("#gravity-header").text("Gravity (SG):");
+          $("#g1").val( parseFloat(cfg["g1"]).toFixed(4) );
+          $("#g1a").val( "1.0000" );
+          $("#g2").val( parseFloat(cfg["g2"]).toFixed(4) );
+          $("#g3").val( parseFloat(cfg["g3"]).toFixed(4) );
+          $("#g4").val( parseFloat(cfg["g4"]).toFixed(4) );
+          $("#g5").val( parseFloat(cfg["g5"]).toFixed(4) );
+          $("#g6").val( parseFloat(cfg["g6"]).toFixed(4) );
+          $("#g7").val( parseFloat(cfg["g7"]).toFixed(4) );
+          $("#g8").val( parseFloat(cfg["g8"]).toFixed(4) );
+          $("#g9").val( parseFloat(cfg["g9"]).toFixed(4) );
+          $("#g10").val( parseFloat(cfg["g10"]).toFixed(4) );
+        }
+
+        $("#a1").val( parseFloat(cfg["a1"]).toFixed(2) );
+        $("#a2").val( parseFloat(cfg["a2"]).toFixed(2) );
+        $("#a3").val( parseFloat(cfg["a3"]).toFixed(2) );
+        $("#a4").val( parseFloat(cfg["a4"]).toFixed(2) );
+        $("#a5").val( parseFloat(cfg["a5"]).toFixed(2) );
+        $("#a6").val( parseFloat(cfg["a6"]).toFixed(2) );
+        $("#a7").val( parseFloat(cfg["a7"]).toFixed(2) );
+        $("#a8").val( parseFloat(cfg["a8"]).toFixed(2) );
+        $("#a9").val( parseFloat(cfg["a9"]).toFixed(2) );
+        $("#a10").val( parseFloat(cfg["a10"]).toFixed(2) );
+
+        if( cfg["error"]!="" ) {
+          showError(cfg["error"]);
+        }
+
+        populateChart();
+      })
+      .fail(function () {
+        showError('Unable to get data from the device.');
+      })
+      .always(function() {
+        $('#spinner').hide(); 
+        setButtonDisabled( false );
+      });
+    }
+  </script>
+
+  <!-- START FOOTER -->
+
+  <div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div>
 </body>
 </html>

html/firmware.htm

@@ -5,184 +5,191 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="description" content="">
   <title>Beer Gravity Monitor</title>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">  
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+  <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: 1.0em; }
+  </style>
 </head>
-
 <body class="py-4">
 
-<!-- START MENU -->
+  <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>
 
-<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
-  <a class="navbar-brand" href="/firmware.htm">Beer Gravity Monitor - Firmware upgrade</a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
+  <!-- START MENU -->
 
-  <div class="collapse navbar-collapse" id="navbar"> 
-    <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 class="spinner-border text-light" id="spinner" role="status"></div>
-  </div>
-</nav>
+  <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 -->
+  <!-- START MAIN INDEX -->
 
-<div class="container">
+  <div class="container row-margin-10">
 
-  <hr class="my-4">
+    <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>
 
-  <div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert">
-    <div id="alert-msg">...</div>
-    <button type="button" id="alert-btn" class="close" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
+    <script type="text/javascript">
+      function showError( msg ) {
+        $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
 
-  <script type="text/javascript">
-    function showError( msg ) {
-      $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('d-none').addClass('show')
-      $('#alert-msg').text( msg );
-    }
+      function showSuccess( msg ) {
+        $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
 
-    function showSuccess( msg ) {
-      $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('d-none').addClass('show')
-      $('#alert-msg').text( msg );
-    }
+      $("#alert-btn").click(function(e){
+        $('.alert').addClass('hide').removeClass('show').addClass('d-none');
+      });    
+    </script>
 
-    $("#alert-btn").click(function(e){
-      $('.alert').addClass('d-none').removeClass('show')
-    });    
-  </script>
+  <div class="accordion" id="accordion">
+    <div class="accordion-item">
+      <h2 class="accordion-header" id="headingFirmware">
+        <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFirmware" aria-expanded="true" aria-controls="collapseFirmware">
+          <b>Upload firmware</b>
+        </button>
+      </h2>
+      <div id="collapseFirmware" class="accordion-collapse collapse show" aria-labelledby="headingFirmware" data-bs-parent="#accordion">
+        <div class="accordion-body">
 
-  <div class="row mb-3">
-    <div class="col-md-12 themed-grid-col bg-light">Here you can upload a new firmware version, it will not check the version number so you can also downgrade the firmware here.
+          <div class="row mb-3">
+            <div class="col-md-12 themed-grid-col bg-light">Here you can upload a new firmware version, it will not check the version number so you can also downgrade the firmware here.
+            </div>
+          </div>
+      
+          <div class="row mb-3">
+            <div class="col-md-2 themed-grid-col bg-light">Current version:</div>
+            <div class="col-md-10 themed-grid-col bg-light" id="app-ver">Loading...</div>
+          </div>
+      
+          <div class="row mb-3">
+            <div class="col-md-2 themed-grid-col bg-light">Platform:</div>
+            <div class="col-md-10 themed-grid-col bg-light" id="platform">Loading...</div>
+          </div>
+      
+          <form id="uploadForm" enctype="multipart/form-data">
+            <div class="row mb-3">
+              <div class="col-md-8 custom-file">
+                <input type="file" accept=".bin" class="custom-file-input" name="name" id="name" onchange="checkName()" data-bs-toggle="tooltip" title="Select a firmware file to upload">
+              </div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-4">
+                <button type="submit" class="btn btn-primary" id="upload-btn" value="upload" data-bs-toggle="tooltip" title="Update the device with the selected firmware">Flash firmware</button>
+              </div>
+            </div>
+          </form>
+      
+          <div class="progress">
+            <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+          </div>
+      
+        </div>
+      </div>
     </div>
   </div>
 
-  <div class="row mb-3">
-    <div class="col-md-8 themed-grid-col bg-light">Current version:</div>
-    <div class="col-md-4 themed-grid-col bg-light" id="app-ver">Loading...</div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-md-8 themed-grid-col bg-light">Platform:</div>
-    <div class="col-md-4 themed-grid-col bg-light" id="platform">Loading...</div>
-  </div>
-
-  <div class="row mb-3">
-<!--
-    <form action="/api/upload" method="post" enctype="multipart/form-data">
-      <div class="col-md-8 custom-file">
-        <input type="file" accept=".bin" class="custom-file-input" name="name" id="name">
-        <label class="custom-file-label" for="name">Choose file</label>
-      </div>
-      <button type="submit" class="btn btn-primary" id="upload-btn" value="upload">Flash firmware</button>
-    </form>
--->
-    <form id="uploadForm" enctype="multipart/form-data">
-      <div class="col-md-8 custom-file">
-        <input type="file" accept=".bin" class="custom-file-input" name="name" id="name" onchange="checkName()">
-        <label class="custom-file-label" for="name">Choose file</label>
-      </div>
-      <button type="submit" class="btn btn-primary" id="upload-btn" value="upload">Flash firmware</button>
-    </form>
-  </div>
-
-  <div class="progress">
-    <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
-  </div>
-
-  <hr class="my-4">
-</div>
-
-<script type="text/javascript">
-  window.onload = getStatus;
-  
-  $(document).ready(function() {
-    $("#uploadForm").on('submit', function(e) {
-      e.preventDefault();
-      $.ajax( {
-        xhr: function() {
-          var xhr = new window.XMLHttpRequest();
-          xhr.upload.addEventListener("progress", function(evt) {
-            if (evt.lengthComputable) {
-              progressHandler(evt);
-            }
-          }, false);
-          return xhr;
-        },
-        type: 'POST',
-        url: '/api/upload',
-        data: new FormData(this),
-        contentType: false,
-        cache: false,
-        processData:false,
-        beforeSend: function() {
-          setProgress(0);
-        },
-        error:function() {
-          showError("Upload failed");
-        },
-        success: function(resp) {
-          showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser.");
-          setTimeout(() => {  
-            window.location = "/";
-          }, 10000);
-        }
+  <script type="text/javascript">
+    window.onload = getStatus;
+    
+    $(document).ready(function() {
+      $("#uploadForm").on('submit', function(e) {
+        e.preventDefault();
+        $.ajax( {
+          xhr: function() {
+            var xhr = new window.XMLHttpRequest();
+            xhr.upload.addEventListener("progress", function(evt) {
+              if (evt.lengthComputable) {
+                progressHandler(evt);
+              }
+            }, false);
+            return xhr;
+          },
+          type: 'POST',
+          url: '/api/upload',
+          data: new FormData(this),
+          contentType: false,
+          cache: false,
+          processData:false,
+          beforeSend: function() {
+            setProgress(0);
+          },
+          error:function() {
+            showError("Upload failed");
+          },
+          success: function(resp) {
+            showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser.");
+            setTimeout(() => {  
+              window.location = "/";
+            }, 10000);
+          }
+        });
       });
     });
-  });
 
-  function checkName() {
-    setButtonDisabled( $("#name").val()!="" ? false : true );
-  }
+    function checkName() {
+      setButtonDisabled( $("#name").val()!="" ? false : true );
+    }
 
-  function progressHandler(event) {
-    var percent = (event.loaded / event.total) * 100;
-    setProgress(Math.round(percent));
-  }
+    function progressHandler(event) {
+      var percent = (event.loaded / event.total) * 100;
+      setProgress(Math.round(percent));
+    }
 
-  function setProgress(val) {
-    $('.progress-bar').css('width', val+'%').attr('aria-valuenow', val).text(val + "%");
-  }
+    function setProgress(val) {
+      $('.progress-bar').css('width', val+'%').attr('aria-valuenow', val).text(val + "%");
+    }
 
-  function setButtonDisabled( b ) {
-    $("#upload-btn").prop("disabled", b);
-  }
+    function setButtonDisabled( b ) {
+      $("#upload-btn").prop("disabled", b);
+    }
 
-  function getStatus() {
+    function getStatus() {
 
-    setButtonDisabled( true );
+      setButtonDisabled( true );
 
-    var url = "/api/status";
-    //var url = "/test/status.json";
-    $('#spinner').show(); 
-    $.getJSON(url, function (cfg) {
-      console.log( cfg );
+      var url = "/api/status";
+      //var url = "/test/status.json";
+      $('#spinner').show(); 
+      $.getJSON(url, function (cfg) {
+        console.log( cfg );
 
-      $("#app-ver").text(cfg["app-ver"]);
-      $("#platform").text(cfg["platform"]);
-   
-    })
-    .fail(function () {
-      showError('Unable to get data from the device.');
-    })
-    .always(function() {
-      $('#spinner').hide(); 
-    });
-  }
+        $("#app-ver").text(cfg["app-ver"]);
+        $("#platform").text(cfg["platform"]);
+    
+      })
+      .fail(function () {
+        showError('Unable to get data from the device.');
+      })
+      .always(function() {
+        $('#spinner').hide(); 
+      });
+    }
 
-  function start() {
-    setInterval(getStatus, 3000);
-  }
-</script>
+    function start() {
+      setInterval(getStatus, 3000);
+    }
+  </script>
 
-<!-- START FOOTER -->
+  <!-- START FOOTER -->
 
-<div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div>
+  <div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div>
 </body>
 </html>

html/firmware.min.htm

@@ -1,87 +1,79 @@
-<!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 rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/firmware.htm">Beer Gravity Monitor - Firmware upgrade</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><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 class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="row mb-3"><div class="col-md-12 themed-grid-col bg-light">Here you can upload a new firmware version, it will not check the version number so you can also downgrade the firmware here.</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Current version:</div><div class="col-md-4 themed-grid-col bg-light" id="app-ver">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Platform:</div><div class="col-md-4 themed-grid-col bg-light" id="platform">Loading...</div></div><div class="row mb-3"><!--
-    <form action="/api/upload" method="post" enctype="multipart/form-data">
-      <div class="col-md-8 custom-file">
-        <input type="file" accept=".bin" class="custom-file-input" name="name" id="name">
-        <label class="custom-file-label" for="name">Choose file</label>
-      </div>
-      <button type="submit" class="btn btn-primary" id="upload-btn" value="upload">Flash firmware</button>
-    </form>
---><form id="uploadForm" enctype="multipart/form-data"><div class="col-md-8 custom-file"><input type="file" accept=".bin" class="custom-file-input" name="name" id="name" onchange="checkName()"> <label class="custom-file-label" for="name">Choose file</label></div><button type="submit" class="btn btn-primary" id="upload-btn" value="upload">Flash firmware</button></form></div><div class="progress"><div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div></div><hr class="my-4"></div><script type="text/javascript">window.onload = getStatus;
-  
-  $(document).ready(function() {
-    $("#uploadForm").on('submit', function(e) {
-      e.preventDefault();
-      $.ajax( {
-        xhr: function() {
-          var xhr = new window.XMLHttpRequest();
-          xhr.upload.addEventListener("progress", function(evt) {
-            if (evt.lengthComputable) {
-              progressHandler(evt);
-            }
-          }, false);
-          return xhr;
-        },
-        type: 'POST',
-        url: '/api/upload',
-        data: new FormData(this),
-        contentType: false,
-        cache: false,
-        processData:false,
-        beforeSend: function() {
-          setProgress(0);
-        },
-        error:function() {
-          showError("Upload failed");
-        },
-        success: function(resp) {
-          showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser.");
-          setTimeout(() => {  
-            window.location = "/";
-          }, 10000);
-        }
+<!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="headingFirmware"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFirmware" aria-expanded="true" aria-controls="collapseFirmware"><b>Upload firmware</b></button></h2><div id="collapseFirmware" class="accordion-collapse collapse show" aria-labelledby="headingFirmware" data-bs-parent="#accordion"><div class="accordion-body"><div class="row mb-3"><div class="col-md-12 themed-grid-col bg-light">Here you can upload a new firmware version, it will not check the version number so you can also downgrade the firmware here.</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">Current version:</div><div class="col-md-10 themed-grid-col bg-light" id="app-ver">Loading...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">Platform:</div><div class="col-md-10 themed-grid-col bg-light" id="platform">Loading...</div></div><form id="uploadForm" enctype="multipart/form-data"><div class="row mb-3"><div class="col-md-8 custom-file"><input type="file" accept=".bin" class="custom-file-input" name="name" id="name" onchange="checkName()" data-bs-toggle="tooltip" title="Select a firmware file to upload"></div></div><div class="row mb-3"><div class="col-md-4"><button type="submit" class="btn btn-primary" id="upload-btn" value="upload" data-bs-toggle="tooltip" title="Update the device with the selected firmware">Flash firmware</button></div></div></form><div class="progress"><div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div></div></div></div></div></div><script type="text/javascript">window.onload = getStatus;
+    
+    $(document).ready(function() {
+      $("#uploadForm").on('submit', function(e) {
+        e.preventDefault();
+        $.ajax( {
+          xhr: function() {
+            var xhr = new window.XMLHttpRequest();
+            xhr.upload.addEventListener("progress", function(evt) {
+              if (evt.lengthComputable) {
+                progressHandler(evt);
+              }
+            }, false);
+            return xhr;
+          },
+          type: 'POST',
+          url: '/api/upload',
+          data: new FormData(this),
+          contentType: false,
+          cache: false,
+          processData:false,
+          beforeSend: function() {
+            setProgress(0);
+          },
+          error:function() {
+            showError("Upload failed");
+          },
+          success: function(resp) {
+            showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser.");
+            setTimeout(() => {  
+              window.location = "/";
+            }, 10000);
+          }
+        });
       });
     });
-  });
 
-  function checkName() {
-    setButtonDisabled( $("#name").val()!="" ? false : true );
-  }
+    function checkName() {
+      setButtonDisabled( $("#name").val()!="" ? false : true );
+    }
 
-  function progressHandler(event) {
-    var percent = (event.loaded / event.total) * 100;
-    setProgress(Math.round(percent));
-  }
+    function progressHandler(event) {
+      var percent = (event.loaded / event.total) * 100;
+      setProgress(Math.round(percent));
+    }
 
-  function setProgress(val) {
-    $('.progress-bar').css('width', val+'%').attr('aria-valuenow', val).text(val + "%");
-  }
+    function setProgress(val) {
+      $('.progress-bar').css('width', val+'%').attr('aria-valuenow', val).text(val + "%");
+    }
 
-  function setButtonDisabled( b ) {
-    $("#upload-btn").prop("disabled", b);
-  }
+    function setButtonDisabled( b ) {
+      $("#upload-btn").prop("disabled", b);
+    }
 
-  function getStatus() {
+    function getStatus() {
 
-    setButtonDisabled( true );
+      setButtonDisabled( true );
 
-    var url = "/api/status";
-    //var url = "/test/status.json";
-    $('#spinner').show(); 
-    $.getJSON(url, function (cfg) {
-      console.log( cfg );
+      var url = "/api/status";
+      //var url = "/test/status.json";
+      $('#spinner').show(); 
+      $.getJSON(url, function (cfg) {
+        console.log( cfg );
 
-      $("#app-ver").text(cfg["app-ver"]);
-      $("#platform").text(cfg["platform"]);
-   
-    })
-    .fail(function () {
-      showError('Unable to get data from the device.');
-    })
-    .always(function() {
-      $('#spinner').hide(); 
-    });
-  }
+        $("#app-ver").text(cfg["app-ver"]);
+        $("#platform").text(cfg["platform"]);
+    
+      })
+      .fail(function () {
+        showError('Unable to get data from the device.');
+      })
+      .always(function() {
+        $('#spinner').hide(); 
+      });
+    }
 
-  function start() {
-    setInterval(getStatus, 3000);
-  }</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>
+    function start() {
+      setInterval(getStatus, 3000);
+    }</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>

html/format.htm

@@ -5,264 +5,309 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="description" content="">
   <title>Beer Gravity Monitor</title>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">  
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+  <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: 1.0em; }
+  </style>
 </head> 
 <body class="py-4">
 
-<!-- START MENU -->
+  <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>
 
-<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
+  <!-- START MENU -->
 
-  <a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-  
-  <div class="collapse navbar-collapse" id="navbar"> 
-    <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>
-</nav>
+  <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 -->
+  <!-- START MAIN INDEX -->
 
-<div class="container">
+  <div class="container row-margin-10">
 
-  <hr class="my-2">
+    <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>
 
-  <div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert">
-    <div id="alert-msg">...</div>
-    <button type="button" id="alert-btn" class="close" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
+    <script type="text/javascript">
+      function showError( msg ) {
+        $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
 
-  <script type="text/javascript">
-    function showError( msg ) {
-      $('#alert').removeClass('alert-success').addClass('alert-danger').removeClass('d-none').addClass('show');
-      $('#alert-msg').text( msg );
-    }
+      function showSuccess( msg ) {
+        $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
 
-    function showSuccess( msg ) {
-      $('#alert').addClass('alert-success').removeClass('alert-danger').removeClass('d-none').addClass('show');
-      $('#alert-msg').text( msg );
-    }
+      $("#alert-btn").click(function(e){
+        $('.alert').addClass('hide').removeClass('show').addClass('d-none');
+      });    
+    </script>
 
-    $("#alert-btn").click(function(e){
-      $('#alert').addClass('d-none').removeClass('show');
-    });    
-  </script>
-
-  <div class="accordion" id="accordion">
-
-    <div class="card">
-      <div class="card-header" id="headingFormat">
-        <h2 class="mb-0">
-          <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseFormat" aria-expanded="true" aria-controls="collapseFormat">
-            Push Format Templates
+    <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>  
-      <div id="collapseFormat" class="collapse show" aria-labelledby="headingFormat" data-parent="#accordion">
-        <div class="card-body">
+        <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="brewfather" id="brewfather" hidden>-->
             <input type="text" name="influxdb" id="influxdb" hidden>
             <input type="text" name="mqtt" id="mqtt" hidden>
 
-            <div class="form-group row">
+            <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">
+              <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="brewfather">Brewfather</option>-->
                 <option value="influxdb">Influx DB</option>
                 <option value="mqtt">MQTT</option>
               </select>
             </div>
-          
-            <div class="form-group row">
+
+            <div class="row mb-3">
               <div class="col-sm-12">
-                <textarea rows="5" class="form-control" name="format" id="format">  
+                <textarea rows="10" class="form-control" name="format" id="format">  
                 </textarea>
               </div>
             </div>
 
-            <div class="form-group row">
-              <div class="col-sm-8 offset-sm-2">
-                <button class="btn btn-primary" id="format-btn">Save</button>
-                <button class="btn btn-secondary" id="test-btn">Test</button>
+            <script>
+              let formatTemplates = [
+              { "id": "GravityMon-Post", "format": "%7B%20%22name%22%20%3A%20%22%24%7Bmdns%7D%22%2C%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%20%22token%22%20%3A%20%22%24%7Btoken%7D%22%2C%20%22interval%22%3A%20%24%7Bsleep-interval%7D%2C%20%22temperature%22%3A%20%24%7Btemp%7D%2C%20%22temp_units%22%3A%20%22%24%7Btemp-unit%7D%22%2C%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%20%22angle%22%3A%20%24%7Bangle%7D%2C%20%22battery%22%3A%20%24%7Bbattery%7D%2C%20%22RSSI%22%3A%20%24%7Brssi%7D%2C%20%22corr-gravity%22%3A%20%24%7Bcorr-gravity%7D%2C%20%22gravity-unit%22%3A%20%22%24%7Bgravity-unit%7D%22%2C%20%22run-time%22%3A%20%24%7Brun-time%7D%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%20%22name%22%20%3A%20%22%24%7Bmdns%7D%22%2C%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%20%22token%22%20%3A%20%22%24%7Btoken%7D%22%2C%20%22interval%22%3A%20%24%7Bsleep-interval%7D%2C%20%22temperature%22%3A%20%24%7Btemp%7D%2C%20%22temp_units%22%3A%20%22%24%7Btemp-unit%7D%22%2C%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%20%22angle%22%3A%20%24%7Bangle%7D%2C%20%22battery%22%3A%20%24%7Bbattery%7D%2C%20%22RSSI%22%3A%20%24%7Brssi%7D%7D" },
+              { "id": "BrewFatherCustom-Post", "format": "%7B%20%20%20%22name%22%3A%20%22%24%7Bmdns%7D%22%2C%20%20%20%22temp%22%3A%20%24%7Btemp%7D%2C%20%20%20%22aux_temp%22%3A%200%2C%20%20%20%22ext_temp%22%3A%200%2C%20%20%20%22temp_unit%22%3A%20%22%24%7Btemp-unit%7D%22%2C%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%20%20%20%22gravity_unit%22%3A%20%22%24%7Bgravity-unit%7D%22%2C%20%20%20%22pressure%22%3A%200%2C%20%20%20%22pressure_unit%22%3A%20%22PSI%22%2C%20%20%20%22ph%22%3A%200%2C%20%20%20%22bpm%22%3A%200%2C%20%20%20%22comment%22%3A%20%22%22%2C%20%20%20%22beer%22%3A%20%22%22%2C%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%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%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Frssi%3A%24%7Brssi%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Btilt%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0A" },
+              { "id": "HomeAssistant-Mqtt2", "format": "gravmon%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Frssi%3A%24%7Brssi%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Btilt%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Ftemperature%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_temp%22%2C%22name%22%3A%22temperature%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22%24%7Btemp-unit%7D%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Ftemperature%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Fgravity%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_grav%22%2C%22name%22%3A%22gravity%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22%20%24%7Bgravity-unit%7D%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Fgravity%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Frssi%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_rssi%22%2C%22name%22%3A%22rssi%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22dBm%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Frssi%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Ftilt%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_tilt%22%2C%22name%22%3A%22tilt%22%2C%22dev_cla%22%3A%22temperature%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Ftilt%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Fbattery%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_batt%22%2C%22name%22%3A%22battery%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22V%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Fbattery%22%7D%7C%0A" },
+              { "id": "Brewblox-Mqtt", "format": "brewcast%2Fhistory%3A%7B%22key%22%3A%22%24%7Bmdns%7D%22%2C%22data%22%3A%7B%22Temperature%5BdegC%5D%22%3A%20%24%7Btemp-c%7D%2C%22Temperature%5BdegF%5D%22%3A%20%24%7Btemp-f%7D%2C%22Battery%5BV%5D%22%3A%24%7Bbattery%7D%2C%22Tilt%5Bdeg%5D%22%3A%24%7Bangle%7D%2C%22Rssi%5BdBm%5D%22%3A%24%7Brssi%7D%2C%22SG%22%3A%24%7Bgravity-sg%7D%2C%22Plato%22%3A%24%7Bgravity-plato%7D%7D%7D%7C" },
+              { "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="HomeAssistant-Mqtt2">Home Assistant - Auto register sensor (MQTT)</option>
+                <option value="UBIDots-Post">UBIdots (POST)</option>
+                <option value="BrewFatherCustom-Post">Brewfather - Custom Endpoint (POST)</option>
+                <option value="iSpindle-Post">Brewfather - iSpindle Endpoint (POST)</option>
+                <option value="GravityMon-Get">GravityMon (GET)</option>
+                <option value="Brewblox-Mqtt">BrewBlox (MQTT)</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>
 
-  <hr class="my-4">
-</div>
+  <script type="text/javascript">
+    window.onload = getConfig;
 
-<script type="text/javascript">
-  window.onload = getConfig;
-
-  setButtonDisabled( true );
-
-  // Opens the targetet according (if URL has #collapseOne to #collapseFour)
-  $(document).ready(function () {
-    if(location.hash != null && location.hash != ""){
-      $('.collapse').removeClass('in');
-      $(location.hash + '.collapse').collapse('show');
-    }
-  });
-
-  $("#push-target").change(function(e){
-    console.log(e)
-    selectFormat();
-  });
-
-  // Store the format
-  $("#format-btn").click(function(e) {
-    var s = $("#format").val();
-    s = s.replaceAll("\n", "");
-    var obj = 'id=' + $("#id").val() + '&' + $("#push-target").val() + '=' + encodeURIComponent(s);
-    console.log(obj);
-
-    $.ajax( { 
-      type: "POST",  
-      url: "/api/config/format", 
-      data: obj, 
-      success: function(result) { showSuccess('Format stored successfully.'); getConfig(); },
-      error: function(result) { showError('Unable to store format.'); }
-    } );
-  });
-  
-  // Test the calibration
-  $("#test-btn").click(function(e) {
-    var url = "/api/status";
-    //var url = "/test/status.json";
-    $('#spinner').show(); 
-    $.getJSON(url, function (cfg) {
-      console.log( cfg );
-
-      var doc = $("#format").val();
-
-      if (cfg["temp-format"]=="C")
-        doc = doc.replaceAll("${temp}", cfg["temp-c"]);
-      else
-        doc = doc.replaceAll("${temp}", cfg["temp-f"]);
-
-      if (cfg["gravity-format"]=="G") {
-        var sg = cfg["gravity"];
-        doc = doc.replaceAll("${gravity-sg}", sg);
-        doc = doc.replaceAll("${corr-gravity-sg}", sg);
-        var plato = 259 - (259 - sg);
-        doc = doc.replaceAll("${gravity-plato}", plato);
-        doc = doc.replaceAll("${corr-gravity-plato}", plato);
-      }
-      else {
-        var plato = cfg["gravity"];
-        doc = doc.replaceAll("${gravity-plato}", plato);
-        doc = doc.replaceAll("${corr-gravity-plato}", plato);
-        var sg = 259 / (259 - plato);
-        doc = doc.replaceAll("${gravity-sg}", sg);
-        doc = doc.replaceAll("${corr-gravity-sg}", sg);
-      }
-        
-      doc = doc.replaceAll("${mdns}", cfg["mdns"]);
-      doc = doc.replaceAll("${id}", cfg["id"]);
-      doc = doc.replaceAll("${sleep-interval}", cfg["sleep-interval"]);
-      doc = doc.replaceAll("${token}", cfg["token"]);
-      doc = doc.replaceAll("${token2}", cfg["token2"]);
-      doc = doc.replaceAll("${temp-c}", cfg["temp-c"]);
-      doc = doc.replaceAll("${temp-f}", cfg["temp-f"]);
-      doc = doc.replaceAll("${temp-unit}", cfg["temp-format"]);
-      doc = doc.replaceAll("${battery}", cfg["battery"]);
-      doc = doc.replaceAll("${rssi}", cfg["rssi"]);
-      doc = doc.replaceAll("${run-time}", cfg["runtime-average"]);
-      doc = doc.replaceAll("${gravity}", cfg["gravity"]);
-      doc = doc.replaceAll("${gravity-unit}", cfg["gravity-format"]);
-      doc = doc.replaceAll("${corr-gravity}", cfg["gravity"]);
-      doc = doc.replaceAll("${angle}", cfg["angle"]);
-      doc = doc.replaceAll("${tilt}", cfg["angle"]);
-
-      // Format in a readable json string.
-      try {
-        var json = JSON.parse(doc);
-        doc = JSON.stringify(json, null, 2);
-      } catch(e) {
-        console.log("Not a javascript object!")
-      }
-
-      $("#preview").text(doc);
-
-    })
-    .fail(function () {
-      showError('Unable to get data from the device.');
-    })
-    .always(function() {
-      $('#spinner').hide(); 
-    });
-  });
- 
-
-  function setButtonDisabled( b ) {
-    $("#format-btn").prop("disabled", b);
-    $("#test-btn").prop("disabled", b);
-  }
-
-  function selectFormat() {
-    var s = "#" + $("#push-target").val()
-    console.log(s);
-    s = decodeURIComponent($(s).val());
-    console.log(s);
-    s = s.replaceAll("|", "|\n");
-    console.log(s);
-    $("#format").val(s);
-    $("#preview").text("");
-  }
-
-  // Get the configuration values from the API
-  function getConfig() {
     setButtonDisabled( true );
 
-    var url = "/api/config/format";
-    //var url = "/test/format.json";
-    $('#spinner').show(); 
-    $.getJSON(url, function (cfg) {
-      console.log( cfg );
-      $("#id").val(cfg["id"]);
-
-      $("#http-1").val(cfg["http-1"]);
-      $("#http-2").val(cfg["http-2"]);
-      $("#http-3").val(cfg["http-3"]);
-      //$("#brewfather").val(cfg["brewfather"]);
-      $("#influxdb").val(cfg["influxdb"]);
-      $("#mqtt").val(cfg["mqtt"]);
-      selectFormat();
-    })
-    .fail(function () {
-      showError('Unable to get data from the device.');
-    })
-    .always(function() {
-      $('#spinner').hide(); 
-      setButtonDisabled( false );
+    // Opens the targetet according (if URL has #collapseOne to #collapseFour)
+    $(document).ready(function () {
+      if(location.hash != null && location.hash != ""){
+        $('.collapse').removeClass('in');
+        $(location.hash + '.collapse').collapse('show');
+      }
     });
-  }
-</script>
 
-<!-- START FOOTER -->
+    $("#push-target").change(function(e){
+      console.log(e)
+      selectFormat();
+    });
 
-<div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div>
+    // Copy the selected template
+    $("#copy-btn").click(function(e) {
+      var id = $("#predefined").val();
+
+      //console.log( encodeURIComponent( $("#format").val() ) );
+
+      formatTemplates.forEach(function (item, index) {
+        if( item.id == id ) {
+          $("#format").val( decodeURIComponent(item.format) );
+        }
+      });
+    });
+
+    // Clear the selected template
+    $("#clear-btn").click(function(e) {
+      $("#format").val( "" );
+    });
+
+    // Store the format
+    $("#format-btn").click(function(e) {
+      var s = $("#format").val();
+      s = s.replaceAll("\n", "");
+      var obj = 'id=' + $("#id").val() + '&' + $("#push-target").val() + '=' + encodeURIComponent(s);
+      console.log(obj);
+
+      $.ajax( { 
+        type: "POST",  
+        url: "/api/config/format", 
+        data: obj, 
+        success: function(result) { showSuccess('Format stored successfully.'); getConfig(); },
+        error: function(result) { showError('Unable to store format.'); }
+      } );
+    });
+    
+    // Test the calibration
+    $("#test-btn").click(function(e) {
+      var url = "/api/status";
+      //var url = "/test/status.json";
+      $('#spinner').show(); 
+      $.getJSON(url, function (cfg) {
+        console.log( cfg );
+
+        var doc = $("#format").val();
+
+        if (cfg["temp-format"]=="C")
+          doc = doc.replaceAll("${temp}", cfg["temp-c"]);
+        else
+          doc = doc.replaceAll("${temp}", cfg["temp-f"]);
+
+        if (cfg["gravity-format"]=="G") {
+          var sg = cfg["gravity"];
+          doc = doc.replaceAll("${gravity-sg}", sg);
+          doc = doc.replaceAll("${corr-gravity-sg}", sg);
+          var plato = 259 - (259 - sg);
+          doc = doc.replaceAll("${gravity-plato}", plato);
+          doc = doc.replaceAll("${corr-gravity-plato}", plato);
+        }
+        else {
+          var plato = cfg["gravity"];
+          doc = doc.replaceAll("${gravity-plato}", plato);
+          doc = doc.replaceAll("${corr-gravity-plato}", plato);
+          var sg = 259 / (259 - plato);
+          doc = doc.replaceAll("${gravity-sg}", sg);
+          doc = doc.replaceAll("${corr-gravity-sg}", sg);
+        }
+          
+        doc = doc.replaceAll("${mdns}", cfg["mdns"]);
+        doc = doc.replaceAll("${id}", cfg["id"]);
+        doc = doc.replaceAll("${sleep-interval}", cfg["sleep-interval"]);
+        doc = doc.replaceAll("${token}", cfg["token"]);
+        doc = doc.replaceAll("${token2}", cfg["token2"]);
+        doc = doc.replaceAll("${temp-c}", cfg["temp-c"]);
+        doc = doc.replaceAll("${temp-f}", cfg["temp-f"]);
+        doc = doc.replaceAll("${temp-unit}", cfg["temp-format"]);
+        doc = doc.replaceAll("${battery}", cfg["battery"]);
+        doc = doc.replaceAll("${rssi}", cfg["rssi"]);
+        doc = doc.replaceAll("${run-time}", cfg["runtime-average"]);
+        doc = doc.replaceAll("${gravity}", cfg["gravity"]);
+        doc = doc.replaceAll("${gravity-unit}", cfg["gravity-format"]);
+        doc = doc.replaceAll("${corr-gravity}", cfg["gravity"]);
+        doc = doc.replaceAll("${angle}", cfg["angle"]);
+        doc = doc.replaceAll("${tilt}", cfg["angle"]);
+        doc = doc.replaceAll("${app-ver}", cfg["app-ver"]);
+        doc = doc.replaceAll("${app-build}", cfg["app-build"]);
+
+        // Format in a readable json string.
+        try {
+          var json = JSON.parse(doc);
+          doc = JSON.stringify(json, null, 2);
+        } catch(e) {
+          console.log("Not a JSON object!")
+        }
+
+        $("#preview").text(doc);
+
+      })
+      .fail(function () {
+        showError('Unable to get data from the device.');
+      })
+      .always(function() {
+        $('#spinner').hide(); 
+      });
+    });
+
+    function setButtonDisabled( b ) {
+      $("#format-btn").prop("disabled", b);
+      $("#test-btn").prop("disabled", b);
+    }
+
+    function selectFormat() {
+      var s = "#" + $("#push-target").val()
+      console.log(s);
+      s = decodeURIComponent($(s).val());
+      console.log(s);
+      s = s.replaceAll("|", "|\n");
+      console.log(s);
+      $("#format").val(s);
+      $("#preview").text("");
+    }
+
+    // Get the configuration values from the API
+    function getConfig() {
+      setButtonDisabled( true );
+
+      var url = "/api/config/format";
+      //var url = "/test/format.json";
+      $('#spinner').show(); 
+      $.getJSON(url, function (cfg) {
+        console.log( cfg );
+        $("#id").val(cfg["id"]);
+
+        $("#http-1").val(cfg["http-1"]);
+        $("#http-2").val(cfg["http-2"]);
+        $("#http-3").val(cfg["http-3"]);
+        $("#influxdb").val(cfg["influxdb"]);
+        $("#mqtt").val(cfg["mqtt"]);
+        selectFormat();
+      })
+      .fail(function () {
+        showError('Unable to get data from the device.');
+      })
+      .always(function() {
+        $('#spinner').hide(); 
+        setButtonDisabled( false );
+      });
+    }
+  </script>
+
+  <!-- START FOOTER -->
+
+  <div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div>
 </body>
 </html>

html/index.htm

@@ -5,237 +5,349 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="description" content="">
   <title>Beer Gravity Monitor</title>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">  
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+  <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: 1.0em; }
+  </style>
 </head>
 
 <body class="py-4">
 
-<!-- START MENU -->
+  <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>
 
-<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
-  <a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
+  <!-- START MENU -->
 
-  <div class="collapse navbar-collapse" id="navbar"> 
-    <ul class="navbar-nav mr-auto">
-      <li class="nav-item active">
-        <a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></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>
+  <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>
 
-    <div class="spinner-border text-light" id="spinner" role="status"></div>
-  </div>
-</nav>
+  <!-- START MAIN INDEX -->
 
-<!-- START MAIN INDEX -->
+  <div class="container row-margin-10">
 
-<div class="container">
+    <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>
 
-  <hr class="my-4">
+    <script type="text/javascript">
+      function showError( msg ) {
+        console.log("Error:" + msg);
+        $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
 
-  <div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert">
-    <div id="alert-msg">...</div>
-    <button type="button" id="alert-btn" class="close" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
+      function showSuccess( msg ) {
+        console.log("Success:" + msg);
+        $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
+
+      $("#alert-btn").click(function(e){
+        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>
+              $("#log-btn").click(function(e){
+                loadLog();
+              });
+              setInterval(function() {
+                loadLog();
+              }, 5000);
+            
+              function loadLog() {
+                $("#logContent").load("/log");
+                //$("#logContent").load("/test/log");
+              };
+            </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 showError( msg ) {
-      $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('d-none').addClass('show')
-      $('#alert-msg').text( msg );
+    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 url = "/api/config";
+      //var url = "/test/config.json";
+      $.getJSON(url, function (cfg) {
+        debug = {};
+        debug["mdns"] = cfg["mdns"];
+        debug["id"] = cfg["id"];
+
+        debug["sleep-interval"] = cfg["sleep-interval"];
+        debug["temp-format"] = cfg["temp-format"];
+
+        debug["gravity-format"] = cfg["gravity-format"];
+        debug["gravity-temp-adjustment"] = cfg["gravity-temp-adjustment"];
+
+        debug["voltage-factor"] = cfg["voltage-factor"];
+        debug["platform"] = cfg["platform"];
+        debug["ble"] = cfg["ble"];
+        debug["gyro-temp"] = cfg["gyro-temp"];
+        debug["gyro-calibration-data"] = cfg["gyro-calibration-data"];
+        debug["temp-adjustment-value"] = cfg["temp-adjustment-value"];
+
+        var url = "/api/status";
+        //var url = "/test/status.json";
+        $.getJSON(url, function (cfg) {
+          debug["runtime-average"] = cfg["runtime-average"];
+          debug["rssi"] = cfg["rssi"];
+          debug["app-ver"] = cfg["app-ver"];
+          debug["app-build"] = cfg["app-build"];       
+        });
+
+        var url = "/api/config/format";
+        //var url = "/test/format.json";
+        $.getJSON(url, function (cfg) {
+          debug["formats"] = cfg;
+
+          var url = "/api/config/advanced";
+          //var url = "/test/adv.json";
+          $.getJSON(url, function (cfg) {
+            debug["advanced"] = cfg;
+
+            var url = "/api/upload";
+            //var url = "/test/upload.json";
+            $.getJSON(url, function (cfg) {
+              debug["files"] = cfg;
+            
+              var url = "/log";
+              //var url = "/test/log";
+              $.ajax({url: url, method: 'get', success: function (data) {
+                debug["log"] = data.split("\n");
+                var s = JSON.stringify(debug, null, 2);
+                $("#supportContent").text( s );
+                $('#spinner').hide(); 
+                //navigator.clipboard.writeText(s);
+                //alert("Support information copied to clipboard");
+                } 
+              });
+            });
+          });
+        });
+      });   
+    });
+
+    $("#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(result) { },
+        error: function(result) { showError('Could not update sleep mode for device.'); },
+      } );
+    });
+
+    function getStatus() {
+      var url = "/api/status";
+      //var url = "/test/status.json";
+      $('#spinner').show(); 
+
+      $.getJSON(url, function (cfg) {
+        console.log( cfg );
+
+        $("#app-ver").text(cfg["app-ver"] + " (" + cfg["app-build"] + ")");
+        $("#mdns").text(cfg["mdns"]);
+        $("#id").text(cfg["id"]);
+        $("#platform").text(cfg["platform"]);
+        $("#wifi-ssid").text(cfg["wifi-ssid"]);
+        $("#runtime").text(cfg["runtime-average"] + " seconds");
+    
+        var angle = cfg["angle"];
+        
+        if(angle==0) {
+          $("#angle").text("Gyro moving"); 
+          $("#gravity").text("Gyro moving");
+        } else {
+          $("#angle").text(cfg["angle"]);
+        
+          if( cfg["gravity-format"] == "G")
+            $("#gravity").text(cfg["gravity"] + " SG");
+          else
+            $("#gravity").text(cfg["gravity"] + " °P");
+        }
+
+        var batt = cfg["battery"];
+        var charge = 0;
+
+        if(batt>4.15) charge = 100;
+        else if(batt>4.05) charge = 90;
+        else if(batt>3.97) charge = 80;
+        else if(batt>3.91) charge = 70;
+        else if(batt>3.86) charge = 60;
+        else if(batt>3.81) charge = 50;
+        else if(batt>3.78) charge = 40;
+        else if(batt>3.76) charge = 30;
+        else if(batt>3.73) charge = 20;
+        else if(batt>3.67) charge = 10;
+        else if(batt>3.44) charge = 5;
+
+        $("#battery").text(batt + " V (" + charge + "%)" );
+
+        if( cfg["temp-format"] == "C") 
+          $("#temp").text(cfg["temp-c"] + " C");
+        else 
+          $("#temp").text(cfg["temp-f"] + " F");
+
+        if( cfg["sleep-mode"] ) 
+          $("#sleep-mode").attr("checked", true );
+        else 
+          $("#sleep-mode").attr("checked", false );
+        $("#sleep-mode").removeAttr("disabled");
+      })
+      .fail(function () {
+        showError('Unable to get data from the device.');
+      })
+      .always(function() {
+        $('#spinner').hide(); 
+      });
     }
 
-    function showSuccess( msg ) {
-      $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('d-none').addClass('show')
-      $('#alert-msg').text( msg );
+    function start() {
+      setInterval(getStatus, 3000);
     }
-
-    $("#alert-btn").click(function(e){
-      $('.alert').addClass('d-none').removeClass('show')
-    });    
   </script>
 
-<div class="row mb-3">
-  <div class="col-md-8 themed-grid-col bg-light">Current version:</div>
-  <div class="col-md-4 themed-grid-col bg-light" id="app-ver">Loading...</div>
-</div>
-<div class="row mb-3" id="h-app-ver-new" hidden>
-  <div class="col-md-8 themed-grid-col bg-light">New version:</div>
-  <div class="col-md-4 themed-grid-col bg-light" id="app-ver-new">Loading...</div>
-</div>
-<div class="row mb-3">
-  <div class="col-md-8 themed-grid-col bg-light">Host name:</div>
-  <div class="col-md-4 themed-grid-col bg-light" id="mdns">Loading...</div>
-</div>
-<div class="row mb-3">
-  <div class="col-md-8 themed-grid-col bg-light">Device ID:</div>
-  <div class="col-md-4 themed-grid-col bg-light" id="id">Loading...</div>
-</div>
-<div class="row mb-3">
-  <div class="col-md-8 themed-grid-col bg-light">Platform:</div>
-  <div class="col-md-4 themed-grid-col bg-light" id="platform">Loading...</div>
-</div>
+  <!-- START FOOTER -->
 
-<script>
-  $("#log-btn").click(function(e){
-    loadLog();
-  });
-  setInterval(function() {
-    loadLog();
-  }, 3000); //5 seconds  
- 
-  function loadLog() {
-    $("#logContent").load("/log");
-    //$("#logContent").load("/test/status.json");
-  };
-</script>
-
-<div class="row mb-3">
-  <a class="badge badge-primary" data-toggle="collapse" href="#collapseLog" role="button" aria-expanded="false" aria-controls="collapseLog" id="log-btn">
-    View error log
-  </a>
-</div>
-
-<div class="collapse" id="collapseLog">
-  <div class="card card-body">
-    <pre><code id="logContent"></code></pre>
-  </div>
-</div>
-
-<hr class="my-4">
-
-  <div class="row mb-3">
-    <div class="col-md-8 themed-grid-col bg-light">Gravity:</div>
-    <div class="col-md-4 themed-grid-col bg-light" id="gravity">Loading...</div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-md-8 themed-grid-col bg-light">Temperature:</div>
-    <div class="col-md-4 themed-grid-col bg-light" id="temp">Loading...</div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-md-8 themed-grid-col bg-light">Angle/Tilt:</div>
-    <div class="col-md-4 themed-grid-col bg-light" id="angle">Loading...</div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-md-8 themed-grid-col bg-light">Battery:</div>
-    <div class="col-md-4 themed-grid-col bg-light" id="battery">Loading...</div>
-  </div>
-
-  <div class="row mb-3">
-    <div class="col-md-8 themed-grid-col bg-light">Average runtime:</div>
-    <div class="col-md-4 themed-grid-col bg-light" id="runtime">Loading...</div>
-  </div>
-
-  <div class="row mb-3">
-    <div class="col-md-12 px-md-5 themed-grid-col 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>      
-
-  <hr class="my-4">
-
-</div>
-
-<script type="text/javascript">
-  window.onload = start;
-
-  $("#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(result) { },
-      error: function(result) { showError('Could not update sleep mode for device.'); },
-    } );
-  });
-
-  function getStatus() {
-    var url = "/api/status";
-    //var url = "/test/status.json";
-    $('#spinner').show(); 
-    $.getJSON(url, function (cfg) {
-      console.log( cfg );
-
-      //$("#app-ver").text(cfg["app-ver"] + " (html 0.8.0)");
-      $("#app-ver").text(cfg["app-ver"] + " (" + cfg["app-build"] + ")");
-      $("#mdns").text(cfg["mdns"]);
-      $("#id").text(cfg["id"]);
-      $("#platform").text(cfg["platform"]);
-      $("#runtime").text(cfg["runtime-average"] + " seconds");
-   
-      var angle = cfg["angle"];
-      
-      if(angle==0) {
-        $("#angle").text("Gyro moving"); 
-        $("#gravity").text("Gyro moving");
-      } else {
-        $("#angle").text(cfg["angle"]);
-      
-        if( cfg["gravity-format"] == "G")
-          $("#gravity").text(cfg["gravity"] + " SG");
-        else
-          $("#gravity").text(cfg["gravity"] + " °P");
-      }
-
-      var batt = cfg["battery"];
-      var charge = 0;
-
-      if(batt>4.15) charge = 100;
-      else if(batt>4.05) charge = 90;
-      else if(batt>3.97) charge = 80;
-      else if(batt>3.91) charge = 70;
-      else if(batt>3.86) charge = 60;
-      else if(batt>3.81) charge = 50;
-      else if(batt>3.78) charge = 40;
-      else if(batt>3.76) charge = 30;
-      else if(batt>3.73) charge = 20;
-      else if(batt>3.67) charge = 10;
-      else if(batt>3.44) charge = 5;
-
-      $("#battery").text(batt + " V (" + charge + "%)" );
-
-      if( cfg["temp-format"] == "C") 
-        $("#temp").text(cfg["temp-c"] + " C");
-      else 
-        $("#temp").text(cfg["temp-f"] + " F");
-
-      if( cfg["sleep-mode"] ) 
-        $("#sleep-mode").attr("checked", true );
-      else 
-        $("#sleep-mode").attr("checked", false );
-      $("#sleep-mode").removeAttr("disabled");
-    })
-    .fail(function () {
-      showError('Unable to get data from the device.');
-    })
-    .always(function() {
-      $('#spinner').hide(); 
-    });
-  }
-
-  function start() {
-    setInterval(getStatus, 3000);
-  }
-</script>
-
-<!-- START FOOTER -->
-
-<div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div>
+  <div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div>
 </body>
 </html>

html/test.htm

@@ -5,213 +5,225 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="description" content="">
   <title>Beer Gravity Monitor</title>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">  
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+  <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: 1.0em; }
+  </style>
 </head> 
 <body class="py-4">
 
-<!-- START MENU -->
+  <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>
 
-<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
+  <!-- START MENU -->
 
-  <a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-  
-  <div class="collapse navbar-collapse" id="navbar"> 
-    <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>
-</nav>
+  <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 -->
+  <!-- START MAIN INDEX -->
 
-<div class="container">
+  <div class="container row-margin-10">
 
-  <hr class="my-2">
+    <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>
 
-  <div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert">
-    <div id="alert-msg">...</div>
-    <button type="button" id="alert-btn" class="close" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <script type="text/javascript">
+      function showError( msg ) {
+        $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
+
+      function showSuccess( msg ) {
+        $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
+
+      $("#alert-btn").click(function(e){
+        $('.alert').addClass('hide').removeClass('show').addClass('d-none');
+      });    
+    </script>
+
+
+    <div class="accordion" id="accordion">
+      <div class="accordion-item">
+        <h2 class="accordion-header" id="headingTest">
+          <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTest" aria-expanded="true" aria-controls="collapseTest">
+            <b>Testing push targets</b>
+          </button>
+        </h2>
+        <div id="collapseTest" class="accordion-collapse collapse show" aria-labelledby="headingTest" data-bs-parent="#accordion">
+          <div class="accordion-body">
+            <div class="row mb-3">
+              <pre class="card-preview" id="preview" name="preview">Press test button to start testing all defined push targets.</pre> 
+            </div>
+
+            <div class="row mb-3">
+              <div class="col-sm-8">
+                <button class="btn btn-primary" id="test-btn" data-bs-toggle="tooltip" title="Test all push targets">Test</button>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 
   <script type="text/javascript">
-    function showError( msg ) {
-      $('#alert').removeClass('alert-success').addClass('alert-danger').removeClass('d-none').addClass('show');
-      $('#alert-msg').text( msg );
+    $('#spinner').hide(); 
+
+    function clearLog() {
+      $("#preview").text("");
     }
 
-    function showSuccess( msg ) {
-      $('#alert').addClass('alert-success').removeClass('alert-danger').removeClass('d-none').addClass('show');
-      $('#alert-msg').text( msg );
+    function appendLog(log) {
+      doc = $("#preview").text();
+      doc += log + "\n";
+      $("#preview").text(doc);
     }
 
-    $("#alert-btn").click(function(e){
-      $('#alert').addClass('d-none').removeClass('show');
-    });    
+    // Get the configuration values from the API
+    $("#test-btn").click(function(e) {
+      clearLog();
+      appendLog( "Starting test of push targets" );
+
+      var url = "/api/status";
+      //var url = "/test/status.json";
+      $("#test-btn").prop("disabled", true);
+      $('#spinner').show();
+      $.getJSON(url, function (cfg) {
+        var id = cfg["id"];
+        console.log( id );
+    
+        testHttp( id, "http-1" );
+        testHttp( id, "http-2" );
+        testHttp( id, "http-3" );
+        testInfluxdb( id );
+        testMqtt( id );
+        $('#spinner').hide(); 
+        $("#test-btn").prop("disabled", false);
+      })
+      .fail(function () {
+        showError('Unable to get data from the device.');
+        $('#spinner').hide(); 
+        $("#test-btn").prop("disabled", false);
+      })
+      .always(function() {
+      });
+    });
+
+    function testMqtt(id) {
+      var url = "/api/test/push";
+      url += "?id=" + id + "&format=mqtt";
+      //var url = "/test/push.json";  
+      $.getJSON(url, function (cfg) {
+        var code = cfg["code"];
+        var success = cfg["success"];
+        var enabled = cfg["enabled"];
+
+        if(!enabled) {
+          appendLog( "Push target 'mqtt' is not configured/used" );
+        } else if(success) {
+          appendLog( "Push target 'mqtt' successful" );
+        } else{
+          if(code==-3)
+            appendLog( "Push target 'mqtt' failed to connect" );
+          else if(code==-4)
+            appendLog( "Push target 'mqtt' failed with error timeout" );
+          else if(code==-10)
+            appendLog( "Push target 'mqtt' failed with error denied" );
+          else if(code==-100)
+            appendLog( "Push target 'mqtt' skipped since it's using SSL" );
+          else 
+            appendLog( "Push target 'mqtt' failed with error code " + code );
+        }
+      })
+      .fail(function () {
+        appendLog( "Failed to test push target 'mqtt'");
+      })
+    }
+  
+    function testInfluxdb(id) {
+      var url = "/api/test/push";
+      url += "?id=" + id + "&format=influxdb";
+      //var url = "/test/push.json";  
+      $.getJSON(url, function (cfg) {
+        var code = cfg["code"];
+        var success = cfg["success"];
+        var enabled = cfg["enabled"];
+
+        if(!enabled) {
+          appendLog( "Push target 'influxdb' is not configured/used" );
+        } else if(success) {
+          appendLog( "Push target 'influxdb' successful" );
+        } else{
+          if(code==400)
+            appendLog( "Push target 'influxdb' failed with error code 400, bad request" );
+          else if(code==401)
+            appendLog( "Push target 'influxdb' failed with error code 401, unauthorized" );
+          else if(code==404)
+            appendLog( "Push target 'influxdb' failed with error code 404, url not found" );
+          else if(code==-100)
+            appendLog( "Push target 'influxdb' skipped since it's using SSL" );
+          else 
+            appendLog( "Push target 'influxdb' failed with error code " + code );
+        }
+      })
+      .fail(function () {
+        appendLog( "Failed to test push target 'influxdb'");
+      })
+    }
+
+    function testHttp(id, target) {
+      var url = "/api/test/push";
+      url += "?id=" + id + "&format=" + target;
+      //var url = "/test/push.json";  
+      $.getJSON(url, function (cfg) {
+        var code = cfg["code"];
+        var success = cfg["success"];
+        var enabled = cfg["enabled"];
+
+        if(!enabled) {
+          appendLog( "Push target '" + target + "' is not configured/used" );
+        } else if(success) {
+          appendLog( "Push target '" + target + "' successful" );
+        } else{
+          if(code==400)
+            appendLog( "Push target '" + target + "' failed with error code 400, bad request" );
+          else if(code==401)
+            appendLog( "Push target '" + target + "' failed with error code 401, unauthorized" );
+          else if(code==404)
+            appendLog( "Push target '" + target + "' failed with error code 404, url not found" );
+          else if(code==-100)
+            appendLog( "Push target '" + target + "' skipped since it's using SSL" );
+          else 
+            appendLog( "Push target '" + target + "' failed with error code " + code );
+        }
+      })
+      .fail(function () {
+        appendLog( "Failed to test push target '" + target + "'");
+      })
+    }
   </script>
 
-  <div>
-    <div class="card">
-      <div class="card-body">
-          <pre class="card-preview" id="preview" name="preview"></pre> 
-    </div>
-  </div>
+  <!-- START FOOTER -->
 
-  <div class="form-group row">
-  </div>
-
-  <div class="form-group row">
-    <div class="col-sm-8">
-      <button class="btn btn-primary" id="test-btn">Test</button>
-    </div>
-  </div>
-
-  <hr class="my-4">
-</div>
-
-<script type="text/javascript">
-  $('#spinner').hide(); 
-
-  function clearLog() {
-    $("#preview").text("");
-  }
-
-  function appendLog(log) {
-    doc = $("#preview").text();
-    doc += log + "\n";
-    $("#preview").text(doc);
-  }
-
-  // Get the configuration values from the API
-  $("#test-btn").click(function(e) {
-    clearLog();
-    appendLog( "Starting test of push targets" );
-
-    var url = "/api/status";
-    //var url = "/test/status.json";
-    $("#test-btn").prop("disabled", true);
-    $('#spinner').show();
-    $.getJSON(url, function (cfg) {
-      var id = cfg["id"];
-      console.log( id );
-   
-      testHttp( id, "http-1" );
-      testHttp( id, "http-2" );
-      testHttp( id, "http-3" );
-      testHttp( id, "brewfather" );
-      testInfluxdb( id );
-      testMqtt( id );
-      $('#spinner').hide(); 
-      $("#test-btn").prop("disabled", false);
-    })
-    .fail(function () {
-      showError('Unable to get data from the device.');
-      $('#spinner').hide(); 
-      $("#test-btn").prop("disabled", false);
-    })
-    .always(function() {
-    });
-  });
-
-  function testMqtt(id) {
-    var url = "/api/test/push";
-    url += "?id=" + id + "&format=mqtt";
-    //var url = "/test/push.json";  
-    $.getJSON(url, function (cfg) {
-      var code = cfg["code"];
-      var success = cfg["success"];
-      var enabled = cfg["enabled"];
-
-      if(!enabled) {
-        appendLog( "Push target 'mqtt' is not configured/used" );
-      } else if(success) {
-        appendLog( "Push target 'mqtt' successful" );
-      } else{
-        if(code==-3)
-          appendLog( "Push target 'mqtt' failed to connect" );
-        else if(code==-4)
-          appendLog( "Push target 'mqtt' failed with error timeout" );
-        else if(code==-10)
-          appendLog( "Push target 'mqtt' failed with error denied" );
-        else 
-          appendLog( "Push target 'mqtt' failed with error code " + code );
-      }
-    })
-    .fail(function () {
-      appendLog( "Failed to test push target 'influxdb'");
-    })
-  }
- 
-  function testInfluxdb(id) {
-    var url = "/api/test/push";
-    url += "?id=" + id + "&format=influxdb";
-    //var url = "/test/push.json";  
-    $.getJSON(url, function (cfg) {
-      var code = cfg["code"];
-      var success = cfg["success"];
-      var enabled = cfg["enabled"];
-
-      if(!enabled) {
-        appendLog( "Push target 'influxdb' is not configured/used" );
-      } else if(success) {
-        appendLog( "Push target 'influxdb' successful" );
-      } else{
-        if(code==400)
-          appendLog( "Push target 'influxdb' failed with error code 400, bad request" );
-        else if(code==401)
-          appendLog( "Push target 'influxdb' failed with error code 401, unauthorized" );
-        else if(code==404)
-          appendLog( "Push target 'influxdb' failed with error code 404, url not found" );
-        else 
-          appendLog( "Push target 'influxdb' failed with error code " + code );
-      }
-    })
-    .fail(function () {
-      appendLog( "Failed to test push target 'influxdb'");
-    })
-  }
-
-  function testHttp(id, target) {
-    var url = "/api/test/push";
-    url += "?id=" + id + "&format=" + target;
-    //var url = "/test/push.json";  
-    $.getJSON(url, function (cfg) {
-      var code = cfg["code"];
-      var success = cfg["success"];
-      var enabled = cfg["enabled"];
-
-      if(!enabled) {
-        appendLog( "Push target '" + target + "' is not configured/used" );
-      } else if(success) {
-        appendLog( "Push target '" + target + "' successful" );
-      } else{
-        if(code==400)
-          appendLog( "Push target '" + target + "' failed with error code 400, bad request" );
-        else if(code==401)
-          appendLog( "Push target '" + target + "' failed with error code 401, unauthorized" );
-        else if(code==404)
-          appendLog( "Push target '" + target + "' failed with error code 404, url not found" );
-        else 
-          appendLog( "Push target '" + target + "' failed with error code " + code );
-      }
-    })
-    .fail(function () {
-      appendLog( "Failed to test push target '" + target + "'");
-    })
-  }
-</script>
-
-<!-- START FOOTER -->
-
-<div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div>
+  <div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div>
 </body>
 </html>

html/upload.htm

@@ -5,160 +5,175 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="description" content="">
   <title>Beer Gravity Monitor</title>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">  
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+  <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: 1.0em; }
+  </style>
 </head>
 
 <body class="py-4">
 
-<!-- START MENU -->
+  <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>
 
-<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
-  <a class="navbar-brand" href="/upload.htm">Beer Gravity Monitor - Missing html files</a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
+  <!-- START MENU -->
 
-  <div class="collapse navbar-collapse" id="navbar"> 
-    <div class="spinner-border text-light" id="spinner" role="status"></div>
-  </div>
-</nav>
+  <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="spinner-border text-light" id="spinner" role="status"></div>
+    </div>
+  </nav>
 
-<!-- START MAIN INDEX -->
+  <!-- START MAIN INDEX -->
 
-<div class="container">
+  <div class="container row-margin-10">
 
-  <hr class="my-4">
+    <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>
 
-  <div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert">
-    <div id="alert-msg">...</div>
-    <button type="button" id="alert-btn" class="close" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <script type="text/javascript">
+      function showError( msg ) {
+        $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
+
+      function showSuccess( msg ) {
+        $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
+
+      $("#alert-btn").click(function(e){
+        $('.alert').addClass('hide').removeClass('show').addClass('d-none');
+      });    
+    </script>
+
+    <div class="accordion" id="accordion">
+      <div class="accordion-item">
+        <h2 class="accordion-header" id="headingUpload">
+          <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseUpload" aria-expanded="true" aria-controls="collapseUpload">
+            <b>Upload missing html files</b>
+          </button>
+        </h2>
+        <div id="collapseUpload" class="accordion-collapse collapse show" aria-labelledby="headingUpload" data-bs-parent="#accordion">
+          <div class="accordion-body">
+
+            <div class="row mb-3">
+              <div class="col-md-8 bg-light">The listed files below needs to be uploaded to the FileSystem in order for the GUI to work. 
+                You can also flash the LittleFS filesystem but in that case you will loose your device settings. An OTA upgrade will automatically download 
+                the files if they are found in the same location as the firmware.bin. This page is a fallback option.
+              </div>
+              <div class="col-md-8 bg-light"><br><strong>Once all the files are confirmed, please reboot the device for normal operation.</strong></div>
+            </div>
+          
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">index.min.htm</div>
+              <div class="col-md-6 bg-light" id="index">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">config.min.htm</div>
+              <div class="col-md-6 bg-light" id="config">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">calibration.min.htm</div>
+              <div class="col-md-6 bg-light" id="calibration">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">format.min.htm</div>
+              <div class="col-md-6 bg-light" id="format">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">test.min.htm</div>
+              <div class="col-md-6 bg-light" id="test">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">about.min.htm</div>
+              <div class="col-md-6 bg-light" id="about">Checking...</div>
+            </div>
+
+            <form action="/api/upload" method="post" enctype="multipart/form-data">
+              <div class="row mb-3">
+                <div class="col-md-8 custom-file">
+                  <input type="file" accept=".min.htm" class="custom-file-input" name="name" id="name" data-bs-toggle="tooltip" title="Select a file that matches the name in the list above to upload it to the device">
+                </div>
+              </div>
+              <div class="row mb-3">
+                <div class="col-md-3">
+                  <button type="submit" class="btn btn-primary" id="upload-btn" value="upload" data-bs-toggle="tooltip" title="Upload the selected file to the device">Upload</button>
+                </div>
+              </div>
+            </form>
+          
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 
   <script type="text/javascript">
-    function showError( msg ) {
-      $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('d-none').addClass('show')
-      $('#alert-msg').text( msg );
-    }
+  window.onload = getUpload;
 
-    function showSuccess( msg ) {
-      $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('d-none').addClass('show')
-      $('#alert-msg').text( msg );
-    }
+  // Add the following code if you want the name of the file appear on select
+  $(".custom-file-input").on("change", function() {
+    var fileName = $(this).val().split("\\").pop();
+    $(this).siblings(".custom-file-label").addClass("selected").html(fileName);
+  });
 
-    $("#alert-btn").click(function(e){
-      $('.alert').addClass('d-none').removeClass('show')
-    });    
+  function getUpload() {
+      var url = "/api/upload";
+      //var url = "/test/upload.json";
+      $('#spinner').show(); 
+      $.getJSON(url, function (cfg) {
+        console.log( cfg );
+
+        if( cfg["index"] )
+          $("#index").text("Completed.");
+        else
+          $("#index").text("File is missing.");
+
+        if( cfg["config"] )
+          $("#config").text("Completed.");
+        else
+          $("#config").text("File is missing.");
+
+        if( cfg["calibration"] )
+          $("#calibration").text("Completed.");
+        else
+          $("#calibration").text("File is missing.");
+
+        if( cfg["test"] )
+          $("#test").text("Completed.");
+        else
+          $("#test").text("File is missing.");
+
+        if( cfg["format"] )
+          $("#format").text("Completed.");
+        else
+          $("#format").text("File is missing.");
+
+        if( cfg["about"] )
+          $("#about").text("Completed.");
+        else
+          $("#about").text("File is missing.");
+
+
+      })
+      .fail(function () {
+        showError('Unable to get data from the device.');
+      })
+      .always(function() {
+        $('#spinner').hide(); 
+      });
+    }
   </script>
 
-  <div class="row mb-3">
-    <div class="col-md-8 themed-grid-col bg-light">The listed files below needs to be uploaded to the FileSystem in order for the GUI to work. 
-      You can also flash the LittleFS filesystem but in that case you will loose your device settings. An OTA upgrade will automatically download 
-      the files if they are found in the same location as the firmware.bin. This page is a fallback option.
-    </div>
-    <div class="col-md-8 themed-grid-col bg-light"><br><strong>Once all the files are confirmed, please reboot the device for normal operation.</strong></div>
-  </div>
+  <!-- START FOOTER -->
 
-  <div class="row mb-3">
-    <div class="col-md-2 themed-grid-col bg-light">index.min.htm</div>
-    <div class="col-md-6 themed-grid-col bg-light" id="index">Checking...</div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-md-2 themed-grid-col bg-light">config.min.htm</div>
-    <div class="col-md-6 themed-grid-col bg-light" id="config">Checking...</div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-md-2 themed-grid-col bg-light">calibration.min.htm</div>
-    <div class="col-md-6 themed-grid-col bg-light" id="calibration">Checking...</div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-md-2 themed-grid-col bg-light">format.min.htm</div>
-    <div class="col-md-6 themed-grid-col bg-light" id="format">Checking...</div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-md-2 themed-grid-col bg-light">test.min.htm</div>
-    <div class="col-md-6 themed-grid-col bg-light" id="test">Checking...</div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-md-2 themed-grid-col bg-light">about.min.htm</div>
-    <div class="col-md-6 themed-grid-col bg-light" id="about">Checking...</div>
-  </div>
-
-  <div class="row mb-3">
-    <form action="/api/upload" method="post" enctype="multipart/form-data">
-      <div class="col-md-8 custom-file">
-        <input type="file" accept=".min.htm" class="custom-file-input" name="name" id="name">
-        <label class="custom-file-label" for="name">Choose file</label>
-      </div>
-      <button type="submit" class="btn btn-primary" id="upload-btn" value="upload">Upload</button>
-    </form>
-  </div>
-
-  <hr class="my-4">
-</div>
-
-<script type="text/javascript">
- window.onload = getUpload;
-
-// Add the following code if you want the name of the file appear on select
-$(".custom-file-input").on("change", function() {
-  var fileName = $(this).val().split("\\").pop();
-  $(this).siblings(".custom-file-label").addClass("selected").html(fileName);
-});
-
-function getUpload() {
-    var url = "/api/upload";
-    //var url = "/test/upload.json";
-    $('#spinner').show(); 
-    $.getJSON(url, function (cfg) {
-      console.log( cfg );
-
-      if( cfg["index"] )
-        $("#index").text("Completed.");
-      else
-        $("#index").text("File is missing.");
-
-      if( cfg["config"] )
-        $("#config").text("Completed.");
-      else
-        $("#config").text("File is missing.");
-
-      if( cfg["calibration"] )
-        $("#calibration").text("Completed.");
-      else
-        $("#calibration").text("File is missing.");
-
-      if( cfg["test"] )
-        $("#test").text("Completed.");
-      else
-        $("#test").text("File is missing.");
-
-      if( cfg["format"] )
-        $("#format").text("Completed.");
-      else
-        $("#format").text("File is missing.");
-
-      if( cfg["about"] )
-        $("#about").text("Completed.");
-      else
-        $("#about").text("File is missing.");
-
-
-    })
-    .fail(function () {
-      showError('Unable to get data from the device.');
-    })
-    .always(function() {
-      $('#spinner').hide(); 
-    });
-  }
-</script>
-
-<!-- START FOOTER -->
-
-<div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div>
+  <div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div>
 </body>
 </html>

lib/ESP_WifiManager/ESP_WiFiManager-Impl.h

@@ -16,7 +16,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
   
-  Version: 1.10.1
+  Version: 1.8.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -56,10 +56,7 @@
   1.7.6   K Hoang      26/11/2021 Auto detect ESP32 core and use either built-in LittleFS or LITTLEFS library
   1.7.7   K Hoang      26/11/2021 Fix compile error for ESP32 core v1.0.5-
   1.7.8   K Hoang      30/11/2021 Fix bug to permit using HTTP port different from 80. Fix bug
-  1.8.0   K Hoang      29/12/2021 Fix `multiple-definitions` linker error and weird bug related to src_cpp
-  1.9.0   K Hoang      17/01/2022 Enable compatibility with old code to include only ESP_WiFiManager.h
-  1.10.0  K Hoang      10/02/2022 Add support to new ESP32-S3
-  1.10.1  K Hoang      11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+
+  1.8.0  K Hoang       29/12/2021 Enable compatibility with old code to include only ESP_WiFiManager.h
  *****************************************************************************************************************************/
 
 #pragma once

lib/ESP_WifiManager/ESP_WiFiManager.h

@@ -16,7 +16,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
   
-  Version: 1.10.1
+  Version: 1.9.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -58,8 +58,6 @@
   1.7.8   K Hoang      30/11/2021 Fix bug to permit using HTTP port different from 80. Fix bug
   1.8.0   K Hoang      29/12/2021 Fix `multiple-definitions` linker error and weird bug related to src_cpp
   1.9.0   K Hoang      17/01/2022 Enable compatibility with old code to include only ESP_WiFiManager.h
-  1.10.0  K Hoang      10/02/2022 Add support to new ESP32-S3
-  1.10.1  K Hoang      11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+
  *****************************************************************************************************************************/
 
 #pragma once

lib/ESP_WifiManager/ESP_WiFiManager.hpp

@@ -16,7 +16,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
   
-  Version: 1.10.1
+  Version: 1.9.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -58,8 +58,6 @@
   1.7.8   K Hoang      30/11/2021 Fix bug to permit using HTTP port different from 80. Fix bug
   1.8.0   K Hoang      29/12/2021 Fix `multiple-definitions` linker error and weird bug related to src_cpp
   1.9.0   K Hoang      17/01/2022 Enable compatibility with old code to include only ESP_WiFiManager.h
-  1.10.0  K Hoang      10/02/2022 Add support to new ESP32-S3
-  1.10.1  K Hoang      11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+
  *****************************************************************************************************************************/
 
 #pragma once
@@ -76,27 +74,18 @@
   #warning You have to select HUGE APP or 1.9-2.0 MB APP to be able to run Config Portal. Must use PSRAM
   #define USING_ESP32_S2        true
 #elif ( ARDUINO_ESP32C3_DEV )
-  #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) )
-    #warning Using ESP32_C3 using core v2.0.0+. Either LittleFS, SPIFFS or EEPROM OK.
-  #else
-    #warning Using ESP32_C3 using core v1.0.6-. To follow library instructions to install esp32-c3 core. Only SPIFFS and EEPROM OK.
-  #endif
-  
+  #warning Using ESP32_C3. To follow library instructions to install esp32-c3 core. Only SPIFFS and EEPROM OK.
   #warning You have to select Flash size 2MB and Minimal APP (1.3MB + 700KB) for some boards
   #define USING_ESP32_C3        true
-#elif ( defined(ARDUINO_ESP32S3_DEV) || defined(ARDUINO_ESP32_S3_BOX) || defined(ARDUINO_TINYS3) || \
-        defined(ARDUINO_PROS3) || defined(ARDUINO_FEATHERS3) )
-  #warning Using ESP32_S3. To install esp32-s3-support branch if using core v2.0.2-.
-  #define USING_ESP32_S3        true   
 #endif
 
-#define ESP_WIFIMANAGER_VERSION           "ESP_WiFiManager v1.10.1"
+#define ESP_WIFIMANAGER_VERSION           "ESP_WiFiManager v1.9.0"
 
 #define ESP_WIFIMANAGER_VERSION_MAJOR     1
-#define ESP_WIFIMANAGER_VERSION_MINOR     10
-#define ESP_WIFIMANAGER_VERSION_PATCH     1
+#define ESP_WIFIMANAGER_VERSION_MINOR     9
+#define ESP_WIFIMANAGER_VERSION_PATCH     0
 
-#define ESP_WIFIMANAGER_VERSION_INT      1010001
+#define ESP_WIFIMANAGER_VERSION_INT      1009000
 
 #include "ESP_WiFiManager_Debug.h"
 
@@ -243,8 +232,7 @@ const char WM_HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)'>{v}</a>
 const char JSON_ITEM[] PROGMEM    = "{\"SSID\":\"{v}\", \"Encryption\":{i}, \"Quality\":\"{r}\"}";
 
 // KH, update from v1.1.0
-//const char WM_HTTP_FORM_START[] PROGMEM = "<form method='get' action='wifisave'><fieldset><div><label>SSID</label><input id='s' name='s' length=32 placeholder='SSID'><div></div></div><div><label>Password</label><input id='p' name='p' length=64 placeholder='password'><div></div></div><div><label>SSID1</label><input id='s1' name='s1' length=32 placeholder='SSID1'><div></div></div><div><label>Password</label><input id='p1' name='p1' length=64 placeholder='password1'><div></div></div></fieldset>";
-extern const char WM_HTTP_FORM_START[] PROGMEM;
+const char WM_HTTP_FORM_START[] PROGMEM = "<form method='get' action='wifisave'><fieldset><div><label>SSID</label><input id='s' name='s' length=32 placeholder='SSID'><div></div></div><div><label>Password</label><input id='p' name='p' length=64 placeholder='password'><div></div></div><div><label>SSID1</label><input id='s1' name='s1' length=32 placeholder='SSID1'><div></div></div><div><label>Password</label><input id='p1' name='p1' length=64 placeholder='password1'><div></div></div></fieldset>";
 //////
 
 // KH, add from v1.0.10

lib/ESP_WifiManager/ESP_WiFiManager_Debug.h

@@ -16,7 +16,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
   
-  Version: 1.10.1
+  Version: 1.9.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -58,8 +58,6 @@
   1.7.8   K Hoang      30/11/2021 Fix bug to permit using HTTP port different from 80. Fix bug
   1.8.0   K Hoang      29/12/2021 Fix `multiple-definitions` linker error and weird bug related to src_cpp
   1.9.0   K Hoang      17/01/2022 Enable compatibility with old code to include only ESP_WiFiManager.h
-  1.10.0  K Hoang      10/02/2022 Add support to new ESP32-S3
-  1.10.1  K Hoang      11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+
  *****************************************************************************************************************************/
 
 #pragma once

lib/ESP_WifiManager/utils/TZ.h

@@ -71,6 +71,8 @@
 
 ////////////////////////////////////////////////////
 
+#if 1
+
 #define TZ_Africa_Abidjan	("GMT0")
 #define TZ_Africa_Accra	("GMT0")
 #define TZ_Africa_Addis_Ababa	("EAT-3")
@@ -532,11 +534,479 @@
 #define TZ_Etc_Universal	("UTC0")
 #define TZ_Etc_Zulu	("UTC0")
 
+
+#else
+
+
+#define TZ_Africa_Abidjan	PSTR("GMT0")
+#define TZ_Africa_Accra	PSTR("GMT0")
+#define TZ_Africa_Addis_Ababa	PSTR("EAT-3")
+#define TZ_Africa_Algiers	PSTR("CET-1")
+#define TZ_Africa_Asmara	PSTR("EAT-3")
+#define TZ_Africa_Bamako	PSTR("GMT0")
+#define TZ_Africa_Bangui	PSTR("WAT-1")
+#define TZ_Africa_Banjul	PSTR("GMT0")
+#define TZ_Africa_Bissau	PSTR("GMT0")
+#define TZ_Africa_Blantyre	PSTR("CAT-2")
+#define TZ_Africa_Brazzaville	PSTR("WAT-1")
+#define TZ_Africa_Bujumbura	PSTR("CAT-2")
+#define TZ_Africa_Cairo	PSTR("EET-2")
+#define TZ_Africa_Casablanca	PSTR("<+01>-1")
+#define TZ_Africa_Ceuta	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Africa_Conakry	PSTR("GMT0")
+#define TZ_Africa_Dakar	PSTR("GMT0")
+#define TZ_Africa_Dar_es_Salaam	PSTR("EAT-3")
+#define TZ_Africa_Djibouti	PSTR("EAT-3")
+#define TZ_Africa_Douala	PSTR("WAT-1")
+#define TZ_Africa_El_Aaiun	PSTR("<+01>-1")
+#define TZ_Africa_Freetown	PSTR("GMT0")
+#define TZ_Africa_Gaborone	PSTR("CAT-2")
+#define TZ_Africa_Harare	PSTR("CAT-2")
+#define TZ_Africa_Johannesburg	PSTR("SAST-2")
+#define TZ_Africa_Juba	PSTR("EAT-3")
+#define TZ_Africa_Kampala	PSTR("EAT-3")
+#define TZ_Africa_Khartoum	PSTR("CAT-2")
+#define TZ_Africa_Kigali	PSTR("CAT-2")
+#define TZ_Africa_Kinshasa	PSTR("WAT-1")
+#define TZ_Africa_Lagos	PSTR("WAT-1")
+#define TZ_Africa_Libreville	PSTR("WAT-1")
+#define TZ_Africa_Lome	PSTR("GMT0")
+#define TZ_Africa_Luanda	PSTR("WAT-1")
+#define TZ_Africa_Lubumbashi	PSTR("CAT-2")
+#define TZ_Africa_Lusaka	PSTR("CAT-2")
+#define TZ_Africa_Malabo	PSTR("WAT-1")
+#define TZ_Africa_Maputo	PSTR("CAT-2")
+#define TZ_Africa_Maseru	PSTR("SAST-2")
+#define TZ_Africa_Mbabane	PSTR("SAST-2")
+#define TZ_Africa_Mogadishu	PSTR("EAT-3")
+#define TZ_Africa_Monrovia	PSTR("GMT0")
+#define TZ_Africa_Nairobi	PSTR("EAT-3")
+#define TZ_Africa_Ndjamena	PSTR("WAT-1")
+#define TZ_Africa_Niamey	PSTR("WAT-1")
+#define TZ_Africa_Nouakchott	PSTR("GMT0")
+#define TZ_Africa_Ouagadougou	PSTR("GMT0")
+#define TZ_Africa_PortomNovo	PSTR("WAT-1")
+#define TZ_Africa_Sao_Tome	PSTR("GMT0")
+#define TZ_Africa_Tripoli	PSTR("EET-2")
+#define TZ_Africa_Tunis	PSTR("CET-1")
+#define TZ_Africa_Windhoek	PSTR("CAT-2")
+#define TZ_America_Adak	PSTR("HST10HDT,M3.2.0,M11.1.0")
+#define TZ_America_Anchorage	PSTR("AKST9AKDT,M3.2.0,M11.1.0")
+#define TZ_America_Anguilla	PSTR("AST4")
+#define TZ_America_Antigua	PSTR("AST4")
+#define TZ_America_Araguaina	PSTR("<-03>3")
+#define TZ_America_Argentina_Buenos_Aires	PSTR("<-03>3")
+#define TZ_America_Argentina_Catamarca	PSTR("<-03>3")
+#define TZ_America_Argentina_Cordoba	PSTR("<-03>3")
+#define TZ_America_Argentina_Jujuy	PSTR("<-03>3")
+#define TZ_America_Argentina_La_Rioja	PSTR("<-03>3")
+#define TZ_America_Argentina_Mendoza	PSTR("<-03>3")
+#define TZ_America_Argentina_Rio_Gallegos	PSTR("<-03>3")
+#define TZ_America_Argentina_Salta	PSTR("<-03>3")
+#define TZ_America_Argentina_San_Juan	PSTR("<-03>3")
+#define TZ_America_Argentina_San_Luis	PSTR("<-03>3")
+#define TZ_America_Argentina_Tucuman	PSTR("<-03>3")
+#define TZ_America_Argentina_Ushuaia	PSTR("<-03>3")
+#define TZ_America_Aruba	PSTR("AST4")
+#define TZ_America_Asuncion	PSTR("<-04>4<-03>,M10.1.0/0,M3.4.0/0")
+#define TZ_America_Atikokan	PSTR("EST5")
+#define TZ_America_Bahia	PSTR("<-03>3")
+#define TZ_America_Bahia_Banderas	PSTR("CST6CDT,M4.1.0,M10.5.0")
+#define TZ_America_Barbados	PSTR("AST4")
+#define TZ_America_Belem	PSTR("<-03>3")
+#define TZ_America_Belize	PSTR("CST6")
+#define TZ_America_BlancmSablon	PSTR("AST4")
+#define TZ_America_Boa_Vista	PSTR("<-04>4")
+#define TZ_America_Bogota	PSTR("<-05>5")
+#define TZ_America_Boise	PSTR("MST7MDT,M3.2.0,M11.1.0")
+#define TZ_America_Cambridge_Bay	PSTR("MST7MDT,M3.2.0,M11.1.0")
+#define TZ_America_Campo_Grande	PSTR("<-04>4")
+#define TZ_America_Cancun	PSTR("EST5")
+#define TZ_America_Caracas	PSTR("<-04>4")
+#define TZ_America_Cayenne	PSTR("<-03>3")
+#define TZ_America_Cayman	PSTR("EST5")
+#define TZ_America_Chicago	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Chihuahua	PSTR("MST7MDT,M4.1.0,M10.5.0")
+#define TZ_America_Costa_Rica	PSTR("CST6")
+#define TZ_America_Creston	PSTR("MST7")
+#define TZ_America_Cuiaba	PSTR("<-04>4")
+#define TZ_America_Curacao	PSTR("AST4")
+#define TZ_America_Danmarkshavn	PSTR("GMT0")
+#define TZ_America_Dawson	PSTR("MST7")
+#define TZ_America_Dawson_Creek	PSTR("MST7")
+#define TZ_America_Denver	PSTR("MST7MDT,M3.2.0,M11.1.0")
+#define TZ_America_Detroit	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Dominica	PSTR("AST4")
+#define TZ_America_Edmonton	PSTR("MST7MDT,M3.2.0,M11.1.0")
+#define TZ_America_Eirunepe	PSTR("<-05>5")
+#define TZ_America_El_Salvador	PSTR("CST6")
+#define TZ_America_Fortaleza	PSTR("<-03>3")
+#define TZ_America_Fort_Nelson	PSTR("MST7")
+#define TZ_America_Glace_Bay	PSTR("AST4ADT,M3.2.0,M11.1.0")
+#define TZ_America_Godthab	PSTR("<-03>3<-02>,M3.5.0/-2,M10.5.0/-1")
+#define TZ_America_Goose_Bay	PSTR("AST4ADT,M3.2.0,M11.1.0")
+#define TZ_America_Grand_Turk	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Grenada	PSTR("AST4")
+#define TZ_America_Guadeloupe	PSTR("AST4")
+#define TZ_America_Guatemala	PSTR("CST6")
+#define TZ_America_Guayaquil	PSTR("<-05>5")
+#define TZ_America_Guyana	PSTR("<-04>4")
+#define TZ_America_Halifax	PSTR("AST4ADT,M3.2.0,M11.1.0")
+#define TZ_America_Havana	PSTR("CST5CDT,M3.2.0/0,M11.1.0/1")
+#define TZ_America_Hermosillo	PSTR("MST7")
+#define TZ_America_Indiana_Indianapolis	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Indiana_Knox	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Indiana_Marengo	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Indiana_Petersburg	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Indiana_Tell_City	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Indiana_Vevay	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Indiana_Vincennes	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Indiana_Winamac	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Inuvik	PSTR("MST7MDT,M3.2.0,M11.1.0")
+#define TZ_America_Iqaluit	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Jamaica	PSTR("EST5")
+#define TZ_America_Juneau	PSTR("AKST9AKDT,M3.2.0,M11.1.0")
+#define TZ_America_Kentucky_Louisville	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Kentucky_Monticello	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Kralendijk	PSTR("AST4")
+#define TZ_America_La_Paz	PSTR("<-04>4")
+#define TZ_America_Lima	PSTR("<-05>5")
+#define TZ_America_Los_Angeles	PSTR("PST8PDT,M3.2.0,M11.1.0")
+#define TZ_America_Lower_Princes	PSTR("AST4")
+#define TZ_America_Maceio	PSTR("<-03>3")
+#define TZ_America_Managua	PSTR("CST6")
+#define TZ_America_Manaus	PSTR("<-04>4")
+#define TZ_America_Marigot	PSTR("AST4")
+#define TZ_America_Martinique	PSTR("AST4")
+#define TZ_America_Matamoros	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Mazatlan	PSTR("MST7MDT,M4.1.0,M10.5.0")
+#define TZ_America_Menominee	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Merida	PSTR("CST6CDT,M4.1.0,M10.5.0")
+#define TZ_America_Metlakatla	PSTR("AKST9AKDT,M3.2.0,M11.1.0")
+#define TZ_America_Mexico_City	PSTR("CST6CDT,M4.1.0,M10.5.0")
+#define TZ_America_Miquelon	PSTR("<-03>3<-02>,M3.2.0,M11.1.0")
+#define TZ_America_Moncton	PSTR("AST4ADT,M3.2.0,M11.1.0")
+#define TZ_America_Monterrey	PSTR("CST6CDT,M4.1.0,M10.5.0")
+#define TZ_America_Montevideo	PSTR("<-03>3")
+#define TZ_America_Montreal	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Montserrat	PSTR("AST4")
+#define TZ_America_Nassau	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_New_York	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Nipigon	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Nome	PSTR("AKST9AKDT,M3.2.0,M11.1.0")
+#define TZ_America_Noronha	PSTR("<-02>2")
+#define TZ_America_North_Dakota_Beulah	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_North_Dakota_Center	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_North_Dakota_New_Salem	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Ojinaga	PSTR("MST7MDT,M3.2.0,M11.1.0")
+#define TZ_America_Panama	PSTR("EST5")
+#define TZ_America_Pangnirtung	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Paramaribo	PSTR("<-03>3")
+#define TZ_America_Phoenix	PSTR("MST7")
+#define TZ_America_PortmaumPrince	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Port_of_Spain	PSTR("AST4")
+#define TZ_America_Porto_Velho	PSTR("<-04>4")
+#define TZ_America_Puerto_Rico	PSTR("AST4")
+#define TZ_America_Punta_Arenas	PSTR("<-03>3")
+#define TZ_America_Rainy_River	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Rankin_Inlet	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Recife	PSTR("<-03>3")
+#define TZ_America_Regina	PSTR("CST6")
+#define TZ_America_Resolute	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Rio_Branco	PSTR("<-05>5")
+#define TZ_America_Santarem	PSTR("<-03>3")
+#define TZ_America_Santiago	PSTR("<-04>4<-03>,M9.1.6/24,M4.1.6/24")
+#define TZ_America_Santo_Domingo	PSTR("AST4")
+#define TZ_America_Sao_Paulo	PSTR("<-03>3")
+#define TZ_America_Scoresbysund	PSTR("<-01>1<+00>,M3.5.0/0,M10.5.0/1")
+#define TZ_America_Sitka	PSTR("AKST9AKDT,M3.2.0,M11.1.0")
+#define TZ_America_St_Barthelemy	PSTR("AST4")
+#define TZ_America_St_Johns	PSTR("NST3:30NDT,M3.2.0,M11.1.0")
+#define TZ_America_St_Kitts	PSTR("AST4")
+#define TZ_America_St_Lucia	PSTR("AST4")
+#define TZ_America_St_Thomas	PSTR("AST4")
+#define TZ_America_St_Vincent	PSTR("AST4")
+#define TZ_America_Swift_Current	PSTR("CST6")
+#define TZ_America_Tegucigalpa	PSTR("CST6")
+#define TZ_America_Thule	PSTR("AST4ADT,M3.2.0,M11.1.0")
+#define TZ_America_Thunder_Bay	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Tijuana	PSTR("PST8PDT,M3.2.0,M11.1.0")
+#define TZ_America_Toronto	PSTR("EST5EDT,M3.2.0,M11.1.0")
+#define TZ_America_Tortola	PSTR("AST4")
+#define TZ_America_Vancouver	PSTR("PST8PDT,M3.2.0,M11.1.0")
+#define TZ_America_Whitehorse	PSTR("MST7")
+#define TZ_America_Winnipeg	PSTR("CST6CDT,M3.2.0,M11.1.0")
+#define TZ_America_Yakutat	PSTR("AKST9AKDT,M3.2.0,M11.1.0")
+#define TZ_America_Yellowknife	PSTR("MST7MDT,M3.2.0,M11.1.0")
+#define TZ_Antarctica_Casey	PSTR("<+11>-11")
+#define TZ_Antarctica_Davis	PSTR("<+07>-7")
+#define TZ_Antarctica_DumontDUrville	PSTR("<+10>-10")
+#define TZ_Antarctica_Macquarie	PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3")
+#define TZ_Antarctica_Mawson	PSTR("<+05>-5")
+#define TZ_Antarctica_McMurdo	PSTR("NZST-12NZDT,M9.5.0,M4.1.0/3")
+#define TZ_Antarctica_Palmer	PSTR("<-03>3")
+#define TZ_Antarctica_Rothera	PSTR("<-03>3")
+#define TZ_Antarctica_Syowa	PSTR("<+03>-3")
+#define TZ_Antarctica_Troll	PSTR("<+00>0<+02>-2,M3.5.0/1,M10.5.0/3")
+#define TZ_Antarctica_Vostok	PSTR("<+06>-6")
+#define TZ_Arctic_Longyearbyen	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Asia_Aden	PSTR("<+03>-3")
+#define TZ_Asia_Almaty	PSTR("<+06>-6")
+#define TZ_Asia_Amman	PSTR("EET-2EEST,M3.5.4/24,M10.5.5/1")
+#define TZ_Asia_Anadyr	PSTR("<+12>-12")
+#define TZ_Asia_Aqtau	PSTR("<+05>-5")
+#define TZ_Asia_Aqtobe	PSTR("<+05>-5")
+#define TZ_Asia_Ashgabat	PSTR("<+05>-5")
+#define TZ_Asia_Atyrau	PSTR("<+05>-5")
+#define TZ_Asia_Baghdad	PSTR("<+03>-3")
+#define TZ_Asia_Bahrain	PSTR("<+03>-3")
+#define TZ_Asia_Baku	PSTR("<+04>-4")
+#define TZ_Asia_Bangkok	PSTR("<+07>-7")
+#define TZ_Asia_Barnaul	PSTR("<+07>-7")
+#define TZ_Asia_Beirut	PSTR("EET-2EEST,M3.5.0/0,M10.5.0/0")
+#define TZ_Asia_Bishkek	PSTR("<+06>-6")
+#define TZ_Asia_Brunei	PSTR("<+08>-8")
+#define TZ_Asia_Chita	PSTR("<+09>-9")
+#define TZ_Asia_Choibalsan	PSTR("<+08>-8")
+#define TZ_Asia_Colombo	PSTR("<+0530>-5:30")
+#define TZ_Asia_Damascus	PSTR("EET-2EEST,M3.5.5/0,M10.5.5/0")
+#define TZ_Asia_Dhaka	PSTR("<+06>-6")
+#define TZ_Asia_Dili	PSTR("<+09>-9")
+#define TZ_Asia_Dubai	PSTR("<+04>-4")
+#define TZ_Asia_Dushanbe	PSTR("<+05>-5")
+#define TZ_Asia_Famagusta	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Asia_Gaza	PSTR("EET-2EEST,M3.4.4/48,M10.4.4/49")
+#define TZ_Asia_Hebron	PSTR("EET-2EEST,M3.4.4/48,M10.4.4/49")
+#define TZ_Asia_Ho_Chi_Minh	PSTR("<+07>-7")
+#define TZ_Asia_Hong_Kong	PSTR("HKT-8")
+#define TZ_Asia_Hovd	PSTR("<+07>-7")
+#define TZ_Asia_Irkutsk	PSTR("<+08>-8")
+#define TZ_Asia_Jakarta	PSTR("WIB-7")
+#define TZ_Asia_Jayapura	PSTR("WIT-9")
+#define TZ_Asia_Jerusalem	PSTR("IST-2IDT,M3.4.4/26,M10.5.0")
+#define TZ_Asia_Kabul	PSTR("<+0430>-4:30")
+#define TZ_Asia_Kamchatka	PSTR("<+12>-12")
+#define TZ_Asia_Karachi	PSTR("PKT-5")
+#define TZ_Asia_Kathmandu	PSTR("<+0545>-5:45")
+#define TZ_Asia_Khandyga	PSTR("<+09>-9")
+#define TZ_Asia_Kolkata	PSTR("IST-5:30")
+#define TZ_Asia_Krasnoyarsk	PSTR("<+07>-7")
+#define TZ_Asia_Kuala_Lumpur	PSTR("<+08>-8")
+#define TZ_Asia_Kuching	PSTR("<+08>-8")
+#define TZ_Asia_Kuwait	PSTR("<+03>-3")
+#define TZ_Asia_Macau	PSTR("CST-8")
+#define TZ_Asia_Magadan	PSTR("<+11>-11")
+#define TZ_Asia_Makassar	PSTR("WITA-8")
+#define TZ_Asia_Manila	PSTR("PST-8")
+#define TZ_Asia_Muscat	PSTR("<+04>-4")
+#define TZ_Asia_Nicosia	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Asia_Novokuznetsk	PSTR("<+07>-7")
+#define TZ_Asia_Novosibirsk	PSTR("<+07>-7")
+#define TZ_Asia_Omsk	PSTR("<+06>-6")
+#define TZ_Asia_Oral	PSTR("<+05>-5")
+#define TZ_Asia_Phnom_Penh	PSTR("<+07>-7")
+#define TZ_Asia_Pontianak	PSTR("WIB-7")
+#define TZ_Asia_Pyongyang	PSTR("KST-9")
+#define TZ_Asia_Qatar	PSTR("<+03>-3")
+#define TZ_Asia_Qyzylorda	PSTR("<+05>-5")
+#define TZ_Asia_Riyadh	PSTR("<+03>-3")
+#define TZ_Asia_Sakhalin	PSTR("<+11>-11")
+#define TZ_Asia_Samarkand	PSTR("<+05>-5")
+#define TZ_Asia_Seoul	PSTR("KST-9")
+#define TZ_Asia_Shanghai	PSTR("CST-8")
+#define TZ_Asia_Singapore	PSTR("<+08>-8")
+#define TZ_Asia_Srednekolymsk	PSTR("<+11>-11")
+#define TZ_Asia_Taipei	PSTR("CST-8")
+#define TZ_Asia_Tashkent	PSTR("<+05>-5")
+#define TZ_Asia_Tbilisi	PSTR("<+04>-4")
+#define TZ_Asia_Tehran	PSTR("<+0330>-3:30<+0430>,J79/24,J263/24")
+#define TZ_Asia_Thimphu	PSTR("<+06>-6")
+#define TZ_Asia_Tokyo	PSTR("JST-9")
+#define TZ_Asia_Tomsk	PSTR("<+07>-7")
+#define TZ_Asia_Ulaanbaatar	PSTR("<+08>-8")
+#define TZ_Asia_Urumqi	PSTR("<+06>-6")
+#define TZ_Asia_UstmNera	PSTR("<+10>-10")
+#define TZ_Asia_Vientiane	PSTR("<+07>-7")
+#define TZ_Asia_Vladivostok	PSTR("<+10>-10")
+#define TZ_Asia_Yakutsk	PSTR("<+09>-9")
+#define TZ_Asia_Yangon	PSTR("<+0630>-6:30")
+#define TZ_Asia_Yekaterinburg	PSTR("<+05>-5")
+#define TZ_Asia_Yerevan	PSTR("<+04>-4")
+#define TZ_Atlantic_Azores	PSTR("<-01>1<+00>,M3.5.0/0,M10.5.0/1")
+#define TZ_Atlantic_Bermuda	PSTR("AST4ADT,M3.2.0,M11.1.0")
+#define TZ_Atlantic_Canary	PSTR("WET0WEST,M3.5.0/1,M10.5.0")
+#define TZ_Atlantic_Cape_Verde	PSTR("<-01>1")
+#define TZ_Atlantic_Faroe	PSTR("WET0WEST,M3.5.0/1,M10.5.0")
+#define TZ_Atlantic_Madeira	PSTR("WET0WEST,M3.5.0/1,M10.5.0")
+#define TZ_Atlantic_Reykjavik	PSTR("GMT0")
+#define TZ_Atlantic_South_Georgia	PSTR("<-02>2")
+#define TZ_Atlantic_Stanley	PSTR("<-03>3")
+#define TZ_Atlantic_St_Helena	PSTR("GMT0")
+#define TZ_Australia_Adelaide	PSTR("ACST-9:30ACDT,M10.1.0,M4.1.0/3")
+#define TZ_Australia_Brisbane	PSTR("AEST-10")
+#define TZ_Australia_Broken_Hill	PSTR("ACST-9:30ACDT,M10.1.0,M4.1.0/3")
+#define TZ_Australia_Currie	PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3")
+#define TZ_Australia_Darwin	PSTR("ACST-9:30")
+#define TZ_Australia_Eucla	PSTR("<+0845>-8:45")
+#define TZ_Australia_Hobart	PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3")
+#define TZ_Australia_Lindeman	PSTR("AEST-10")
+#define TZ_Australia_Lord_Howe	PSTR("<+1030>-10:30<+11>-11,M10.1.0,M4.1.0")
+#define TZ_Australia_Melbourne	PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3")
+#define TZ_Australia_Perth	PSTR("AWST-8")
+#define TZ_Australia_Sydney	PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3")
+#define TZ_Europe_Amsterdam	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Andorra	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Astrakhan	PSTR("<+04>-4")
+#define TZ_Europe_Athens	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Belgrade	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Berlin	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Bratislava	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Brussels	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Bucharest	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Budapest	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Busingen	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Chisinau	PSTR("EET-2EEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Copenhagen	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Dublin	PSTR("IST-1GMT0,M10.5.0,M3.5.0/1")
+#define TZ_Europe_Gibraltar	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Guernsey	PSTR("GMT0BST,M3.5.0/1,M10.5.0")
+#define TZ_Europe_Helsinki	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Isle_of_Man	PSTR("GMT0BST,M3.5.0/1,M10.5.0")
+#define TZ_Europe_Istanbul	PSTR("<+03>-3")
+#define TZ_Europe_Jersey	PSTR("GMT0BST,M3.5.0/1,M10.5.0")
+#define TZ_Europe_Kaliningrad	PSTR("EET-2")
+#define TZ_Europe_Kiev	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Kirov	PSTR("<+03>-3")
+#define TZ_Europe_Lisbon	PSTR("WET0WEST,M3.5.0/1,M10.5.0")
+#define TZ_Europe_Ljubljana	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_London	PSTR("GMT0BST,M3.5.0/1,M10.5.0")
+#define TZ_Europe_Luxembourg	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Madrid	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Malta	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Mariehamn	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Minsk	PSTR("<+03>-3")
+#define TZ_Europe_Monaco	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Moscow	PSTR("MSK-3")
+#define TZ_Europe_Oslo	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Paris	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Podgorica	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Prague	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Riga	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Rome	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Samara	PSTR("<+04>-4")
+#define TZ_Europe_San_Marino	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Sarajevo	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Saratov	PSTR("<+04>-4")
+#define TZ_Europe_Simferopol	PSTR("MSK-3")
+#define TZ_Europe_Skopje	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Sofia	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Stockholm	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Tallinn	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Tirane	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Ulyanovsk	PSTR("<+04>-4")
+#define TZ_Europe_Uzhgorod	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Vaduz	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Vatican	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Vienna	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Vilnius	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Volgograd	PSTR("<+04>-4")
+#define TZ_Europe_Warsaw	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Zagreb	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Europe_Zaporozhye	PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
+#define TZ_Europe_Zurich	PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+#define TZ_Indian_Antananarivo	PSTR("EAT-3")
+#define TZ_Indian_Chagos	PSTR("<+06>-6")
+#define TZ_Indian_Christmas	PSTR("<+07>-7")
+#define TZ_Indian_Cocos	PSTR("<+0630>-6:30")
+#define TZ_Indian_Comoro	PSTR("EAT-3")
+#define TZ_Indian_Kerguelen	PSTR("<+05>-5")
+#define TZ_Indian_Mahe	PSTR("<+04>-4")
+#define TZ_Indian_Maldives	PSTR("<+05>-5")
+#define TZ_Indian_Mauritius	PSTR("<+04>-4")
+#define TZ_Indian_Mayotte	PSTR("EAT-3")
+#define TZ_Indian_Reunion	PSTR("<+04>-4")
+#define TZ_Pacific_Apia	PSTR("<+13>-13<+14>,M9.5.0/3,M4.1.0/4")
+#define TZ_Pacific_Auckland	PSTR("NZST-12NZDT,M9.5.0,M4.1.0/3")
+#define TZ_Pacific_Bougainville	PSTR("<+11>-11")
+#define TZ_Pacific_Chatham	PSTR("<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45")
+#define TZ_Pacific_Chuuk	PSTR("<+10>-10")
+#define TZ_Pacific_Easter	PSTR("<-06>6<-05>,M9.1.6/22,M4.1.6/22")
+#define TZ_Pacific_Efate	PSTR("<+11>-11")
+#define TZ_Pacific_Enderbury	PSTR("<+13>-13")
+#define TZ_Pacific_Fakaofo	PSTR("<+13>-13")
+#define TZ_Pacific_Fiji	PSTR("<+12>-12<+13>,M11.2.0,M1.2.3/99")
+#define TZ_Pacific_Funafuti	PSTR("<+12>-12")
+#define TZ_Pacific_Galapagos	PSTR("<-06>6")
+#define TZ_Pacific_Gambier	PSTR("<-09>9")
+#define TZ_Pacific_Guadalcanal	PSTR("<+11>-11")
+#define TZ_Pacific_Guam	PSTR("ChST-10")
+#define TZ_Pacific_Honolulu	PSTR("HST10")
+#define TZ_Pacific_Kiritimati	PSTR("<+14>-14")
+#define TZ_Pacific_Kosrae	PSTR("<+11>-11")
+#define TZ_Pacific_Kwajalein	PSTR("<+12>-12")
+#define TZ_Pacific_Majuro	PSTR("<+12>-12")
+#define TZ_Pacific_Marquesas	PSTR("<-0930>9:30")
+#define TZ_Pacific_Midway	PSTR("SST11")
+#define TZ_Pacific_Nauru	PSTR("<+12>-12")
+#define TZ_Pacific_Niue	PSTR("<-11>11")
+#define TZ_Pacific_Norfolk	PSTR("<+11>-11<+12>,M10.1.0,M4.1.0/3")
+#define TZ_Pacific_Noumea	PSTR("<+11>-11")
+#define TZ_Pacific_Pago_Pago	PSTR("SST11")
+#define TZ_Pacific_Palau	PSTR("<+09>-9")
+#define TZ_Pacific_Pitcairn	PSTR("<-08>8")
+#define TZ_Pacific_Pohnpei	PSTR("<+11>-11")
+#define TZ_Pacific_Port_Moresby	PSTR("<+10>-10")
+#define TZ_Pacific_Rarotonga	PSTR("<-10>10")
+#define TZ_Pacific_Saipan	PSTR("ChST-10")
+#define TZ_Pacific_Tahiti	PSTR("<-10>10")
+#define TZ_Pacific_Tarawa	PSTR("<+12>-12")
+#define TZ_Pacific_Tongatapu	PSTR("<+13>-13")
+#define TZ_Pacific_Wake	PSTR("<+12>-12")
+#define TZ_Pacific_Wallis	PSTR("<+12>-12")
+#define TZ_Etc_GMT	PSTR("GMT0")
+#define TZ_Etc_GMTm0	PSTR("GMT0")
+#define TZ_Etc_GMTm1	PSTR("<+01>-1")
+#define TZ_Etc_GMTm2	PSTR("<+02>-2")
+#define TZ_Etc_GMTm3	PSTR("<+03>-3")
+#define TZ_Etc_GMTm4	PSTR("<+04>-4")
+#define TZ_Etc_GMTm5	PSTR("<+05>-5")
+#define TZ_Etc_GMTm6	PSTR("<+06>-6")
+#define TZ_Etc_GMTm7	PSTR("<+07>-7")
+#define TZ_Etc_GMTm8	PSTR("<+08>-8")
+#define TZ_Etc_GMTm9	PSTR("<+09>-9")
+#define TZ_Etc_GMTm10	PSTR("<+10>-10")
+#define TZ_Etc_GMTm11	PSTR("<+11>-11")
+#define TZ_Etc_GMTm12	PSTR("<+12>-12")
+#define TZ_Etc_GMTm13	PSTR("<+13>-13")
+#define TZ_Etc_GMTm14	PSTR("<+14>-14")
+#define TZ_Etc_GMT0	PSTR("GMT0")
+#define TZ_Etc_GMTp0	PSTR("GMT0")
+#define TZ_Etc_GMTp1	PSTR("<-01>1")
+#define TZ_Etc_GMTp2	PSTR("<-02>2")
+#define TZ_Etc_GMTp3	PSTR("<-03>3")
+#define TZ_Etc_GMTp4	PSTR("<-04>4")
+#define TZ_Etc_GMTp5	PSTR("<-05>5")
+#define TZ_Etc_GMTp6	PSTR("<-06>6")
+#define TZ_Etc_GMTp7	PSTR("<-07>7")
+#define TZ_Etc_GMTp8	PSTR("<-08>8")
+#define TZ_Etc_GMTp9	PSTR("<-09>9")
+#define TZ_Etc_GMTp10	PSTR("<-10>10")
+#define TZ_Etc_GMTp11	PSTR("<-11>11")
+#define TZ_Etc_GMTp12	PSTR("<-12>12")
+#define TZ_Etc_UCT	PSTR("UTC0")
+#define TZ_Etc_UTC	PSTR("UTC0")
+#define TZ_Etc_Greenwich	PSTR("GMT0")
+#define TZ_Etc_Universal	PSTR("UTC0")
+#define TZ_Etc_Zulu	PSTR("UTC0")
+#endif
+
 ////////////////////////////////////////////////////////////
 
 #define TIMEZONE_MAX_LEN      50
 
-static const char TZ_NAME[][TIMEZONE_MAX_LEN] /*PROGMEM*/ =
+#if 1
+
+const char TZ_NAME[][TIMEZONE_MAX_LEN] /*PROGMEM*/ =
 {
 #if USING_AFRICA
   "Africa/Abidjan",             //PSTR("GMT0")
@@ -1033,7 +1503,7 @@ static const char TZ_NAME[][TIMEZONE_MAX_LEN] /*PROGMEM*/ =
 
 ////////////////////////////////////////////////////////////
 
-static const char ESP_TZ_NAME[][TIMEZONE_MAX_LEN] /*PROGMEM*/ =
+const char ESP_TZ_NAME[][TIMEZONE_MAX_LEN] /*PROGMEM*/ =
 {
 #if USING_AFRICA
   TZ_Africa_Abidjan,  //PSTR("GMT0")
@@ -1529,4 +1999,152 @@ static const char ESP_TZ_NAME[][TIMEZONE_MAX_LEN] /*PROGMEM*/ =
 #endif  
 };
 
+
+
+#else
+const char TZ_NAME[][TIMEZONE_MAX_LEN] =
+{
+  "Pacific/Pago_Pago",
+  "America/Adak",
+  "Pacific/Honolulu",
+  "Pacific/Marquesas",
+  "Pacific/Gambier",
+  "America/Anchorage",
+  "America/Los_Angeles",
+  "Pacific/Pitcairn",
+  "America/Phoenix",
+  "America/Denver",
+  "America/Guatemala",
+  "America/Chicago",
+  "Pacific/Easter",
+  "America/Bogota",
+  "America/New_York",
+  "America/Caracas",
+  "America/Halifax",
+  "America/Santo_Domingo",
+  "America/Santiago",
+  "America/St_Johns",
+  "America/Godthab",
+  "America/Argentina/Buenos_Aires",
+  "America/Montevideo",
+  "Etc/GMT+2",
+  "Atlantic/Azores",
+  "Atlantic/Cape_Verde",
+  "Etc/UTC",
+  "Europe/London",
+  "Europe/Berlin",
+  "Africa/Lagos",
+  "Africa/Windhoek",
+  "Asia/Beirut",
+  "Africa/Johannesburg",
+  "Asia/Baghdad",
+  "Europe/Moscow",
+  "Asia/Tehran",
+  "Asia/Dubai",
+  "Asia/Baku",
+  "Asia/Kabul",
+  "Asia/Yekaterinburg",
+  "Asia/Karachi",
+  "Asia/Kolkata",
+  "Asia/Kathmandu",
+  "Asia/Dhaka",
+  "Asia/Omsk",
+  "Asia/Krasnoyarsk",
+  "Asia/Jakarta",
+  "Asia/Shanghai",
+  "Asia/Irkutsk",
+  "Australia/Eucla",
+  "Asia/Yakutsk",
+  "Asia/Tokyo",
+  "Australia/Darwin",
+  "Australia/Adelaide",
+  "Australia/Brisbane",
+  "Asia/Vladivostok",
+  "Australia/Sydney",
+  "Australia/Lord_Howe",
+  "Asia/Kamchatka",
+  "Pacific/Noumea",
+  "Pacific/Norfolk",
+  "Pacific/Auckland",
+  "Pacific/Tarawa",
+  "Pacific/Chatham",
+  "Pacific/Tongatapu",
+  "Pacific/Apia",
+  "Pacific/Kiritimati",
+};
+
+////////////////////////////////////////////////////////////
+
+const char ESP_TZ_NAME[][TIMEZONE_MAX_LEN] =
+{
+  TZ_Pacific_Pago_Pago,                   //PSTR("SST11")
+  TZ_America_Adak,                        //PSTR("HST10HDT,M3.2.0,M11.1.0")
+  TZ_Pacific_Honolulu,                    //PSTR("HST10")
+  TZ_Pacific_Marquesas,                   //PSTR("<-0930>9:30")
+  TZ_Pacific_Gambier,                     //PSTR("<-09>9")
+  TZ_America_Anchorage,                   //PSTR("AKST9AKDT,M3.2.0,M11.1.0")
+  TZ_America_Los_Angeles,                 //"PST8PDT,M3.2.0,M11.1.0",               //"America/Los_Angeles",
+  TZ_Pacific_Pitcairn,                    //PSTR("<-08>8")
+  TZ_America_Phoenix,                     //PSTR("MST7")
+  TZ_America_Denver,                      //"MST7MDT,M3.2.0,M11.1.0",               //"America/Denver",
+  TZ_America_Guatemala,                   //PSTR("CST6")
+  TZ_America_Chicago,                     //"CST6CDT,M3.2.0,M11.1.0",               //"America/Chicago",
+  TZ_Pacific_Easter,                      //PSTR("<-06>6<-05>,M9.1.6/22,M4.1.6/22")
+  TZ_America_Bogota,                      //PSTR("<-05>5")
+  TZ_America_New_York,                    //"EST5EDT,M3.2.0,M11.1.0",               //"America/New_York",
+  TZ_America_Caracas,                     //PSTR("<-04>4")
+  TZ_America_Halifax,                     //"AST4ADT,M3.2.0,M11.1.0",               //"America/Halifax",
+  TZ_America_Santo_Domingo,               //PSTR("AST4")
+  TZ_America_Santiago,                    //"<-04>4<-03>,M9.1.6/24,M4.1.6/24",      //"America/Santiago",
+  TZ_America_St_Johns,                    //PSTR("NST3:30NDT,M3.2.0,M11.1.0")
+  TZ_America_Godthab,                     //"<-03>3<-02>,M3.5.0/-2,M10.5.0/-1",     //"America/Godthab",
+  TZ_America_Argentina_Buenos_Aires,      //PSTR("<-03>3")
+  TZ_America_Montevideo,                  //"<-03>3",                               //"America/Montevideo",
+  TZ_Etc_GMTp2,                           //PSTR("<-02>2")
+  TZ_Atlantic_Azores,                     //PSTR("<-01>1<+00>,M3.5.0/0,M10.5.0/1")
+  TZ_Atlantic_Cape_Verde,                 //PSTR("<-01>1")
+  TZ_Etc_UTC,                             //PSTR("UTC0")
+  TZ_Europe_London,                       //PSTR("GMT0BST,M3.5.0/1,M10.5.0")
+  TZ_Europe_Berlin,                       //PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
+  TZ_Africa_Lagos,                        //PSTR("WAT-1")
+  TZ_Africa_Windhoek,                     //PSTR("CAT-2")
+  TZ_Asia_Beirut,                         //"EET-2EEST,M3.5.0/0,M10.5.0/0"          //"Asia/Beirut",
+  TZ_Africa_Johannesburg,                 //"SAST-2",                               //"Africa/Johannesburg",
+  TZ_Asia_Baghdad,                        //"<+03>-3",                              //"Asia/Baghdad",
+  TZ_Europe_Moscow,                       //PSTR("MSK-3")
+  TZ_Asia_Tehran,                         //PSTR("<+0330>-3:30<+0430>,J79/24,J263/24")
+  TZ_Asia_Dubai,                          //"<+04>-4",                              //"Asia/Dubai",
+  TZ_Asia_Baku,                           //PSTR("<+04>-4")
+  TZ_Asia_Kabul,                          //PSTR("<+0430>-4:30")
+  TZ_Asia_Yekaterinburg,                  //PSTR("<+05>-5")
+  TZ_Asia_Karachi,                        //PSTR("PKT-5")
+  TZ_Asia_Kolkata,                        //PSTR("IST-5:30")
+  TZ_Asia_Kathmandu,                      //PSTR("<+0545>-5:45")
+  TZ_Asia_Dhaka,                          //"<+06>-6",                              //"Asia/Dhaka",
+  TZ_Asia_Omsk,                           //PSTR("<+06>-6")
+  TZ_Asia_Krasnoyarsk,                    //PSTR("<+07>-7")
+  TZ_Asia_Jakarta,                        //"WIB-7",                                //"Asia/Jakarta",
+  TZ_Asia_Shanghai,                       //"CST-8",                                //"Asia/Shanghai",
+  TZ_Asia_Irkutsk,                        //PSTR("<+08>-8")
+  TZ_Australia_Eucla,                     //PSTR("<+0845>-8:45")
+  TZ_Asia_Yakutsk,                        //PSTR("<+09>-9")
+  TZ_Asia_Tokyo,                          //"JST-9",                                //"Asia/Tokyo",
+  TZ_Australia_Darwin,                    //PSTR("ACST-9:30")
+  TZ_Australia_Adelaide,                  //PSTR("ACST-9:30ACDT,M10.1.0,M4.1.0/3")
+  TZ_Australia_Brisbane,                  //"AEST-10",                              //"Australia/Brisbane",
+  TZ_Asia_Vladivostok,                    //PSTR("<+10>-10")
+  TZ_Australia_Sydney,                    //PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3")
+  TZ_Australia_Lord_Howe,                 //PSTR("<+1030>-10:30<+11>-11,M10.1.0,M4.1.0")
+  TZ_Asia_Kamchatka,                      //PSTR("<+12>-12")
+  TZ_Pacific_Noumea,                      //"<+11>-11",                             //"Pacific/Noumea",
+  TZ_Pacific_Norfolk,                     //PSTR("<+11>-11<+12>,M10.1.0,M4.1.0/3")
+  TZ_Pacific_Auckland,                    //"NZST-12NZDT,M9.5.0,M4.1.0/3",          //"Pacific/Auckland",
+  TZ_Pacific_Tarawa,                      //"<+12>-12",                             //"Pacific/Tarawa",
+  TZ_Pacific_Chatham,                     //PSTR("<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45")
+  TZ_Pacific_Tongatapu,                   //PSTR("<+13>-13")
+  TZ_Pacific_Apia,                        //PSTR("<+13>-13<+14>,M9.5.0/3,M4.1.0/4")
+  TZ_Pacific_Kiritimati,                  //PSTR("<+14>-14")
+};
+#endif
+
 #endif // TZDB_H

lib/OneWire/OneWire.cpp

@@ -195,11 +195,7 @@ uint8_t OneWire::reset(void)
 // Write a bit. Port and bit is used to cut lookup time and provide
 // more certain timing.
 //
-#if defined(ARDUINO_ARCH_ESP32)
-void IRAM_ATTR OneWire::write_bit(uint8_t v)
-#else
 void OneWire::write_bit(uint8_t v)
-#endif
 {
 	IO_REG_TYPE mask IO_REG_MASK_ATTR = bitmask;
 	volatile IO_REG_TYPE *reg IO_REG_BASE_ATTR = baseReg;
@@ -227,11 +223,7 @@ void OneWire::write_bit(uint8_t v)
 // Read a bit. Port and bit is used to cut lookup time and provide
 // more certain timing.
 //
-#if defined(ARDUINO_ARCH_ESP32)
-uint8_t IRAM_ATTR OneWire::read_bit(void)
-#else
 uint8_t OneWire::read_bit(void)
-#endif
 {
 	IO_REG_TYPE mask IO_REG_MASK_ATTR = bitmask;
 	volatile IO_REG_TYPE *reg IO_REG_BASE_ATTR = baseReg;
@@ -585,4 +577,4 @@ uint16_t OneWire::crc16(const uint8_t* input, uint16_t len, uint16_t crc)
 }
 #endif
 
-#endif
+#endif

lib/OneWire/OneWire.h

@@ -99,18 +99,10 @@ class OneWire
 
     // Write a bit. The bus is always left powered at the end, see
     // note in write() about that.
-    #if defined (ARDUINO_ARCH_ESP32)
-    void IRAM_ATTR write_bit(uint8_t v);
-    #else
     void write_bit(uint8_t v);
-    #endif
 
     // Read a bit.
-    #if defined (ARDUINO_ARCH_ESP32)
-    uint8_t IRAM_ATTR read_bit(void);
-    #else
     uint8_t read_bit(void);
-    #endif
 
     // Stop forcing power onto the bus. You only need to do this if
     // you used the 'power' flag to write() or used a write_bit() call
@@ -187,4 +179,4 @@ class OneWire
 #endif
 
 #endif // __cplusplus
-#endif // OneWire_h
+#endif // OneWire_h

lib/OneWire/util/OneWire_direct_gpio.h

@@ -127,10 +127,14 @@
 static inline __attribute__((always_inline))
 IO_REG_TYPE directRead(IO_REG_TYPE pin)
 {
+#if CONFIG_IDF_TARGET_ESP32C3
+    return (GPIO.in.val >> pin) & 0x1;
+#else // plain ESP32
     if ( pin < 32 )
         return (GPIO.in >> pin) & 0x1;
-    else if ( pin < 40 )
+    else if ( pin < 46 )
         return (GPIO.in1.val >> (pin - 32)) & 0x1;
+#endif
 
     return 0;
 }
@@ -138,38 +142,38 @@ IO_REG_TYPE directRead(IO_REG_TYPE pin)
 static inline __attribute__((always_inline))
 void directWriteLow(IO_REG_TYPE pin)
 {
+#if CONFIG_IDF_TARGET_ESP32C3
+    GPIO.out_w1tc.val = ((uint32_t)1 << pin);
+#else // plain ESP32
     if ( pin < 32 )
         GPIO.out_w1tc = ((uint32_t)1 << pin);
-    else if ( pin < 34 )
+    else if ( pin < 46 )
         GPIO.out1_w1tc.val = ((uint32_t)1 << (pin - 32));
+#endif
 }
 
 static inline __attribute__((always_inline))
 void directWriteHigh(IO_REG_TYPE pin)
 {
+#if CONFIG_IDF_TARGET_ESP32C3
+    GPIO.out_w1ts.val = ((uint32_t)1 << pin);
+#else // plain ESP32
     if ( pin < 32 )
         GPIO.out_w1ts = ((uint32_t)1 << pin);
-    else if ( pin < 34 )
+    else if ( pin < 46 )
         GPIO.out1_w1ts.val = ((uint32_t)1 << (pin - 32));
+#endif
 }
 
 static inline __attribute__((always_inline))
 void directModeInput(IO_REG_TYPE pin)
 {
+#if CONFIG_IDF_TARGET_ESP32C3
+    GPIO.enable_w1tc.val = ((uint32_t)1 << (pin));
+#else
     if ( digitalPinIsValid(pin) )
     {
-        #if defined(ESP_ARDUINO_VERSION)
-        #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0)
-        int pin_io = rtc_io_number_get((gpio_num_t)pin);
-        uint32_t rtc_reg(rtc_io_desc[pin_io].reg);
-
-        if ( rtc_reg ) // RTC pins PULL settings
-        {
-            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin_io].mux);
-            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin_io].pullup | rtc_io_desc[pin_io].pulldown);
-        }
-        #endif
-        #else
+#if ESP_IDF_VERSION_MAJOR < 4      // IDF 3.x ESP32/PICO-D4
         uint32_t rtc_reg(rtc_gpio_desc[pin].reg);
 
         if ( rtc_reg ) // RTC pins PULL settings
@@ -177,40 +181,25 @@ void directModeInput(IO_REG_TYPE pin)
             ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].mux);
             ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].pullup | rtc_gpio_desc[pin].pulldown);
         }
-        #endif
-
+#endif
+	// Input
         if ( pin < 32 )
             GPIO.enable_w1tc = ((uint32_t)1 << pin);
         else
             GPIO.enable1_w1tc.val = ((uint32_t)1 << (pin - 32));
-
-        uint32_t pinFunction((uint32_t)2 << FUN_DRV_S); // what are the drivers?
-        pinFunction |= FUN_IE; // input enable but required for output as well?
-        pinFunction |= ((uint32_t)2 << MCU_SEL_S);
-
-        ESP_REG(DR_REG_IO_MUX_BASE + esp32_gpioMux[pin].reg) = pinFunction;
-
-        GPIO.pin[pin].val = 0;
     }
+#endif
 }
 
 static inline __attribute__((always_inline))
 void directModeOutput(IO_REG_TYPE pin)
 {
+#if CONFIG_IDF_TARGET_ESP32C3
+    GPIO.enable_w1ts.val = ((uint32_t)1 << (pin));
+#else
     if ( digitalPinIsValid(pin) && pin <= 33 ) // pins above 33 can be only inputs
     {
-        #if defined(ESP_ARDUINO_VERSION)
-        #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0)
-        int pin_io = rtc_io_number_get((gpio_num_t)pin);
-        uint32_t rtc_reg(rtc_io_desc[pin_io].reg);
-
-        if ( rtc_reg ) // RTC pins PULL settings
-        {
-            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin_io].mux);
-            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin_io].pullup | rtc_io_desc[pin_io].pulldown);
-        }
-        #endif
-        #else
+#if ESP_IDF_VERSION_MAJOR < 4      // IDF 3.x ESP32/PICO-D4
         uint32_t rtc_reg(rtc_gpio_desc[pin].reg);
 
         if ( rtc_reg ) // RTC pins PULL settings
@@ -218,21 +207,14 @@ void directModeOutput(IO_REG_TYPE pin)
             ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].mux);
             ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].pullup | rtc_gpio_desc[pin].pulldown);
         }
-        #endif
-
+#endif
+        // Output
         if ( pin < 32 )
             GPIO.enable_w1ts = ((uint32_t)1 << pin);
         else // already validated to pins <= 33
             GPIO.enable1_w1ts.val = ((uint32_t)1 << (pin - 32));
-
-        uint32_t pinFunction((uint32_t)2 << FUN_DRV_S); // what are the drivers?
-        pinFunction |= FUN_IE; // input enable but required for output as well?
-        pinFunction |= ((uint32_t)2 << MCU_SEL_S);
-
-        ESP_REG(DR_REG_IO_MUX_BASE + esp32_gpioMux[pin].reg) = pinFunction;
-
-        GPIO.pin[pin].val = 0;
     }
+#endif
 }
 
 #define DIRECT_READ(base, pin)          directRead(pin)
@@ -445,6 +427,20 @@ void directWriteHigh(IO_REG_TYPE mask)
 #define DIRECT_MODE_INPUT(base, mask)    directModeInput(mask)
 #define DIRECT_MODE_OUTPUT(base, mask)   directModeOutput(mask)
 
+#elif defined(ARDUINO_ARCH_MBED_RP2040)|| defined(ARDUINO_ARCH_RP2040)
+#define delayMicroseconds(time)         busy_wait_us(time)
+#define PIN_TO_BASEREG(pin)             (0)
+#define PIN_TO_BITMASK(pin)             (pin)
+#define IO_REG_TYPE unsigned int
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, pin)          digitalRead(pin)
+#define DIRECT_WRITE_LOW(base, pin)     digitalWrite(pin, LOW)
+#define DIRECT_WRITE_HIGH(base, pin)    digitalWrite(pin, HIGH)
+#define DIRECT_MODE_INPUT(base, pin)    pinMode(pin,INPUT)
+#define DIRECT_MODE_OUTPUT(base, pin)   pinMode(pin,OUTPUT)
+#warning "OneWire. RP2040 in Fallback mode. Using API calls for pinMode,digitalRead and digitalWrite."
+
 #else
 #define PIN_TO_BASEREG(pin)             (0)
 #define PIN_TO_BITMASK(pin)             (pin)
@@ -460,4 +456,4 @@ void directWriteHigh(IO_REG_TYPE mask)
 
 #endif
 
-#endif
+#endif

lib/mpu6050/I2Cdev.cpp

@@ -282,7 +282,8 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
                 useWire->beginTransmission(devAddr);
                 useWire->write(regAddr);
                 useWire->endTransmission();
-                useWire->beginTransmission(devAddr);
+                // See: https://github.com/espressif/arduino-esp32/issues/6674
+                // useWire->beginTransmission(devAddr);
                 useWire->requestFrom((uint8_t)devAddr, (uint8_t)min((int)length - k, I2CDEVLIB_WIRE_BUFFER_LENGTH));
         
                 for (; useWire->available() && (timeout == 0 || millis() - t1 < timeout); count++) {
@@ -1485,4 +1486,4 @@ uint16_t I2Cdev::readTimeout = I2CDEV_DEFAULT_READ_TIMEOUT;
         return rxBufferLength - rxBufferIndex;
     }
 
-#endif
+#endif

lib/mpu6050/I2Cdev.h

@@ -308,4 +308,4 @@ class I2Cdev {
 
 #endif // I2CDEV_IMPLEMENTATION == I2CDEV_BUILTIN_NBWIRE
 
-#endif /* _I2CDEV_H_ */
+#endif /* _I2CDEV_H_ */

lib/mpu6050/MPU6050.cpp

@@ -2556,8 +2556,8 @@ void MPU6050_Base::setClockSource(uint8_t source) {
  * -------------+------------------
  * 0            | 1.25 Hz
  * 1            | 2.5 Hz
- * 2            | 5 Hz
- * 3            | 10 Hz
+ * 2            | 20 Hz
+ * 3            | 40 Hz
  * </pre>
  *
  * For further information regarding the MPU-60X0's power modes, please refer to
@@ -3371,25 +3371,27 @@ void MPU6050_Base::PID(uint8_t ReadAddress, float kP,float kI, uint8_t Loops){
 	resetDMP();
 }
 
-void MPU6050_Base::PrintActiveOffsets() {
-	uint8_t AOffsetRegister = (getDeviceID() < 0x38 )? MPU6050_RA_XA_OFFS_H:0x77;
-	int16_t Data[3];
-	//Serial.print(F("Offset Register 0x"));
-	//Serial.print(AOffsetRegister>>4,HEX);Serial.print(AOffsetRegister&0x0F,HEX);
-	Serial.print(F("\n//         X Accel  Y Accel  Z Accel   X Gyro   Y Gyro   Z Gyro\n// OFFSETS "));
-	if(AOffsetRegister == 0x06)	I2Cdev::readWords(devAddr, AOffsetRegister, 3, (uint16_t *)Data, I2Cdev::readTimeout, wireObj);
-	else {
-		I2Cdev::readWords(devAddr, AOffsetRegister, 1, (uint16_t *)Data, I2Cdev::readTimeout, wireObj);
-		I2Cdev::readWords(devAddr, AOffsetRegister+3, 1, (uint16_t *)Data+1, I2Cdev::readTimeout, wireObj);
-		I2Cdev::readWords(devAddr, AOffsetRegister+6, 1, (uint16_t *)Data+2, I2Cdev::readTimeout, wireObj);
-	}
-	//	A_OFFSET_H_READ_A_OFFS(Data);
-    Serial.print((float)Data[0], 5); Serial.print(",  ");
-    Serial.print((float)Data[1], 5); Serial.print(",  ");
-    Serial.print((float)Data[2], 5); Serial.print(",  ");
-	I2Cdev::readWords(devAddr, 0x13, 3, (uint16_t *)Data, I2Cdev::readTimeout, wireObj);
-	//	XG_OFFSET_H_READ_OFFS_USR(Data);
-    Serial.print((float)Data[0], 5); Serial.print(",  ");
-    Serial.print((float)Data[1], 5); Serial.print(",  ");
-    Serial.print((float)Data[2], 5); Serial.print("\n");
+int16_t * MPU6050_Base::GetActiveOffsets() {
+    uint8_t AOffsetRegister = (getDeviceID() < 0x38 )? MPU6050_RA_XA_OFFS_H:0x77;
+    if(AOffsetRegister == 0x06)	I2Cdev::readWords(devAddr, AOffsetRegister, 3, (uint16_t *)offsets, I2Cdev::readTimeout, wireObj);
+    else {
+        I2Cdev::readWords(devAddr, AOffsetRegister, 1, (uint16_t *)offsets, I2Cdev::readTimeout, wireObj);
+        I2Cdev::readWords(devAddr, AOffsetRegister+3, 1, (uint16_t *)(offsets+1), I2Cdev::readTimeout, wireObj);
+        I2Cdev::readWords(devAddr, AOffsetRegister+6, 1, (uint16_t *)(offsets+2), I2Cdev::readTimeout, wireObj);
+    }
+    I2Cdev::readWords(devAddr, 0x13, 3, (uint16_t *)(offsets+3), I2Cdev::readTimeout, wireObj);
+    return offsets;
 }
+
+void MPU6050_Base::PrintActiveOffsets() {
+    GetActiveOffsets();
+	//	A_OFFSET_H_READ_A_OFFS(Data);
+    Serial.print((float)offsets[0], 5); Serial.print(",\t");
+    Serial.print((float)offsets[1], 5); Serial.print(",\t");
+    Serial.print((float)offsets[2], 5); Serial.print(",\t");
+	
+	//	XG_OFFSET_H_READ_OFFS_USR(Data);
+    Serial.print((float)offsets[3], 5); Serial.print(",\t");
+    Serial.print((float)offsets[4], 5); Serial.print(",\t");
+    Serial.print((float)offsets[5], 5); Serial.print("\n\n");
+}

lib/mpu6050/MPU6050.h

@@ -832,12 +832,16 @@ class MPU6050_Base {
 		void CalibrateAccel(uint8_t Loops = 15);// Fine tune after setting offsets with less Loops.
 		void PID(uint8_t ReadAddress, float kP,float kI, uint8_t Loops);  // Does the math
 		void PrintActiveOffsets(); // See the results of the Calibration
+		int16_t * GetActiveOffsets();
 
     protected:
         uint8_t devAddr;
         void *wireObj;
         uint8_t buffer[14];
         uint32_t fifoTimeout = MPU6050_FIFO_DEFAULT_TIMEOUT;
+    
+    private:
+        int16_t offsets[6];
 };
 
 #ifndef I2CDEVLIB_MPU6050_TYPEDEF
@@ -845,4 +849,4 @@ class MPU6050_Base {
 typedef MPU6050_Base MPU6050;
 #endif
 
-#endif /* _MPU6050_H_ */
+#endif /* _MPU6050_H_ */

platformio.ini

@@ -15,7 +15,7 @@ include_dir = lib
 [common_env_data]
 upload_speed = 921600
 monitor_speed =  115200
-platform = espressif8266 @ 3.2.0
+platform = espressif8266 @ 4.0.1
 framework = arduino
 board = d1_mini
 build_unflags = 
@@ -33,15 +33,16 @@ build_flags =
 	-D EMBED_HTML			     				# If this is not used the html files needs to be on the file system (can be uploaded)
 	-D USER_SSID=\""\""           # =\""myssid\""
 	-D USER_SSID_PWD=\""\""       # =\""mypwd\""	
-	-D CFG_APPVER="\"0.9.0\""
-	!python script/git_rev.py
+	-D CFG_APPVER="\"1.1.0\""
+	-D CFG_GITREV=\""beta-2\""
+	#!python script/git_rev.py
 lib_deps = # Switched to forks for better version control.
 	# Using local copy of these libraries
-  #https://github.com/jrowberg/i2cdevlib.git#<document> 		
-	#https://github.com/khoih-prog/ESP_WiFiManager#<document>
-	#https://github.com/khoih-prog/ESP_DoubleResetDetector#<document>
-	#https://github.com/PaulStoffregen/OneWire
-	#https://github.com/milesburton/Arduino-Temperature-Control-Library
+  #https://github.com/mp-se/i2cdevlib.git#<document> 		
+	#https://github.com/mp-se/OneWire																		  # Using this version; https://github.com/arendst/Tasmota/tree/development/lib/lib_basic/OneWire-Stickbreaker
+	#https://github.com/mp-se/Arduino-Temperature-Control-Library
+	#https://github.com/khoih-prog/ESP_WiFiManager
+	#https://github.com/khoih-prog/ESP_DoubleResetDetector
 	https://github.com/mp-se/tinyexpr																		  #	https://github.com/codeplea/tinyexpr
 	https://github.com/mp-se/incbin																			  #	https://github.com/graphitemaster/incbin
 	https://github.com/mp-se/Arduino-Log#1.1.1    												# https://github.com/thijse/Arduino-Log
@@ -66,6 +67,7 @@ build_flags =
 	#-D PIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS
 	#-D SKIP_SLEEPMODE
 	#-D DOUBLERESETDETECTOR_DEBUG=true
+	#-D FORCE_GRAVITY_MODE # used to debug gravity mode
 	-D COLLECT_PERFDATA	# This option will collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb 
 	-D LOG_LEVEL=6 # Maximum log level for the debug build.
 	-D CFG_DISABLE_LOGGING # Turn off verbose/notice logging to reduce size and dont overload uart. 
@@ -126,7 +128,7 @@ board_build.filesystem = littlefs
 
 [env:gravity32-release]
 framework = arduino
-platform = espressif32
+platform = espressif32 @ 5.0.0
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
 extra_scripts =  
@@ -151,8 +153,8 @@ build_flags =
 	-D MAIN_DISABLE_LOGGING
 lib_deps = 
 	${common_env_data.lib_deps}
-	https://github.com/lorol/LITTLEFS#1.0.6
-  https://github.com/h2zero/NimBLE-Arduino#1.3.7
+	https://github.com/mp-se/NimBLE-Arduino#1.3.8	 # https://github.com/h2zero/NimBLE-Arduino
+lib_ignore = 
 board = featheresp32
 build_type = release
 board_build.partitions = part32.csv
@@ -161,7 +163,7 @@ monitor_filters = esp32_exception_decoder
 
 [env:gravity32-perf]
 framework = arduino
-platform = espressif32
+platform = espressif32 @ 5.0.0
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
 extra_scripts =  
@@ -177,34 +179,9 @@ build_flags =
 	-D LOG_LEVEL=5
 lib_deps = 
 	${common_env_data.lib_deps}
-	https://github.com/lorol/LITTLEFS#1.0.6
-  https://github.com/h2zero/NimBLE-Arduino#1.3.7
+	https://github.com/mp-se/NimBLE-Arduino#1.3.8	 # https://github.com/h2zero/NimBLE-Arduino
 board = featheresp32
 build_type = release
 board_build.partitions = part32.csv
 board_build.filesystem = littlefs 
 monitor_filters = esp32_exception_decoder
-
-[env:gravity32-release2]
-framework = arduino
-#platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip # build fails
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
-upload_speed = ${common_env_data.upload_speed}
-monitor_speed = ${common_env_data.monitor_speed}
-extra_scripts =  
-	script/copy_html.py
-	script/copy_firmware.py
-	script/create_versionjson.py
-build_unflags = 
-	${common_env_data.build_unflags}
-build_flags = 
-	${common_env_data.build_flags}
-	-D ESPRESSIF32_20 # v2.0 framework
-	-D LOG_LEVEL=5 
-lib_deps = 
-	${common_env_data.lib_deps}
-  https://github.com/h2zero/NimBLE-Arduino#1.3.7
-board = featheresp32
-build_type = release
-board_build.partitions = part32.csv 
-board_build.filesystem = littlefs 

script/copy_firmware.py

@@ -11,21 +11,46 @@ def after_build(source, target, env):
     print( "Executing custom step " )
     dir    = env.GetLaunchDir()
     name   = env.get( "PIOENV" )
-    source = dir + "/.pio/build/" + name + "/firmware.bin"
     if name == "gravity-debug" :
         target = dir + "/bin/firmware-debug.bin"
+        source = dir + "/.pio/build/" + name + "/firmware.bin"
+        print( "Copy file : " + source + " -> " + target )
+        shutil.copyfile( source, target )
+
     if name == "gravity-release" :
         target = dir + "/bin/firmware.bin"
+        source = dir + "/.pio/build/" + name + "/firmware.bin"
+        print( "Copy file : " + source + " -> " + target )
+        shutil.copyfile( source, target )
+
     if name == "gravity-perf" :
         target = dir + "/bin/firmware-perf.bin"
+        source = dir + "/.pio/build/" + name + "/firmware.bin"
+        print( "Copy file : " + source + " -> " + target )
+        shutil.copyfile( source, target )
+
     if name == "gravity32-release" :
         target = dir + "/bin/firmware32.bin"
+        source = dir + "/.pio/build/" + name + "/firmware.bin"
+        print( "Copy file : " + source + " -> " + target )
+        shutil.copyfile( source, target )
+
+        target = dir + "/bin/partitions32.bin"
+        source = dir + "/.pio/build/" + name + "/partitions.bin"
+        print( "Copy file : " + source + " -> " + target )
+        shutil.copyfile( source, target )
+
     if name == "gravity32-perf" :
         target = dir + "/bin/firmware32-perf.bin"
+        source = dir + "/.pio/build/" + name + "/firmware.bin"
+        print( "Copy file : " + source + " -> " + target )
+        shutil.copyfile( source, target )
+
     if name == "gravity32-release2" :
         target = dir + "/bin/firmware32_2.bin"
-    print( "Copy file : " + source + " -> " + target )
-    shutil.copyfile( source, target )
+        source = dir + "/.pio/build/" + name + "/firmware.bin"
+        print( "Copy file : " + source + " -> " + target )
+        shutil.copyfile( source, target )
 
 
 print( "Adding custom build step (copy firmware): ")

src/calc.cpp

@@ -33,14 +33,17 @@ SOFTWARE.
 int createFormula(RawFormulaData &fd, char *formulaBuffer,
                   int formulaBufferSize, int order) {
   int noAngles = 0;
+  RawFormulaData fd2;
 
-  // Check how many valid values we have got
-  if (fd.a[0] > 0 && fd.a[1] > 0 && fd.a[2] > 0 && fd.a[3] > 0 && fd.a[4] > 0)
-    noAngles = 5;
-  else if (fd.a[0] > 0 && fd.a[1] > 0 && fd.a[2] > 0 && fd.a[3] > 0)
-    noAngles = 4;
-  else if (fd.a[0] > 0 && fd.a[1] > 0 && fd.a[2] > 0)
-    noAngles = 3;
+  // Check how many valid values we have got and make sure we have a full
+  // series.
+  for (int i = 0; i < FORMULA_DATA_SIZE; i++) {
+    if (fd.a[i]) {
+      fd2.a[noAngles] = fd.a[i];
+      fd2.g[noAngles] = fd.g[i];
+      noAngles++;
+    }
+  }
 
 #if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
   Log.verbose(
@@ -48,19 +51,20 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
       order, noAngles);
 #endif
 
-  if (!noAngles) {
+  if (noAngles < 3) {
     ErrorFileLog errLog;
     errLog.addEntry(F("CALC: Not enough values for deriving formula"));
     return ERR_FORMULA_NOTENOUGHVALUES;
   } else {
     double coeffs[order + 1];
-    int ret = fitCurve(order, noAngles, fd.a, fd.g,
+    int ret = fitCurve(order, noAngles, fd2.a, fd2.g,
                        sizeof(coeffs) / sizeof(double), coeffs);
 
     // Returned value is 0 if no error
     if (ret == 0) {
 #if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
-      Log.verbose(F("CALC: Finshied processing data points." CR));
+      Log.verbose(F("CALC: Finshied processing data points, order = %d." CR),
+                  order);
 #endif
 
       // Print the formula based on 'order'
@@ -93,21 +97,19 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
         double dev = (g - fd.g[i]) < 0 ? (fd.g[i] - g) : (g - fd.g[i]);
 
         // If the deviation is more than 2 degress we mark it as failed.
-        if (dev * 1000 > myHardwareConfig.getMaxFormulaCreationDeviation()) {
-#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
-          char s[20];
-          snprintf(&s[0], sizeof(s), "%.8f", dev);
-          Log.verbose(F("CALC: Deviation is: %s" CR), &s[0]);
-#endif
+        if (dev * 1000 > myAdvancedConfig.getMaxFormulaCreationDeviation()) {
+          char s[120];
+          snprintf(&s[0], sizeof(s),
+                   "CALC: Validation failed on angle %f, deviation too large "
+                   "%.2f SG, formula order %d",
+                   fd.a[i], dev * 1000, order);
+          ErrorFileLog errLog;
+          errLog.addEntry(&s[0]);
           valid = false;
         }
       }
 
       if (!valid) {
-        ErrorFileLog errLog;
-        errLog.addEntry(
-            F("CALC: Error validating created formula. Deviation to large, "
-              "formula rejected."));
         return ERR_FORMULA_UNABLETOFFIND;
       }
 
@@ -173,16 +175,15 @@ double calculateGravity(double angle, double temp, const char *tempFormula) {
 //
 // Source: https://homebrewacademy.com/hydrometer-temperature-correction/
 //
-double gravityTemperatureCorrectionC(double gravity, double tempC,
+double gravityTemperatureCorrectionC(double gravitySG, double tempC,
                                      double calTempC) {
 #if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
   Log.verbose(F("CALC: Adjusting gravity based on temperature, gravity %F, "
                 "temp %F, calTemp %F." CR),
-              gravity, tempC, calTempC);
+              gravitySG, tempC, calTempC);
 #endif
-  // float tempF = convertCtoF(tempC);
-  // float calTempF = convertCtoF(calTempC);
-
+  double tempF = convertCtoF(tempC);
+  double calTempF = convertCtoF(calTempC);
   const char *formula =
       "gravity*((1.00130346-0.000134722124*temp+0.00000204052596*temp^2-0."
       "00000000232820948*temp^3)/"
@@ -191,7 +192,7 @@ double gravityTemperatureCorrectionC(double gravity, double tempC,
 
   // Store variable names and pointers.
   te_variable vars[] = {
-      {"gravity", &gravity}, {"temp", &tempC}, {"cal", &calTempC}};
+      {"gravity", &gravitySG}, {"temp", &tempF}, {"cal", &calTempF}};
 
   int err;
   // Compile the expression with variables.
@@ -202,9 +203,10 @@ double gravityTemperatureCorrectionC(double gravity, double tempC,
     te_free(expr);
 
 #if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
-    char s[10];
-    snprintf(&s[0], sizeof(s), "%.8f", g);
-    Log.verbose(F("CALC: Corrected gravity is %s." CR), &s[0]);
+    char s[80];
+    snprintf(&s[0], sizeof(s), "Corrected gravity=%.8f, input gravity=%.8f", g,
+             gravitySG);
+    Log.verbose(F("CALC: %s." CR), &s[0]);
 #endif
     return g;
   }
@@ -213,7 +215,7 @@ double gravityTemperatureCorrectionC(double gravity, double tempC,
   errLog.addEntry(
       "CALC: Failed to parse expression for gravity temperature correction " +
       String(err));
-  return gravity;
+  return gravitySG;
 }
 
 // EOF

src/calc.hpp

@@ -32,9 +32,8 @@ SOFTWARE.
 
 double calculateGravity(double angle, double tempC,
                         const char *tempFormula = 0);
-double gravityTemperatureCorrectionC(
-    double gravity, double tempC,
-    double calTempC = myHardwareConfig.getDefaultCalibrationTemp());
+double gravityTemperatureCorrectionC(double gravity, double tempC,
+                                     double calTempC);
 int createFormula(RawFormulaData &fd, char *formulaBuffer,
                   int formulaBufferSize, int order);
 

src/config.cpp

@@ -26,7 +26,7 @@ SOFTWARE.
 #include <wifi.hpp>
 
 Config myConfig;
-HardwareConfig myHardwareConfig;
+AdvancedConfig myAdvancedConfig;
 
 //
 // Create the config class with default settings.
@@ -62,11 +62,12 @@ void Config::createJson(DynamicJsonDocument& doc) {
   // doc[PARAM_CONFIG_VER] = getConfigVersion();
   doc[PARAM_ID] = getID();
   doc[PARAM_OTA] = getOtaURL();
-  doc[PARAM_SSID] = getWifiSSID();
-  doc[PARAM_PASS] = getWifiPass();
+  doc[PARAM_SSID] = getWifiSSID(0);
+  doc[PARAM_PASS] = getWifiPass(0);
+  doc[PARAM_SSID2] = getWifiSSID(1);
+  doc[PARAM_PASS2] = getWifiPass(1);
   doc[PARAM_BLE] = getColorBLE();
   doc[PARAM_TEMPFORMAT] = String(getTempFormat());
-  doc[PARAM_PUSH_BREWFATHER] = getBrewfatherPushUrl();
   doc[PARAM_TOKEN] = getToken();
   doc[PARAM_TOKEN2] = getToken2();
   doc[PARAM_PUSH_HTTP] = getHttpUrl();
@@ -85,12 +86,14 @@ void Config::createJson(DynamicJsonDocument& doc) {
   doc[PARAM_PUSH_MQTT_USER] = getMqttUser();
   doc[PARAM_PUSH_MQTT_PASS] = getMqttPass();
   doc[PARAM_SLEEP_INTERVAL] = getSleepInterval();
-  doc[PARAM_VOLTAGEFACTOR] = getVoltageFactor();
+  doc[PARAM_VOLTAGE_FACTOR] = getVoltageFactor();
+  doc[PARAM_VOLTAGE_CONFIG] = getVoltageConfig();
   doc[PARAM_GRAVITY_FORMULA] = getGravityFormula();
   doc[PARAM_GRAVITY_FORMAT] = String(getGravityFormat());
   doc[PARAM_TEMP_ADJ] = getTempSensorAdjC();
   doc[PARAM_GRAVITY_TEMP_ADJ] = isGravityTempAdj();
   doc[PARAM_GYRO_TEMP] = isGyroTemp();
+  doc[PARAM_STORAGE_SLEEP] = isStorageSleep();
 
   JsonObject cal = doc.createNestedObject(PARAM_GYRO_CALIBRATION);
   cal["ax"] = _gyroCalibration.ax;
@@ -106,12 +109,22 @@ void Config::createJson(DynamicJsonDocument& doc) {
   cal2["a3"] = reduceFloatPrecision(_formulaData.a[2], 2);
   cal2["a4"] = reduceFloatPrecision(_formulaData.a[3], 2);
   cal2["a5"] = reduceFloatPrecision(_formulaData.a[4], 2);
+  cal2["a6"] = reduceFloatPrecision(_formulaData.a[5], 2);
+  cal2["a7"] = reduceFloatPrecision(_formulaData.a[6], 2);
+  cal2["a8"] = reduceFloatPrecision(_formulaData.a[7], 2);
+  cal2["a9"] = reduceFloatPrecision(_formulaData.a[8], 2);
+  cal2["a10"] = reduceFloatPrecision(_formulaData.a[9], 2);
 
   cal2["g1"] = reduceFloatPrecision(_formulaData.g[0], 4);
   cal2["g2"] = reduceFloatPrecision(_formulaData.g[1], 4);
   cal2["g3"] = reduceFloatPrecision(_formulaData.g[2], 4);
   cal2["g4"] = reduceFloatPrecision(_formulaData.g[3], 4);
   cal2["g5"] = reduceFloatPrecision(_formulaData.g[4], 4);
+  cal2["g6"] = reduceFloatPrecision(_formulaData.g[5], 4);
+  cal2["g7"] = reduceFloatPrecision(_formulaData.g[6], 4);
+  cal2["g8"] = reduceFloatPrecision(_formulaData.g[7], 4);
+  cal2["g9"] = reduceFloatPrecision(_formulaData.g[8], 4);
+  cal2["g10"] = reduceFloatPrecision(_formulaData.g[9], 4);
 }
 
 //
@@ -137,7 +150,7 @@ bool Config::saveFile() {
     return false;
   }
 
-  DynamicJsonDocument doc(CFG_JSON_BUFSIZE);
+  DynamicJsonDocument doc(3000);
   createJson(doc);
 
 #if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
@@ -179,7 +192,7 @@ bool Config::loadFile() {
   Log.notice(F("CFG : Size of configuration file=%d bytes." CR),
              configFile.size());
 
-  DynamicJsonDocument doc(CFG_JSON_BUFSIZE);
+  DynamicJsonDocument doc(3000);
   DeserializationError err = deserializeJson(doc, configFile);
 #if LOG_LEVEL == 6
   serializeJson(doc, Serial);
@@ -198,8 +211,10 @@ bool Config::loadFile() {
 #endif
   if (!doc[PARAM_OTA].isNull()) setOtaURL(doc[PARAM_OTA]);
   if (!doc[PARAM_MDNS].isNull()) setMDNS(doc[PARAM_MDNS]);
-  if (!doc[PARAM_SSID].isNull()) setWifiSSID(doc[PARAM_SSID]);
-  if (!doc[PARAM_PASS].isNull()) setWifiPass(doc[PARAM_PASS]);
+  if (!doc[PARAM_SSID].isNull()) setWifiSSID(doc[PARAM_SSID], 0);
+  if (!doc[PARAM_PASS].isNull()) setWifiPass(doc[PARAM_PASS], 0);
+  if (!doc[PARAM_SSID2].isNull()) setWifiSSID(doc[PARAM_SSID2], 1);
+  if (!doc[PARAM_PASS2].isNull()) setWifiPass(doc[PARAM_PASS2], 1);
   if (!doc[PARAM_BLE].isNull()) setColorBLE(doc[PARAM_BLE]);
 
   if (!doc[PARAM_TEMPFORMAT].isNull()) {
@@ -207,9 +222,6 @@ bool Config::loadFile() {
     setTempFormat(s.charAt(0));
   }
 
-  if (!doc[PARAM_PUSH_BREWFATHER].isNull())
-    setBrewfatherPushUrl(doc[PARAM_PUSH_BREWFATHER]);
-
   if (!doc[PARAM_TOKEN].isNull()) setToken(doc[PARAM_TOKEN]);
   if (!doc[PARAM_TOKEN2].isNull()) setToken2(doc[PARAM_TOKEN2]);
   if (!doc[PARAM_PUSH_HTTP].isNull()) setHttpUrl(doc[PARAM_PUSH_HTTP]);
@@ -243,14 +255,18 @@ bool Config::loadFile() {
 
   if (!doc[PARAM_SLEEP_INTERVAL].isNull())
     setSleepInterval(doc[PARAM_SLEEP_INTERVAL].as<int>());
-  if (!doc[PARAM_VOLTAGEFACTOR].isNull())
-    setVoltageFactor(doc[PARAM_VOLTAGEFACTOR].as<float>());
+  if (!doc[PARAM_VOLTAGE_FACTOR].isNull())
+    setVoltageFactor(doc[PARAM_VOLTAGE_FACTOR].as<float>());
+  if (!doc[PARAM_VOLTAGE_CONFIG].isNull())
+    setVoltageConfig(doc[PARAM_VOLTAGE_CONFIG].as<float>());
   if (!doc[PARAM_GRAVITY_FORMULA].isNull())
     setGravityFormula(doc[PARAM_GRAVITY_FORMULA]);
   if (!doc[PARAM_GRAVITY_TEMP_ADJ].isNull())
     setGravityTempAdj(doc[PARAM_GRAVITY_TEMP_ADJ].as<bool>());
   if (!doc[PARAM_GYRO_TEMP].isNull())
     setGyroTemp(doc[PARAM_GYRO_TEMP].as<bool>());
+  if (!doc[PARAM_STORAGE_SLEEP].isNull())
+    setStorageSleep(doc[PARAM_STORAGE_SLEEP].as<bool>());
   if (!doc[PARAM_GRAVITY_FORMAT].isNull()) {
     String s = doc[PARAM_GRAVITY_FORMAT];
     setGravityFormat(s.charAt(0));
@@ -281,6 +297,16 @@ bool Config::loadFile() {
     _formulaData.a[3] = doc[PARAM_FORMULA_DATA]["a4"].as<double>();
   if (!doc[PARAM_FORMULA_DATA]["a5"].isNull())
     _formulaData.a[4] = doc[PARAM_FORMULA_DATA]["a5"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a6"].isNull())
+    _formulaData.a[5] = doc[PARAM_FORMULA_DATA]["a6"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a7"].isNull())
+    _formulaData.a[6] = doc[PARAM_FORMULA_DATA]["a7"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a8"].isNull())
+    _formulaData.a[7] = doc[PARAM_FORMULA_DATA]["a8"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a9"].isNull())
+    _formulaData.a[8] = doc[PARAM_FORMULA_DATA]["a9"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a10"].isNull())
+    _formulaData.a[9] = doc[PARAM_FORMULA_DATA]["a10"].as<double>();
 
   if (!doc[PARAM_FORMULA_DATA]["g1"].isNull())
     _formulaData.g[0] = doc[PARAM_FORMULA_DATA]["g1"].as<double>();
@@ -292,6 +318,16 @@ bool Config::loadFile() {
     _formulaData.g[3] = doc[PARAM_FORMULA_DATA]["g4"].as<double>();
   if (!doc[PARAM_FORMULA_DATA]["g5"].isNull())
     _formulaData.g[4] = doc[PARAM_FORMULA_DATA]["g5"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g6"].isNull())
+    _formulaData.g[5] = doc[PARAM_FORMULA_DATA]["g6"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g7"].isNull())
+    _formulaData.g[6] = doc[PARAM_FORMULA_DATA]["g7"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g8"].isNull())
+    _formulaData.g[7] = doc[PARAM_FORMULA_DATA]["g8"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g9"].isNull())
+    _formulaData.g[8] = doc[PARAM_FORMULA_DATA]["g9"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g10"].isNull())
+    _formulaData.g[9] = doc[PARAM_FORMULA_DATA]["g10"].as<double>();
 
   /*if( doc[PARAM_CONFIG_VER].isNull() ) {
     // If this parameter is missing we need to reset the gyrocalibaration due to
@@ -333,7 +369,7 @@ void Config::checkFileSystem() {
 //
 // Save json document to file
 //
-bool HardwareConfig::saveFile() {
+bool AdvancedConfig::saveFile() {
 #if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
   Log.verbose(F("CFG : Saving hardware configuration to file." CR));
 #endif
@@ -349,11 +385,19 @@ bool HardwareConfig::saveFile() {
   DynamicJsonDocument doc(512);
 
   doc[PARAM_HW_GYRO_READ_COUNT] = this->getGyroReadCount();
-  doc[PARAM_HW_GYRO_READ_DELAY] = this->getGyroReadDelay();
+  // 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();
+  doc[PARAM_HW_PUSH_INTERVAL_HTTP3] = this->getPushIntervalHttp3();
+  doc[PARAM_HW_PUSH_INTERVAL_INFLUX] = this->getPushIntervalInflux();
+  doc[PARAM_HW_PUSH_INTERVAL_MQTT] = this->getPushIntervalMqtt();
+  doc[PARAM_HW_TEMPSENSOR_RESOLUTION] = this->getTempSensorResolution();
+  doc[PARAM_HW_IGNORE_LOW_ANGLES] = this->isIgnoreLowAnges();
 
 #if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
   serializeJson(doc, Serial);
@@ -371,7 +415,7 @@ bool HardwareConfig::saveFile() {
 //
 // Load config file from disk
 //
-bool HardwareConfig::loadFile() {
+bool AdvancedConfig::loadFile() {
 #if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
   Log.verbose(F("CFG : Loading hardware configuration from file." CR));
 #endif
@@ -413,8 +457,8 @@ bool HardwareConfig::loadFile() {
 
   if (!doc[PARAM_HW_GYRO_READ_COUNT].isNull())
     this->setGyroReadCount(doc[PARAM_HW_GYRO_READ_COUNT].as<int>());
-  if (!doc[PARAM_HW_GYRO_READ_DELAY].isNull())
-    this->setGyroReadDelay(doc[PARAM_HW_GYRO_READ_DELAY].as<int>());
+  // if (!doc[PARAM_HW_GYRO_READ_DELAY].isNull())
+  //  this->setGyroReadDelay(doc[PARAM_HW_GYRO_READ_DELAY].as<int>());
   if (!doc[PARAM_HW_GYRO_MOVING_THREASHOLD].isNull())
     this->setGyroSensorMovingThreashold(
         doc[PARAM_HW_GYRO_MOVING_THREASHOLD].as<int>());
@@ -424,10 +468,27 @@ bool HardwareConfig::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())
+    this->setPushIntervalHttp1(doc[PARAM_HW_PUSH_INTERVAL_HTTP1].as<int>());
+  if (!doc[PARAM_HW_PUSH_INTERVAL_HTTP2].isNull())
+    this->setPushIntervalHttp2(doc[PARAM_HW_PUSH_INTERVAL_HTTP2].as<int>());
+  if (!doc[PARAM_HW_PUSH_INTERVAL_HTTP3].isNull())
+    this->setPushIntervalHttp3(doc[PARAM_HW_PUSH_INTERVAL_HTTP3].as<int>());
+  if (!doc[PARAM_HW_PUSH_INTERVAL_INFLUX].isNull())
+    this->setPushIntervalInflux(doc[PARAM_HW_PUSH_INTERVAL_INFLUX].as<int>());
+  if (!doc[PARAM_HW_PUSH_INTERVAL_MQTT].isNull())
+    this->setPushIntervalMqtt(doc[PARAM_HW_PUSH_INTERVAL_MQTT].as<int>());
+  if (!doc[PARAM_HW_TEMPSENSOR_RESOLUTION].isNull())
+    this->setTempSensorResolution(
+        doc[PARAM_HW_TEMPSENSOR_RESOLUTION].as<int>());
+  if (!doc[PARAM_HW_IGNORE_LOW_ANGLES].isNull())
+    setIgnoreLowAnges(doc[PARAM_HW_IGNORE_LOW_ANGLES].as<bool>());
 
   Log.notice(F("CFG : Configuration file " CFG_HW_FILENAME " loaded." CR));
   return true;

src/config.hpp

@@ -27,8 +27,6 @@ SOFTWARE.
 #include <helper.hpp>
 #include <resources.hpp>
 
-#define CFG_JSON_BUFSIZE 3192
-
 #define CFG_APPNAME "GravityMon"          // Name of firmware
 #define CFG_FILENAME "/gravitymon.json"   // Name of config file
 #define CFG_HW_FILENAME "/hardware.json"  // Name of config file for hw
@@ -47,41 +45,90 @@ struct RawGyroData {
 };
 
 // Used for holding formulaData (used for calculating formula on device)
+#define FORMULA_DATA_SIZE 10
+
 struct RawFormulaData {
-  double a[5];
-  double g[5];
+  double a[FORMULA_DATA_SIZE];
+  double g[FORMULA_DATA_SIZE];
 };
 
-class HardwareConfig {
+class AdvancedConfig {
  private:
-  int _wifiPortalTimeout = 120;
-  float _maxFormulaCreationDeviation = 1.6;
-  float _defaultCalibrationTemp = 20.0;
+  int _wifiPortalTimeout = 120;            // seconds
+  int _wifiConnectTimeout = 20;            // seconds
+  float _maxFormulaCreationDeviation = 3;  // SG
+  float _defaultCalibrationTemp = 20.0;    // C
   int _gyroSensorMovingThreashold = 500;
+  int _tempSensorResolution = 9;  // bits
   int _gyroReadCount = 50;
   int _gyroReadDelay = 3150;  // us, empirical, to hold sampling to 200 Hz
   int _pushTimeout = 10;      // seconds
+  int _pushIntervalHttp1 = 0;
+  int _pushIntervalHttp2 = 0;
+  int _pushIntervalHttp3 = 0;
+  int _pushIntervalInflux = 0;
+  int _pushIntervalMqtt = 0;
+  bool _IgnoreLowAnges = false;
 
  public:
   int getWifiPortalTimeout() { return _wifiPortalTimeout; }
   void setWifiPortalTimeout(int t) { _wifiPortalTimeout = t; }
+
+  int getWifiConnectTimeout() { return _wifiConnectTimeout; }
+  void setWifiConnectTimeout(int t) { _wifiConnectTimeout = t; }
+
   float getMaxFormulaCreationDeviation() {
     return _maxFormulaCreationDeviation;
   }
   void setMaxFormulaCreationDeviation(float f) {
     _maxFormulaCreationDeviation = f;
   }
+
+  int getTempSensorResolution() { return _tempSensorResolution; }
+  void setTempSensorResolution(int t) {
+    if (t >= 9 && t <= 12) _tempSensorResolution = t;
+  }
+
   float getDefaultCalibrationTemp() { return _defaultCalibrationTemp; }
   void SetDefaultCalibrationTemp(float t) { _defaultCalibrationTemp = t; }
+
   int getGyroSensorMovingThreashold() { return _gyroSensorMovingThreashold; }
   void setGyroSensorMovingThreashold(int t) { _gyroSensorMovingThreashold = t; }
+
   int getGyroReadCount() { return _gyroReadCount; }
   void setGyroReadCount(int c) { _gyroReadCount = c; }
+
   int getGyroReadDelay() { return _gyroReadDelay; }
   void setGyroReadDelay(int d) { _gyroReadDelay = d; }
+
   int getPushTimeout() { return _pushTimeout; }
   void setPushTimeout(int t) { _pushTimeout = t; }
 
+  int getPushIntervalHttp1() { return _pushIntervalHttp1; }
+  void setPushIntervalHttp1(int t) { _pushIntervalHttp1 = t; }
+
+  int getPushIntervalHttp2() { return _pushIntervalHttp2; }
+  void setPushIntervalHttp2(int t) { _pushIntervalHttp2 = t; }
+
+  int getPushIntervalHttp3() { return _pushIntervalHttp3; }
+  void setPushIntervalHttp3(int t) { _pushIntervalHttp3 = t; }
+
+  int getPushIntervalInflux() { return _pushIntervalInflux; }
+  void setPushIntervalInflux(int t) { _pushIntervalInflux = t; }
+
+  int getPushIntervalMqtt() { return _pushIntervalMqtt; }
+  void setPushIntervalMqtt(int t) { _pushIntervalMqtt = t; }
+
+  bool isPushIntervalActive() {
+    return (_pushIntervalHttp1 + _pushIntervalHttp2 + _pushIntervalHttp3 +
+            _pushIntervalInflux + _pushIntervalMqtt) == 0
+               ? false
+               : true;
+  }
+
+  const bool isIgnoreLowAnges() { return _IgnoreLowAnges; }
+  void setIgnoreLowAnges(bool b) { _IgnoreLowAnges = b; }
+
   bool saveFile();
   bool loadFile();
 };
@@ -97,17 +144,17 @@ class Config {
   String _otaURL = "";
   char _tempFormat = 'C';
   float _voltageFactor = 1.59;
+  float _voltageConfig = 4.15;
   float _tempSensorAdjC = 0;
   int _sleepInterval = 900;
   bool _gyroTemp = false;
+  bool _storageSleep = false;
 
   // Wifi Config
-  String _wifiSSID = "";
-  String _wifiPASS = "";
+  String _wifiSSID[2] = {"", ""};
+  String _wifiPASS[2] = {"", ""};
 
   // Push target settings
-  String _brewfatherPushUrl = "";
-
   String _token = "";
   String _token2 = "";
 
@@ -137,7 +184,8 @@ class Config {
 
   // Gyro calibration and formula calculation data
   RawGyroData _gyroCalibration = {0, 0, 0, 0, 0, 0};
-  RawFormulaData _formulaData = {{0, 0, 0, 0, 0}, {1, 1, 1, 1, 1}};
+  RawFormulaData _formulaData = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                                 {1, 1, 1, 1, 1, 1, 1, 1, 1, 1}};
 
   void formatFileSystem();
 
@@ -159,6 +207,12 @@ class Config {
     _saveNeeded = true;
   }
 
+  const bool isStorageSleep() { return _storageSleep; }
+  void setStorageSleep(bool b) {
+    _storageSleep = b;
+    _saveNeeded = true;
+  }
+
   const char* getOtaURL() { return _otaURL.c_str(); }
   void setOtaURL(String s) {
     _otaURL = s;
@@ -167,26 +221,31 @@ class Config {
   bool isOtaActive() { return _otaURL.length() ? true : false; }
   bool isOtaSSL() { return _otaURL.startsWith("https://"); }
 
-  const char* getWifiSSID() { return _wifiSSID.c_str(); }
-  void setWifiSSID(String s) {
-    _wifiSSID = s;
+  const char* getWifiSSID(int idx) { return _wifiSSID[idx].c_str(); }
+  void setWifiSSID(String s, int idx) {
+    _wifiSSID[idx] = s;
     _saveNeeded = true;
   }
-  const char* getWifiPass() { return _wifiPASS.c_str(); }
-  void setWifiPass(String s) {
-    _wifiPASS = s;
+  const char* getWifiPass(int idx) { return _wifiPASS[idx].c_str(); }
+  void setWifiPass(String s, int idx) {
+    _wifiPASS[idx] = s;
     _saveNeeded = true;
   }
+  bool dualWifiConfigured() {
+    return _wifiSSID[0].length() > 0 && _wifiSSID[1].length() > 0 ? true
+                                                                  : false;
+  }
+  void swapPrimaryWifi() {
+    String s = _wifiSSID[0];
+    _wifiSSID[0] = _wifiSSID[1];
+    _wifiSSID[1] = s;
+
+    String p = _wifiPASS[0];
+    _wifiPASS[0] = _wifiPASS[1];
+    _wifiPASS[1] = p;
 
-  // Brewfather
-  const char* getBrewfatherPushUrl() { return _brewfatherPushUrl.c_str(); }
-  void setBrewfatherPushUrl(String s) {
-    _brewfatherPushUrl = s;
     _saveNeeded = true;
   }
-  bool isBrewfatherActive() {
-    return _brewfatherPushUrl.length() ? true : false;
-  }
 
   // Token parameter
   const char* getToken() { return _token.c_str(); }
@@ -242,6 +301,7 @@ class Config {
     _saveNeeded = true;
   }
   bool isInfluxDb2Active() { return _influxDb2Url.length() ? true : false; }
+  bool isInfluxSSL() { return _influxDb2Url.startsWith("https://"); }
   const char* getInfluxDb2PushOrg() { return _influxDb2Org.c_str(); }
   void setInfluxDb2PushOrg(String s) {
     _influxDb2Org = s;
@@ -317,6 +377,16 @@ class Config {
     _saveNeeded = true;
   }
 
+  float getVoltageConfig() { return _voltageConfig; }
+  void setVoltageConfig(float f) {
+    _voltageConfig = f;
+    _saveNeeded = true;
+  }
+  void setVoltageConfig(String s) {
+    _voltageConfig = s.toFloat();
+    _saveNeeded = true;
+  }
+
   float getTempSensorAdjC() { return _tempSensorAdjC; }
   void setTempSensorAdjC(float f) {
     _tempSensorAdjC = f;
@@ -361,7 +431,7 @@ class Config {
   bool isBLEActive() { return _colorBLE.length() ? true : false; }
   bool isWifiPushActive() {
     return (isHttpActive() || isHttp2Active() || isHttp3Active() ||
-            isBrewfatherActive() || isInfluxDb2Active() || isMqttActive())
+            isInfluxDb2Active() || isMqttActive())
                ? true
                : false;
   }
@@ -388,7 +458,7 @@ class Config {
 };
 
 extern Config myConfig;
-extern HardwareConfig myHardwareConfig;
+extern AdvancedConfig myAdvancedConfig;
 
 #endif  // SRC_CONFIG_HPP_
 

src/gyro.cpp

@@ -43,7 +43,9 @@ bool GyroSensor::setup() {
   Wire.setClock(400000);  // 400kHz I2C clock. Comment this line if having
                           // compilation difficulties
 
-  if (!accelgyro.testConnection()) {
+  uint8_t id = accelgyro.getDeviceID();
+
+  if (id != 0x34 && id != 0x38) {  // Allow both MPU6050 and MPU6000
     ErrorFileLog errLog;
     errLog.addEntry(F("GYRO: Failed to connect to gyro, is it connected?"));
     _sensorConnected = false;
@@ -217,7 +219,7 @@ bool GyroSensor::isSensorMoving(RawGyroData &raw) {
 #endif
 
   int x = abs(raw.gx), y = abs(raw.gy), z = abs(raw.gz);
-  int threashold = myHardwareConfig.getGyroSensorMovingThreashold();
+  int threashold = myAdvancedConfig.getGyroSensorMovingThreashold();
 
   if (x > threashold || y > threashold || z > threashold) {
     Log.notice(F("GYRO: Movement detected (%d)\t%d\t%d\t%d." CR), threashold, x,
@@ -239,8 +241,8 @@ bool GyroSensor::read() {
   if (!_sensorConnected) return false;
 
   readSensor(
-      _lastGyroData, myHardwareConfig.getGyroReadCount(),
-      myHardwareConfig.getGyroReadDelay());  // Last param is unused if
+      _lastGyroData, myAdvancedConfig.getGyroReadCount(),
+      myAdvancedConfig.getGyroReadDelay());  // Last param is unused if
                                              // GYRO_USE_INTERRUPT is defined.
 
   // If the sensor is unstable we return false to signal we dont have valid

src/helper.cpp

@@ -194,14 +194,8 @@ void printBuildOptions() {
 #ifdef SKIP_SLEEPMODE
                "SKIP_SLEEP "
 #endif
-#ifdef EMBED_HTML
-               "EMBED_HTML "
-#endif
 #ifdef COLLECT_PERFDATA
                "PERFDATA "
-#endif
-#ifdef ACTIVATE_OTA
-               "OTA "
 #endif
                CR),
              CFG_APPVER, CFG_GITREV, LOG_LEVEL);
@@ -317,6 +311,13 @@ void PerfLogging::print() {
 void PerfLogging::pushInflux() {
   if (!myConfig.isInfluxDb2Active()) return;
 
+  if (myConfig.isInfluxSSL()) {
+    Log.warning(
+        F("PERF: InfluxDB2 with SSL is not supported when pushing performance "
+          "data, skipping" CR));
+    return;
+  }
+
   WiFiClient wifi;
   HTTPClient http;
   String serverPath =
@@ -387,7 +388,7 @@ void PerfLogging::pushInflux() {
   // Send HTTP POST request
   String auth = "Token " + String(myConfig.getInfluxDb2PushToken());
   http.addHeader(F("Authorization"), auth.c_str());
-  http.setTimeout(myHardwareConfig.getPushTimeout());
+  http.setTimeout(myAdvancedConfig.getPushTimeout());
   int httpResponseCode = http.POST(body);
 
   if (httpResponseCode == 204) {

src/main.cpp

@@ -32,11 +32,13 @@ SOFTWARE.
 #include <webserver.hpp>
 #include <wifi.hpp>
 
+// #define FORCE_GRAVITY_MODE
+
 // Define constats for this program
 #ifdef DEACTIVATE_SLEEPMODE
 const int interval = 1000;  // ms, time to wait between changes to output
 #else
-int interval = 200;  // ms, time to wait between changes to output
+int interval = 200;      // ms, time to wait between changes to output
 #endif
 bool sleepModeAlwaysSkip =
     false;  // Flag set in web interface to override normal behaviour
@@ -46,13 +48,8 @@ uint32_t runtimeMillis;   // Used to calculate the total time since start/wakeup
 uint32_t stableGyroMillis;  // Used to calculate the total time since last
                             // stable gyro reading
 
-enum RunMode { gravityMode = 0, configurationMode = 1, wifiSetupMode = 2 };
-
 RunMode runMode = RunMode::gravityMode;
 
-//
-// Check if we should be in sleep mode
-//
 void checkSleepMode(float angle, float volt) {
 #if defined(SKIP_SLEEPMODE)
   runMode = RunMode::configurationMode;
@@ -60,6 +57,12 @@ void checkSleepMode(float angle, float volt) {
   return;
 #endif
 
+#if defined(FORCE_GRAVITY_MODE)
+  Log.notice(F("MAIN: Forcing device into gravity mode for debugging" CR));
+  runMode = RunMode::gravityMode;
+  return;
+#endif
+
   const RawGyroData &g = myConfig.getGyroCalibration();
 
   if (!g.ax && !g.ay && !g.az && !g.gx && !g.gy && !g.gz) {
@@ -77,8 +80,12 @@ void checkSleepMode(float angle, float volt) {
     Log.notice(F("MAIN: Sleep mode disabled from web interface." CR));
 #endif
     runMode = RunMode::configurationMode;
-  } else if ((volt < 4.15 && (angle > 85 && angle < 95)) || (volt > 4.15)) {
+  } else if ((volt < myConfig.getVoltageConfig() &&
+              (angle > 85 && angle < 95)) ||
+             (volt > myConfig.getVoltageConfig())) {
     runMode = RunMode::configurationMode;
+  } else if (angle < 5 && myConfig.isStorageSleep()) {
+    runMode = RunMode::storageMode;
   } else {
     runMode = RunMode::gravityMode;
   }
@@ -98,12 +105,26 @@ void checkSleepMode(float angle, float volt) {
                  volt);
 #endif
       break;
+    case RunMode::storageMode:
+#if !defined(MAIN_DISABLE_LOGGING)
+      Log.notice(F("MAIN: run mode STORAGE (angle=%F)." CR), angle);
+#endif
+      break;
+  }
+
+  // If we are in storage mode, just go back to sleep
+  if (runMode == RunMode::storageMode) {
+    Log.notice(
+        F("Main: Storage mode entered, going to sleep for maximum time." CR));
+#if defined(ESP8266)
+    ESP.deepSleep(ESP.deepSleepMax());
+#else
+#warning "Check and test the max deep sleep for esp32"
+    deepSleep(70 * 60);  // quick search on internet suggest max time is 70 min
+#endif
   }
 }
 
-//
-// Setup
-//
 void setup() {
   LOG_PERF_START("run-time");
   LOG_PERF_START("main-setup");
@@ -138,7 +159,7 @@ void setup() {
   myConfig.checkFileSystem();
   myConfig.loadFile();
   myWifi.init();
-  myHardwareConfig.loadFile();
+  myAdvancedConfig.loadFile();
   LOG_PERF_STOP("main-config-load");
 
   // Setup watchdog
@@ -209,6 +230,7 @@ void setup() {
   switch (runMode) {
     case RunMode::configurationMode:
       if (myWifi.isConnected()) {
+        Log.notice(F("Main: Activating web server." CR));
 #if defined(ACTIVATE_OTA)
         LOG_PERF_START("main-wifi-ota");
         if (myWifi.checkFirmwareVersion()) myWifi.updateFirmware();
@@ -257,7 +279,12 @@ bool loopReadGravity() {
     LOG_PERF_STOP("loop-temp-read");
 
     float gravitySG = calculateGravity(angle, tempC);
-    float corrGravitySG = gravityTemperatureCorrectionC(gravitySG, tempC);
+    float corrGravitySG = gravityTemperatureCorrectionC(
+        gravitySG, tempC, myAdvancedConfig.getDefaultCalibrationTemp());
+
+    if (myConfig.isGravityTempAdj()) {
+      gravitySG = corrGravitySG;
+    }
 
 #if LOG_LEVEL == 6 && !defined(MAIN_DISABLE_LOGGING)
     Log.verbose(F("Main: Sensor values gyro angle=%F, temp=%FC, gravity=%F, "
@@ -268,6 +295,14 @@ bool loopReadGravity() {
     bool pushExpired = (abs((int32_t)(millis() - pushMillis)) >
                         (myConfig.getSleepInterval() * 1000));
 
+    if (myAdvancedConfig.isIgnoreLowAnges() &&
+        (angle < myConfig.getFormulaData().a[0])) {
+      Log.warning(
+          F("Main: Angle is lower than water, so we regard this as faulty and "
+            "dont send any data." CR));
+      pushExpired = false;
+    }
+
     if (pushExpired || runMode == RunMode::gravityMode) {
       pushMillis = millis();
       LOG_PERF_START("loop-push");
@@ -343,13 +378,15 @@ void goToSleep(int sleepInterval) {
   deepSleep(sleepInterval);
 }
 
-//
-// Main loops
-//
 void loop() {
   switch (runMode) {
+    case RunMode::storageMode:
+      // This point is never reached, just here to remove warning.
+      break;
+
     case RunMode::configurationMode:
-      myWebServerHandler.loop();
+      if (myWifi.isConnected()) myWebServerHandler.loop();
+
       myWifi.loop();
       loopGravityOnInterval();
 

src/main.hpp

@@ -29,6 +29,14 @@ SOFTWARE.
 #include <ArduinoLog.h>
 #include <stdlib.h>
 
+enum RunMode {
+  gravityMode = 0,
+  configurationMode = 1,
+  wifiSetupMode = 2,
+  storageMode = 3
+};
+extern RunMode runMode;
+
 #if defined(ESP8266)
 #include <LittleFS.h>
 #define ESP_RESET ESP.reset
@@ -38,13 +46,8 @@ SOFTWARE.
 #define PIN_LED 2
 // #define PIN_A0 A0
 #else  // defined (ESP32)
-#if defined(ESPRESSIF32_20)
-#include <LittleFS.h>
-#else
-#include <LITTLEFS.h>
-#define LittleFS LITTLEFS
-#endif
 #include <FS.h>
+#include <LittleFS.h>
 #define ESPhttpUpdate httpUpdate
 #define ESP_RESET ESP.restart
 #define ESP8266WebServer WebServer

src/pushtarget.cpp

@@ -32,59 +32,158 @@ SOFTWARE.
 #include <pushtarget.hpp>
 #include <wifi.hpp>
 
+#define PUSHINT_FILENAME "/push.dat"
+
+//
+// Decrease counters
+//
+void PushIntervalTracker::update(const int index, const int defaultValue) {
+  if (_counters[index] <= 0)
+    _counters[index] = defaultValue;
+  else
+    _counters[index]--;
+}
+
+//
+// Load data from file
+//
+void PushIntervalTracker::load() {
+  File intFile = LittleFS.open(PUSHINT_FILENAME, "r");
+
+  if (intFile) {
+    String line = intFile.readStringUntil('\n');
+    Log.notice(F("PUSH: Read interval tracker %s." CR), line.c_str());
+
+    char temp[80];
+    char *s, *p = &temp[0];
+    int i = 0;
+
+    snprintf(&temp[0], sizeof(temp), "%s", line.c_str());
+    while ((s = strtok_r(p, ":", &p)) != NULL) {
+      _counters[i++] = atoi(s);
+    }
+
+    intFile.close();
+  }
+
+#if !defined(PUSH_DISABLE_LOGGING)
+  Log.verbose(F("PUSH: Parsed trackers: %d:%d:%d:%d:%d." CR), _counters[0],
+              _counters[1], _counters[2], _counters[3], _counters[4]);
+#endif
+}
+
+//
+// Update and save counters
+//
+void PushIntervalTracker::save() {
+  update(0, myAdvancedConfig.getPushIntervalHttp1());
+  update(1, myAdvancedConfig.getPushIntervalHttp2());
+  update(2, myAdvancedConfig.getPushIntervalHttp3());
+  update(3, myAdvancedConfig.getPushIntervalInflux());
+  update(4, myAdvancedConfig.getPushIntervalMqtt());
+
+  // If this feature is disabled we skip saving the file
+  if (!myAdvancedConfig.isPushIntervalActive()) {
+#if !defined(PUSH_DISABLE_LOGGING)
+    Log.notice(F("PUSH: Variabled push interval disabled." CR));
+#endif
+    LittleFS.remove(PUSHINT_FILENAME);
+  } else {
+    Log.notice(
+        F("PUSH: Variabled push interval enabled, updating counters." CR));
+    File intFile = LittleFS.open(PUSHINT_FILENAME, "w");
+
+    if (intFile) {
+      // Format=http1:http2:http3:influx:mqtt
+      intFile.printf("%d:%d:%d:%d:%d\n", _counters[0], _counters[1],
+                     _counters[2], _counters[3], _counters[4]);
+      intFile.close();
+    }
+  }
+}
+
 //
 // Send the data to targets
 //
 void PushTarget::sendAll(float angle, float gravitySG, float corrGravitySG,
                          float tempC, float runTime) {
   printHeap("PUSH");
-  _http.setReuse(false);
-  _httpSecure.setReuse(false);
+  _http.setReuse(true);
+  _httpSecure.setReuse(true);
 
   TemplatingEngine engine;
   engine.initialize(angle, gravitySG, corrGravitySG, tempC, runTime);
 
-  if (myConfig.isBrewfatherActive()) {
-    LOG_PERF_START("push-brewfather");
-    sendBrewfather(engine);
-    LOG_PERF_STOP("push-brewfather");
-  }
+  PushIntervalTracker intDelay;
+  intDelay.load();
 
-  if (myConfig.isHttpActive()) {
+  if (myConfig.isHttpActive() && intDelay.useHttp1()) {
     LOG_PERF_START("push-http");
     sendHttpPost(engine, myConfig.isHttpSSL(), 0);
     LOG_PERF_STOP("push-http");
   }
 
-  if (myConfig.isHttp2Active()) {
+  if (myConfig.isHttp2Active() && intDelay.useHttp2()) {
     LOG_PERF_START("push-http2");
     sendHttpPost(engine, myConfig.isHttp2SSL(), 1);
     LOG_PERF_STOP("push-http2");
   }
 
-  if (myConfig.isHttp3Active()) {
+  if (myConfig.isHttp3Active() && intDelay.useHttp3()) {
     LOG_PERF_START("push-http3");
     sendHttpGet(engine, myConfig.isHttp3SSL());
     LOG_PERF_STOP("push-http3");
   }
 
-  if (myConfig.isInfluxDb2Active()) {
+  if (myConfig.isInfluxDb2Active() && intDelay.useInflux()) {
     LOG_PERF_START("push-influxdb2");
-    sendInfluxDb2(engine);
+    sendInfluxDb2(engine, myConfig.isInfluxSSL());
     LOG_PERF_STOP("push-influxdb2");
   }
 
-  if (myConfig.isMqttActive()) {
+  if (myConfig.isMqttActive() && intDelay.useMqtt()) {
     LOG_PERF_START("push-mqtt");
     sendMqtt(engine, myConfig.isMqttSSL());
     LOG_PERF_STOP("push-mqtt");
   }
+
+  intDelay.save();
+}
+
+//
+// Check if the server can reduce the buffer size to save memory (ESP8266 only)
+//
+void PushTarget::probeMaxFragement(String& serverPath) {
+#if defined(ESP8266)  // Looks like this is feature is not supported by influxdb
+  // Format: http:://servername:port/path
+  int port = 443;
+  String host = serverPath.substring(8);  // remove the prefix or the probe will
+                                          // fail, it needs a pure host name.
+  // Remove the path if it exist
+  int idx = host.indexOf("/");
+  if (idx != -1) host = host.substring(0, idx);
+
+  // If a server port is defined, lets extract that part
+  idx = host.indexOf(":");
+  if (idx != -1) {
+    String p = host.substring(idx + 1);
+    port = p.toInt();
+    host = host.substring(0, idx);
+  }
+
+  Log.notice(F("PUSH: Probing server to max fragment %s:%d" CR), host.c_str(),
+             port);
+  if (_wifiSecure.probeMaxFragmentLength(host, port, 512)) {
+    Log.notice(F("PUSH: Server supports smaller SSL buffer." CR));
+    _wifiSecure.setBufferSizes(512, 512);
+  }
+#endif
 }
 
 //
 // Send to influx db v2
 //
-void PushTarget::sendInfluxDb2(TemplatingEngine& engine) {
+void PushTarget::sendInfluxDb2(TemplatingEngine& engine, bool isSecure) {
 #if !defined(PUSH_DISABLE_LOGGING)
   Log.notice(F("PUSH: Sending values to influxdb2." CR));
 #endif
@@ -97,17 +196,37 @@ void PushTarget::sendInfluxDb2(TemplatingEngine& engine) {
       "&bucket=" + String(myConfig.getInfluxDb2PushBucket());
   String doc = engine.create(TemplatingEngine::TEMPLATE_INFLUX);
 
-  _http.begin(_wifi, serverPath);
-  _http.setTimeout(myHardwareConfig.getPushTimeout() * 1000);
-
 #if LOG_LEVEL == 6 && !defined(PUSH_DISABLE_LOGGING)
   Log.verbose(F("PUSH: url %s." CR), serverPath.c_str());
   Log.verbose(F("PUSH: data %s." CR), doc.c_str());
 #endif
 
   String auth = "Token " + String(myConfig.getInfluxDb2PushToken());
-  _http.addHeader(F("Authorization"), auth.c_str());
-  _lastCode = _http.POST(doc);
+
+  if (isSecure) {
+#if defined(ESP8266)
+    if (runMode == RunMode::configurationMode) {
+      Log.notice(
+          F("PUSH: Skipping InfluxDB since SSL is enabled and we are in config "
+            "mode." CR));
+      _lastCode = -100;
+      return;
+    }
+#endif
+
+    Log.notice(F("PUSH: InfluxDB, SSL enabled without validation." CR));
+    _wifiSecure.setInsecure();
+    probeMaxFragement(serverPath);
+    _httpSecure.setTimeout(myAdvancedConfig.getPushTimeout() * 1000);
+    _httpSecure.begin(_wifiSecure, serverPath);
+    _httpSecure.addHeader(F("Authorization"), auth.c_str());
+    _lastCode = _httpSecure.POST(doc);
+  } else {
+    _http.setTimeout(myAdvancedConfig.getPushTimeout() * 1000);
+    _http.begin(_wifi, serverPath);
+    _http.addHeader(F("Authorization"), auth.c_str());
+    _lastCode = _http.POST(doc);
+  }
 
   if (_lastCode == 204) {
     _lastSuccess = true;
@@ -117,52 +236,18 @@ void PushTarget::sendInfluxDb2(TemplatingEngine& engine) {
     errLog.addEntry("PUSH: Influxdb push failed response=" + String(_lastCode));
   }
 
-  _http.end();
-  _wifi.stop();
-  tcp_cleanup();
-}
-
-//
-// Send data to brewfather
-//
-void PushTarget::sendBrewfather(TemplatingEngine& engine) {
-#if !defined(PUSH_DISABLE_LOGGING)
-  Log.notice(F("PUSH: Sending values to brewfather" CR));
-#endif
-  _lastCode = 0;
-  _lastSuccess = false;
-
-  String serverPath = myConfig.getBrewfatherPushUrl();
-  String doc = engine.create(TemplatingEngine::TEMPLATE_BREWFATHER);
-
-  _http.begin(_wifi, serverPath);
-  _http.setTimeout(myHardwareConfig.getPushTimeout() * 1000);
-
-#if LOG_LEVEL == 6 && !defined(PUSH_DISABLE_LOGGING)
-  Log.verbose(F("PUSH: url %s." CR), serverPath.c_str());
-  Log.verbose(F("PUSH: json %s." CR), doc.c_str());
-#endif
-
-  _http.addHeader(F("Content-Type"), F("application/json"));
-  _lastCode = _http.POST(doc);
-
-  if (_lastCode == 200) {
-    _lastSuccess = true;
-    Log.notice(F("PUSH: Brewfather push successful, response=%d" CR),
-               _lastCode);
+  if (isSecure) {
+    _httpSecure.end();
+    _wifiSecure.stop();
   } else {
-    ErrorFileLog errLog;
-    errLog.addEntry("PUSH: Brewfather push failed response=" +
-                    String(_lastCode));
+    _http.end();
+    _wifi.stop();
   }
-
-  _http.end();
-  _wifi.stop();
   tcp_cleanup();
 }
 
 //
-//
+// Add HTTP header to request
 //
 void PushTarget::addHttpHeader(HTTPClient& http, String header) {
   if (!header.length()) return;
@@ -209,24 +294,21 @@ void PushTarget::sendHttpPost(TemplatingEngine& engine, bool isSecure,
 #endif
 
   if (isSecure) {
-    Log.notice(F("PUSH: HTTP, SSL enabled without validation." CR));
-    _wifiSecure.setInsecure();
-
 #if defined(ESP8266)
-    String host =
-        serverPath.substring(8);  // remove the prefix or the probe will fail,
-                                  // it needs a pure host name.
-    int idx = host.indexOf("/");
-    if (idx != -1) host = host.substring(0, idx);
-
-    if (_wifiSecure.probeMaxFragmentLength(host, 443, 512)) {
-      Log.notice(F("PUSH: HTTP server supports smaller SSL buffer." CR));
-      _wifiSecure.setBufferSizes(512, 512);
+    if (runMode == RunMode::configurationMode) {
+      Log.notice(
+          F("PUSH: Skipping HTTP since SSL is enabled and we are in config "
+            "mode." CR));
+      _lastCode = -100;
+      return;
     }
 #endif
 
+    Log.notice(F("PUSH: HTTP, SSL enabled without validation." CR));
+    _wifiSecure.setInsecure();
+    probeMaxFragement(serverPath);
+    _httpSecure.setTimeout(myAdvancedConfig.getPushTimeout() * 1000);
     _httpSecure.begin(_wifiSecure, serverPath);
-    _httpSecure.setTimeout(myHardwareConfig.getPushTimeout() * 1000);
 
     if (index == 0) {
       addHttpHeader(_httpSecure, myConfig.getHttpHeader(0));
@@ -238,8 +320,8 @@ void PushTarget::sendHttpPost(TemplatingEngine& engine, bool isSecure,
 
     _lastCode = _httpSecure.POST(doc);
   } else {
+    _http.setTimeout(myAdvancedConfig.getPushTimeout() * 1000);
     _http.begin(_wifi, serverPath);
-    _http.setTimeout(myHardwareConfig.getPushTimeout() * 1000);
 
     if (index == 0) {
       addHttpHeader(_http, myConfig.getHttpHeader(0));
@@ -291,28 +373,25 @@ void PushTarget::sendHttpGet(TemplatingEngine& engine, bool isSecure) {
 #endif
 
   if (isSecure) {
-    Log.notice(F("PUSH: HTTP, SSL enabled without validation." CR));
-    _wifiSecure.setInsecure();
-
 #if defined(ESP8266)
-    String host =
-        serverPath.substring(8);  // remove the prefix or the probe will fail,
-                                  // it needs a pure host name.
-    int idx = host.indexOf("/");
-    if (idx != -1) host = host.substring(0, idx);
-
-    if (_wifiSecure.probeMaxFragmentLength(host, 443, 512)) {
-      Log.notice(F("PUSH: HTTP server supports smaller SSL buffer." CR));
-      _wifiSecure.setBufferSizes(512, 512);
+    if (runMode == RunMode::configurationMode) {
+      Log.notice(
+          F("PUSH: Skipping HTTP since SSL is enabled and we are in config "
+            "mode." CR));
+      _lastCode = -100;
+      return;
     }
 #endif
 
+    Log.notice(F("PUSH: HTTP, SSL enabled without validation." CR));
+    _wifiSecure.setInsecure();
+    probeMaxFragement(serverPath);
+    _httpSecure.setTimeout(myAdvancedConfig.getPushTimeout() * 1000);
     _httpSecure.begin(_wifiSecure, serverPath);
-    _httpSecure.setTimeout(myHardwareConfig.getPushTimeout() * 1000);
     _lastCode = _httpSecure.GET();
   } else {
+    _http.setTimeout(myAdvancedConfig.getPushTimeout() * 1000);
     _http.begin(_wifi, serverPath);
-    _http.setTimeout(myHardwareConfig.getPushTimeout() * 1000);
     _lastCode = _http.GET();
   }
 
@@ -350,6 +429,16 @@ void PushTarget::sendMqtt(TemplatingEngine& engine, bool isSecure) {
   int port = myConfig.getMqttPort();
 
   if (myConfig.isMqttSSL()) {
+#if defined(ESP8266)
+    if (runMode == RunMode::configurationMode) {
+      Log.notice(
+          F("PUSH: Skipping MQTT since SSL is enabled and we are in config "
+            "mode." CR));
+      _lastCode = -100;
+      return;
+    }
+#endif
+
     Log.notice(F("PUSH: MQTT, SSL enabled without validation." CR));
     _wifiSecure.setInsecure();
 
@@ -360,8 +449,10 @@ void PushTarget::sendMqtt(TemplatingEngine& engine, bool isSecure) {
     }
 #endif
 
+    mqtt.setTimeout(myAdvancedConfig.getPushTimeout() * 1000);
     mqtt.begin(host.c_str(), port, _wifiSecure);
   } else {
+    mqtt.setTimeout(myAdvancedConfig.getPushTimeout() * 1000);
     mqtt.begin(host.c_str(), port, _wifi);
   }
 
@@ -373,9 +464,6 @@ void PushTarget::sendMqtt(TemplatingEngine& engine, bool isSecure) {
   Log.verbose(F("PUSH: data %s." CR), doc.c_str());
 #endif
 
-  // Send MQQT message(s)
-  mqtt.setTimeout(myHardwareConfig.getPushTimeout());  // 10 seconds timeout
-
   int lines = 1;
   // Find out how many lines are in the document. Each line is one
   // topic/message. | is used as new line.

src/pushtarget.hpp

@@ -45,12 +45,12 @@ class PushTarget {
   void sendHttpPost(TemplatingEngine& engine, bool isSecure, int index);
   void sendHttpGet(TemplatingEngine& engine, bool isSecure);
   void addHttpHeader(HTTPClient& http, String header);
+  void probeMaxFragement(String& serverPath);
 
  public:
   void sendAll(float angle, float gravitySG, float corrGravitySG, float tempC,
                float runTime);
 
-  void sendBrewfather(TemplatingEngine& engine);
   void sendHttp1(TemplatingEngine& engine, bool isSecure) {
     sendHttpPost(engine, isSecure, 0);
   }
@@ -60,12 +60,27 @@ class PushTarget {
   void sendHttp3(TemplatingEngine& engine, bool isSecure) {
     sendHttpGet(engine, isSecure);
   }
-  void sendInfluxDb2(TemplatingEngine& engine);
+  void sendInfluxDb2(TemplatingEngine& engine, bool isSecure);
   void sendMqtt(TemplatingEngine& engine, bool isSecure);
   int getLastCode() { return _lastCode; }
   bool getLastSuccess() { return _lastSuccess; }
 };
 
+class PushIntervalTracker {
+ private:
+  int _counters[5] = {0, 0, 0, 0, 0};
+  void update(const int index, const int defaultValue);
+
+ public:
+  bool useHttp1() { return _counters[0] == 0 ? true : false; }
+  bool useHttp2() { return _counters[1] == 0 ? true : false; }
+  bool useHttp3() { return _counters[2] == 0 ? true : false; }
+  bool useInflux() { return _counters[3] == 0 ? true : false; }
+  bool useMqtt() { return _counters[4] == 0 ? true : false; }
+  void load();
+  void save();
+};
+
 #endif  // SRC_PUSHTARGET_HPP_
 
 // EOF

src/resources.hpp

@@ -31,8 +31,9 @@ SOFTWARE.
 #define PARAM_OTA "ota-url"
 #define PARAM_SSID "wifi-ssid"
 #define PARAM_PASS "wifi-pass"
+#define PARAM_SSID2 "wifi-ssid2"
+#define PARAM_PASS2 "wifi-pass2"
 #define PARAM_RUNTIME_AVERAGE "runtime-average"
-#define PARAM_PUSH_BREWFATHER "brewfather-push"
 #define PARAM_TOKEN "token"
 #define PARAM_TOKEN2 "token2"
 #define PARAM_PUSH_HTTP "http-push"
@@ -52,13 +53,15 @@ SOFTWARE.
 #define PARAM_PUSH_MQTT_PORT "mqtt-port"
 #define PARAM_SLEEP_INTERVAL "sleep-interval"
 #define PARAM_TEMPFORMAT "temp-format"
-#define PARAM_VOLTAGEFACTOR "voltage-factor"
+#define PARAM_VOLTAGE_FACTOR "voltage-factor"
+#define PARAM_VOLTAGE_CONFIG "voltage-config"
 #define PARAM_GRAVITY_FORMULA "gravity-formula"
 #define PARAM_GRAVITY_FORMAT "gravity-format"
 #define PARAM_GRAVITY_TEMP_ADJ "gravity-temp-adjustment"
 #define PARAM_TEMP_ADJ "temp-adjustment-value"
 #define PARAM_GYRO_CALIBRATION "gyro-calibration-data"
 #define PARAM_GYRO_TEMP "gyro-temp"
+#define PARAM_STORAGE_SLEEP "storage-sleep"
 #define PARAM_FORMULA_DATA "formula-calculation-data"
 #define PARAM_FILES "files"
 #define PARAM_FILE_NAME "file-name"
@@ -76,16 +79,23 @@ SOFTWARE.
 #define PARAM_PLATFORM "platform"
 #define PARAM_BLE "ble"
 #define PARAM_HW_GYRO_READ_COUNT "gyro-read-count"
-#define PARAM_HW_GYRO_READ_DELAY "gyro-read-delay"
+// #define PARAM_HW_GYRO_READ_DELAY "gyro-read-delay"
 #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_TEMPSENSOR_RESOLUTION "tempsensor-resolution"
 #define PARAM_HW_PUSH_TIMEOUT "push-timeout"
+#define PARAM_HW_PUSH_INTERVAL_HTTP1 "int-http1"
+#define PARAM_HW_PUSH_INTERVAL_HTTP2 "int-http2"
+#define PARAM_HW_PUSH_INTERVAL_HTTP3 "int-http3"
+#define PARAM_HW_PUSH_INTERVAL_INFLUX "int-influx"
+#define PARAM_HW_PUSH_INTERVAL_MQTT "int-mqtt"
+#define PARAM_HW_IGNORE_LOW_ANGLES "ignore-low-angles"
 #define PARAM_FORMAT_HTTP1 "http-1"
 #define PARAM_FORMAT_HTTP2 "http-2"
 #define PARAM_FORMAT_HTTP3 "http-3"
-#define PARAM_FORMAT_BREWFATHER "brewfather"
 #define PARAM_FORMAT_INFLUXDB "influxdb"
 #define PARAM_FORMAT_MQTT "mqtt"
 #define PARAM_PUSH_FORMAT "format"

src/templating.cpp

@@ -42,7 +42,7 @@ const char iSpindleFormat[] PROGMEM =
     "\"gravity\": ${gravity}, "
     "\"angle\": ${angle}, "
     "\"battery\": ${battery}, "
-    "\"rssi\": ${rssi}, "
+    "\"RSSI\": ${rssi}, "
     "\"corr-gravity\": ${corr-gravity}, "
     "\"gravity-unit\": \"${gravity-unit}\", "
     "\"run-time\": ${run-time} "
@@ -64,24 +64,6 @@ const char iHttpGetFormat[] PROGMEM =
     "&gravity-unit=${gravity-unit}"
     "&run-time=${run-time}";
 
-const char brewfatherFormat[] PROGMEM =
-    "{"
-    "\"name\": \"${mdns}\","
-    "\"temp\": ${temp}, "
-    "\"aux_temp\": 0, "
-    "\"ext_temp\": 0, "
-    "\"temp_unit\": \"${temp-unit}\", "
-    "\"gravity\": ${gravity}, "
-    "\"gravity_unit\": \"${gravity-unit}\", "
-    "\"pressure\": 0, "
-    "\"pressure_unit\": \"PSI\", "
-    "\"ph\": 0, "
-    "\"bpm\": 0, "
-    "\"comment\": \"\", "
-    "\"beer\": \"\", "
-    "\"battery\": ${battery}"
-    "}";
-
 const char influxDbFormat[] PROGMEM =
     "measurement,host=${mdns},device=${id},temp-format=${temp-unit},gravity-"
     "format=${gravity-unit} "
@@ -148,6 +130,9 @@ void TemplatingEngine::initialize(float angle, float gravitySG,
   setVal(TPL_GRAVITY_CORR_P, convertToPlato(corrGravitySG), 1);
   setVal(TPL_GRAVITY_UNIT, myConfig.getGravityFormat());
 
+  setVal(TPL_APP_VER, CFG_APPVER);
+  setVal(TPL_APP_BUILD, CFG_GITREV);
+
 #if LOG_LEVEL == 6
   // dumpAll();
 #endif
@@ -174,10 +159,6 @@ const String& TemplatingEngine::create(TemplatingEngine::Templates idx) {
       baseTemplate = String(iHttpGetFormat);
       fname = TPL_FNAME_HTTP3;
       break;
-    case TEMPLATE_BREWFATHER:
-      baseTemplate = String(brewfatherFormat);
-      // fname = TPL_FNAME_BREWFATHER;
-      break;
     case TEMPLATE_INFLUX:
       baseTemplate = String(influxDbFormat);
       fname = TPL_FNAME_INFLUXDB;

src/templating.hpp

@@ -53,17 +53,17 @@ SOFTWARE.
 #define TPL_GRAVITY_CORR_G "${corr-gravity-sg}"
 #define TPL_GRAVITY_CORR_P "${corr-gravity-plato}"
 #define TPL_GRAVITY_UNIT "${gravity-unit}"  // G or P
+#define TPL_APP_VER "${app-ver}"
+#define TPL_APP_BUILD "${app-build}"
 
 #define TPL_FNAME_HTTP1 "/http-1.tpl"
 #define TPL_FNAME_HTTP2 "/http-2.tpl"
 #define TPL_FNAME_HTTP3 "/http-3.tpl"
-// #define TPL_FNAME_BREWFATHER "/brewfather.tpl"
 #define TPL_FNAME_INFLUXDB "/influxdb.tpl"
 #define TPL_FNAME_MQTT "/mqtt.tpl"
 
 extern const char iSpindleFormat[] PROGMEM;
 extern const char iHttpGetFormat[] PROGMEM;
-extern const char brewfatherFormat[] PROGMEM;
 extern const char influxDbFormat[] PROGMEM;
 extern const char mqttFormat[] PROGMEM;
 
@@ -75,7 +75,7 @@ class TemplatingEngine {
     String val;
   };
 
-  KeyVal items[21] = {{TPL_MDNS, ""},           {TPL_ID, ""},
+  KeyVal items[23] = {{TPL_MDNS, ""},           {TPL_ID, ""},
                       {TPL_SLEEP_INTERVAL, ""}, {TPL_TEMP, ""},
                       {TPL_TEMP_C, ""},         {TPL_TEMP_F, ""},
                       {TPL_TEMP_UNITS, ""},     {TPL_BATTERY, ""},
@@ -85,7 +85,8 @@ class TemplatingEngine {
                       {TPL_GRAVITY_P, ""},      {TPL_GRAVITY_CORR, ""},
                       {TPL_GRAVITY_CORR_G, ""}, {TPL_GRAVITY_CORR_P, ""},
                       {TPL_GRAVITY_UNIT, ""},   {TPL_TOKEN, ""},
-                      {TPL_TOKEN2, ""}};
+                      {TPL_TOKEN2, ""},         {TPL_APP_VER, ""},
+                      {TPL_APP_BUILD, ""}};
 
   char buffer[20];
   String baseTemplate;
@@ -133,9 +134,8 @@ class TemplatingEngine {
     TEMPLATE_HTTP1 = 0,
     TEMPLATE_HTTP2 = 1,
     TEMPLATE_HTTP3 = 2,
-    TEMPLATE_BREWFATHER = 3,
-    TEMPLATE_INFLUX = 4,
-    TEMPLATE_MQTT = 5
+    TEMPLATE_INFLUX = 3,
+    TEMPLATE_MQTT = 4
   };
 
   void initialize(float angle, float gravitySG, float corrGravitySG,

src/tempsensor.cpp

@@ -32,7 +32,6 @@ SOFTWARE.
 
 OneWire myOneWire(PIN_DS);
 DallasTemperature mySensors(&myOneWire);
-#define TEMPERATURE_PRECISION 9
 
 TempSensor myTempSensor;
 
@@ -52,10 +51,10 @@ void TempSensor::setup() {
 
   if (mySensors.getDS18Count()) {
 #if !defined(TSEN_DISABLE_LOGGING)
-    Log.notice(F("TSEN: Found %d temperature sensor(s)." CR),
-               mySensors.getDS18Count());
+    Log.notice(
+        F("TSEN: Found %d temperature sensor(s). Using %d resolution" CR),
+        mySensors.getDS18Count(), myAdvancedConfig.getTempSensorResolution());
 #endif
-    mySensors.setResolution(TEMPERATURE_PRECISION);
   }
 
   // Set the temp sensor adjustment values
@@ -95,6 +94,7 @@ float TempSensor::getValue(bool useGyro) {
   }
 
   // Read the sensors
+  mySensors.setResolution(myAdvancedConfig.getTempSensorResolution());
   mySensors.requestTemperatures();
 
   float c = 0;

src/webserver.cpp

@@ -44,10 +44,14 @@ void WebServerHandler::webHandleConfig() {
   LOG_PERF_START("webserver-api-config");
   Log.notice(F("WEB : webServer callback for /api/config(get)." CR));
 
-  DynamicJsonDocument doc(CFG_JSON_BUFSIZE);
+  DynamicJsonDocument doc(2000);
   myConfig.createJson(doc);
 
   doc[PARAM_PASS] = "";  // dont show the wifi password
+  doc[PARAM_PASS2] = "";
+
+  doc[PARAM_APP_VER] = String(CFG_APPVER);
+  doc[PARAM_APP_BUILD] = String(CFG_GITREV);
 
   double angle = 0;
 
@@ -63,13 +67,13 @@ void WebServerHandler::webHandleConfig() {
   if (myConfig.isTempF())
     // We want the delta value (32F = 0C).
     doc[PARAM_TEMP_ADJ] =
-        reduceFloatPrecision(convertCtoF(myConfig.getTempSensorAdjC())-32, 1); 
+        reduceFloatPrecision(convertCtoF(myConfig.getTempSensorAdjC()) - 32, 1);
   else
     doc[PARAM_TEMP_ADJ] = reduceFloatPrecision(myConfig.getTempSensorAdjC(), 1);
 
   if (myConfig.isGravityTempAdj()) {
-    gravity =
-        gravityTemperatureCorrectionC(gravity, tempC, myConfig.getTempFormat());
+    gravity = gravityTemperatureCorrectionC(
+        gravity, tempC, myAdvancedConfig.getDefaultCalibrationTemp());
   }
 
   if (myConfig.isGravityPlato()) {
@@ -96,8 +100,9 @@ void WebServerHandler::webHandleConfig() {
 #endif
 
   String out;
-  out.reserve(CFG_JSON_BUFSIZE);
+  out.reserve(2000);
   serializeJson(doc, out);
+  doc.clear();
   _server->send(200, "application/json", out.c_str());
   LOG_PERF_STOP("webserver-api-config");
 }
@@ -159,6 +164,7 @@ void WebServerHandler::webHandleUpload() {
   String out;
   out.reserve(300);
   serializeJson(doc, out);
+  doc.clear();
   _server->send(200, "application/json", out.c_str());
   LOG_PERF_STOP("webserver-api-upload");
 }
@@ -324,7 +330,7 @@ void WebServerHandler::webHandleStatus() {
   LOG_PERF_START("webserver-api-status");
   Log.notice(F("WEB : webServer callback for /api/status(get)." CR));
 
-  DynamicJsonDocument doc(300);
+  DynamicJsonDocument doc(500);
 
   double angle = 0;
 
@@ -336,7 +342,8 @@ void WebServerHandler::webHandleStatus() {
   doc[PARAM_ID] = myConfig.getID();
   doc[PARAM_ANGLE] = reduceFloatPrecision(angle);
   if (myConfig.isGravityTempAdj()) {
-    gravity = gravityTemperatureCorrectionC(gravity, tempC);
+    gravity = gravityTemperatureCorrectionC(
+        gravity, tempC, myAdvancedConfig.getDefaultCalibrationTemp());
   }
   if (myConfig.isGravityPlato()) {
     doc[PARAM_GRAVITY] = reduceFloatPrecision(convertToPlato(gravity), 1);
@@ -357,6 +364,7 @@ void WebServerHandler::webHandleStatus() {
   doc[PARAM_APP_VER] = CFG_APPVER;
   doc[PARAM_APP_BUILD] = CFG_GITREV;
   doc[PARAM_MDNS] = myConfig.getMDNS();
+  doc[PARAM_SSID] = WiFi.SSID();
 
   FloatHistoryLog runLog(RUNTIME_FILENAME);
   doc[PARAM_RUNTIME_AVERAGE] = reduceFloatPrecision(
@@ -374,8 +382,9 @@ void WebServerHandler::webHandleStatus() {
 #endif
 
   String out;
-  out.reserve(300);
+  out.reserve(500);
   serializeJson(doc, out);
+  doc.clear();
   _server->send(200, "application/json", out.c_str());
   LOG_PERF_STOP("webserver-api-status");
 }
@@ -390,8 +399,10 @@ void WebServerHandler::webHandleClearWIFI() {
   if (!id.compareTo(myConfig.getID())) {
     _server->send(200, "text/plain",
                   "Clearing WIFI credentials and doing reset...");
-    myConfig.setWifiPass("");
-    myConfig.setWifiSSID("");
+    myConfig.setWifiPass("", 0);
+    myConfig.setWifiSSID("", 0);
+    myConfig.setWifiPass("", 1);
+    myConfig.setWifiSSID("", 1);
     myConfig.saveFile();
     delay(1000);
     WiFi.disconnect();  // Clear credentials
@@ -498,8 +509,6 @@ void WebServerHandler::webHandleConfigPush() {
     myConfig.setHttp2Header(_server->arg(PARAM_PUSH_HTTP2_H2).c_str(), 1);
   if (_server->hasArg(PARAM_PUSH_HTTP3))
     myConfig.setHttp3Url(_server->arg(PARAM_PUSH_HTTP3).c_str());
-  if (_server->hasArg(PARAM_PUSH_BREWFATHER))
-    myConfig.setBrewfatherPushUrl(_server->arg(PARAM_PUSH_BREWFATHER).c_str());
   if (_server->hasArg(PARAM_PUSH_INFLUXDB2))
     myConfig.setInfluxDb2PushUrl(_server->arg(PARAM_PUSH_INFLUXDB2).c_str());
   if (_server->hasArg(PARAM_PUSH_INFLUXDB2_ORG))
@@ -574,6 +583,9 @@ void WebServerHandler::webHandleConfigGravity() {
     myConfig.setGravityTempAdj(
         _server->arg(PARAM_GRAVITY_TEMP_ADJ).equalsIgnoreCase("on") ? true
                                                                     : false);
+  else
+    myConfig.setGravityTempAdj(false);
+
   myConfig.saveFile();
   _server->sendHeader("Location", "/config.htm#collapseGravity", true);
   _server->send(302, "text/plain", "Gravity config updated");
@@ -600,8 +612,10 @@ void WebServerHandler::webHandleConfigHardware() {
   Log.verbose(F("WEB : %s." CR), getRequestArguments().c_str());
 #endif
 
-  if (_server->hasArg(PARAM_VOLTAGEFACTOR))
-    myConfig.setVoltageFactor(_server->arg(PARAM_VOLTAGEFACTOR).toFloat());
+  if (_server->hasArg(PARAM_VOLTAGE_FACTOR))
+    myConfig.setVoltageFactor(_server->arg(PARAM_VOLTAGE_FACTOR).toFloat());
+  if (_server->hasArg(PARAM_VOLTAGE_CONFIG))
+    myConfig.setVoltageConfig(_server->arg(PARAM_VOLTAGE_CONFIG).toFloat());
   if (_server->hasArg(PARAM_TEMP_ADJ)) {
     if (myConfig.isTempC()) {
       myConfig.setTempSensorAdjC(_server->arg(PARAM_TEMP_ADJ));
@@ -617,6 +631,15 @@ void WebServerHandler::webHandleConfigHardware() {
   if (_server->hasArg(PARAM_GYRO_TEMP))
     myConfig.setGyroTemp(
         _server->arg(PARAM_GYRO_TEMP).equalsIgnoreCase("on") ? true : false);
+  else
+    myConfig.setGyroTemp(false);
+  if (_server->hasArg(PARAM_STORAGE_SLEEP))
+    myConfig.setStorageSleep(
+        _server->arg(PARAM_STORAGE_SLEEP).equalsIgnoreCase("on") ? true
+                                                                 : false);
+  else
+    myConfig.setStorageSleep(false);
+
   myConfig.saveFile();
   _server->sendHeader("Location", "/config.htm#collapseHardware", true);
   _server->send(302, "text/plain", "Hardware config updated");
@@ -624,18 +647,18 @@ void WebServerHandler::webHandleConfigHardware() {
 }
 
 //
-// Update device parameters.
+// Update advanced settings.
 //
-void WebServerHandler::webHandleDeviceParam() {
-  LOG_PERF_START("webserver-api-device-param");
+void WebServerHandler::webHandleConfigAdvancedWrite() {
+  LOG_PERF_START("webserver-api-config-advanced");
   String id = _server->arg(PARAM_ID);
-  Log.notice(F("WEB : webServer callback for /api/device/param(post)." CR));
+  Log.notice(F("WEB : webServer callback for /api/config/advaced(post)." CR));
 
   if (!id.equalsIgnoreCase(myConfig.getID())) {
     Log.error(F("WEB : Wrong ID received %s, expected %s" CR), id.c_str(),
               myConfig.getID());
     _server->send(400, "text/plain", "Invalid ID.");
-    LOG_PERF_STOP("webserver-api-device-param");
+    LOG_PERF_STOP("webserver-api-config-advanced");
     return;
   }
 
@@ -643,41 +666,93 @@ void WebServerHandler::webHandleDeviceParam() {
   Log.verbose(F("WEB : %s." CR), getRequestArguments().c_str());
 #endif
 
-  for (int i = 0; i < _server->args(); i++) {
-    String s = _server->arg(i);
-
-    if (_server->argName(i).equalsIgnoreCase(PARAM_HW_GYRO_READ_COUNT))
-      myHardwareConfig.setGyroReadCount(s.toInt());
-    else if (_server->argName(i).equalsIgnoreCase(PARAM_HW_GYRO_READ_DELAY))
-      myHardwareConfig.setGyroReadDelay(s.toInt());
-    else if (_server->argName(i).equalsIgnoreCase(
-                 PARAM_HW_GYRO_MOVING_THREASHOLD))
-      myHardwareConfig.setGyroSensorMovingThreashold(s.toInt());
-    else if (_server->argName(i).equalsIgnoreCase(PARAM_HW_FORMULA_DEVIATION))
-      myHardwareConfig.setMaxFormulaCreationDeviation(s.toFloat());
-    else if (_server->argName(i).equalsIgnoreCase(
-                 PARAM_HW_FORMULA_CALIBRATION_TEMP))
-      myHardwareConfig.SetDefaultCalibrationTemp(s.toFloat());
-    else if (_server->argName(i).equalsIgnoreCase(PARAM_HW_WIFI_PORTALTIMEOUT))
-      myHardwareConfig.setWifiPortalTimeout(s.toInt());
-    else if (_server->argName(i).equalsIgnoreCase(PARAM_HW_PUSH_TIMEOUT))
-      myHardwareConfig.setPushTimeout(s.toInt());
+  if (_server->hasArg(PARAM_HW_GYRO_READ_COUNT))
+    myAdvancedConfig.setGyroReadCount(
+        _server->arg(PARAM_HW_GYRO_READ_COUNT).toInt());
+  // if (_server->hasArg(PARAM_HW_GYRO_READ_DELAY))
+  //  myAdvancedConfig.setGyroReadDelay(
+  //      _server->arg(PARAM_HW_GYRO_READ_DELAY).toInt());
+  if (_server->hasArg(PARAM_HW_GYRO_MOVING_THREASHOLD))
+    myAdvancedConfig.setGyroSensorMovingThreashold(
+        _server->arg(PARAM_HW_GYRO_MOVING_THREASHOLD).toInt());
+  if (_server->hasArg(PARAM_HW_FORMULA_DEVIATION))
+    myAdvancedConfig.setMaxFormulaCreationDeviation(
+        _server->arg(PARAM_HW_FORMULA_DEVIATION).toFloat());
+  if (_server->hasArg(PARAM_HW_FORMULA_CALIBRATION_TEMP)) {
+    float t = _server->arg(PARAM_HW_FORMULA_CALIBRATION_TEMP).toFloat();
+    if (myConfig.isTempF()) t = convertFtoC(t);
+    myAdvancedConfig.SetDefaultCalibrationTemp(t);
   }
+  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))
+    myAdvancedConfig.setPushIntervalHttp1(
+        _server->arg(PARAM_HW_PUSH_INTERVAL_HTTP1).toInt());
+  if (_server->hasArg(PARAM_HW_PUSH_INTERVAL_HTTP2))
+    myAdvancedConfig.setPushIntervalHttp2(
+        _server->arg(PARAM_HW_PUSH_INTERVAL_HTTP2).toInt());
+  if (_server->hasArg(PARAM_HW_PUSH_INTERVAL_HTTP3))
+    myAdvancedConfig.setPushIntervalHttp3(
+        _server->arg(PARAM_HW_PUSH_INTERVAL_HTTP3).toInt());
+  if (_server->hasArg(PARAM_HW_PUSH_INTERVAL_INFLUX))
+    myAdvancedConfig.setPushIntervalInflux(
+        _server->arg(PARAM_HW_PUSH_INTERVAL_INFLUX).toInt());
+  if (_server->hasArg(PARAM_HW_PUSH_INTERVAL_MQTT))
+    myAdvancedConfig.setPushIntervalMqtt(
+        _server->arg(PARAM_HW_PUSH_INTERVAL_MQTT).toInt());
+  if (_server->hasArg(PARAM_HW_TEMPSENSOR_RESOLUTION))
+    myAdvancedConfig.setTempSensorResolution(
+        _server->arg(PARAM_HW_TEMPSENSOR_RESOLUTION).toInt());
+  if (_server->hasArg(PARAM_HW_IGNORE_LOW_ANGLES))
+    myAdvancedConfig.setIgnoreLowAnges(
+        _server->arg(PARAM_HW_IGNORE_LOW_ANGLES).equalsIgnoreCase("on")
+            ? true
+            : false);
+  else
+    myAdvancedConfig.setIgnoreLowAnges(false);
 
-  myHardwareConfig.saveFile();
+  myAdvancedConfig.saveFile();
+  _server->sendHeader("Location", "/config.htm#collapseAdvanced", true);
+  _server->send(302, "text/plain", "Advanced config updated");
+  LOG_PERF_STOP("webserver-api-config-advanced");
+}
 
-  // Return the current configuration.
-  DynamicJsonDocument doc(512);
+//
+// Read advanced settings
+//
+void WebServerHandler::webHandleConfigAdvancedRead() {
+  LOG_PERF_START("webserver-api-config-advanced");
+  Log.notice(F("WEB : webServer callback for /api/config/advanced(get)." CR));
 
-  doc[PARAM_HW_GYRO_READ_COUNT] = myHardwareConfig.getGyroReadCount();
-  doc[PARAM_HW_GYRO_READ_DELAY] = myHardwareConfig.getGyroReadDelay();
+  DynamicJsonDocument doc(500);
+
+  doc[PARAM_HW_GYRO_READ_COUNT] = myAdvancedConfig.getGyroReadCount();
+  // doc[PARAM_HW_GYRO_READ_DELAY] = myAdvancedConfig.getGyroReadDelay();
   doc[PARAM_HW_GYRO_MOVING_THREASHOLD] =
-      myHardwareConfig.getGyroSensorMovingThreashold();
+      myAdvancedConfig.getGyroSensorMovingThreashold();
   doc[PARAM_HW_FORMULA_DEVIATION] =
-      myHardwareConfig.getMaxFormulaCreationDeviation();
-  doc[PARAM_HW_WIFI_PORTALTIMEOUT] = myHardwareConfig.getWifiPortalTimeout();
+      myAdvancedConfig.getMaxFormulaCreationDeviation();
+  doc[PARAM_HW_WIFI_PORTAL_TIMEOUT] = myAdvancedConfig.getWifiPortalTimeout();
+  doc[PARAM_HW_WIFI_CONNECT_TIMEOUT] = myAdvancedConfig.getWifiConnectTimeout();
+  doc[PARAM_HW_PUSH_TIMEOUT] = myAdvancedConfig.getPushTimeout();
+  float t = myAdvancedConfig.getDefaultCalibrationTemp();
   doc[PARAM_HW_FORMULA_CALIBRATION_TEMP] =
-      myHardwareConfig.getDefaultCalibrationTemp();
+      myConfig.isTempC() ? t : reduceFloatPrecision(convertCtoF(t), 1);
+  doc[PARAM_HW_PUSH_INTERVAL_HTTP1] = myAdvancedConfig.getPushIntervalHttp1();
+  doc[PARAM_HW_PUSH_INTERVAL_HTTP2] = myAdvancedConfig.getPushIntervalHttp2();
+  doc[PARAM_HW_PUSH_INTERVAL_HTTP3] = myAdvancedConfig.getPushIntervalHttp3();
+  doc[PARAM_HW_PUSH_INTERVAL_INFLUX] = myAdvancedConfig.getPushIntervalInflux();
+  doc[PARAM_HW_PUSH_INTERVAL_MQTT] = myAdvancedConfig.getPushIntervalMqtt();
+  doc[PARAM_HW_TEMPSENSOR_RESOLUTION] =
+      myAdvancedConfig.getTempSensorResolution();
+  doc[PARAM_HW_IGNORE_LOW_ANGLES] = myAdvancedConfig.isIgnoreLowAnges();
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
   serializeJson(doc, Serial);
@@ -685,10 +760,11 @@ void WebServerHandler::webHandleDeviceParam() {
 #endif
 
   String out;
-  out.reserve(512);
+  out.reserve(500);
   serializeJson(doc, out);
+  doc.clear();
   _server->send(200, "application/json", out.c_str());
-  LOG_PERF_STOP("webserver-api-device-param");
+  LOG_PERF_STOP("webserver-api-config-advanced");
 }
 
 //
@@ -698,7 +774,7 @@ void WebServerHandler::webHandleFormulaRead() {
   LOG_PERF_START("webserver-api-formula-read");
   Log.notice(F("WEB : webServer callback for /api/formula(get)." CR));
 
-  DynamicJsonDocument doc(250);
+  DynamicJsonDocument doc(500);
   const RawFormulaData& fd = myConfig.getFormulaData();
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
@@ -716,10 +792,13 @@ void WebServerHandler::webHandleFormulaRead() {
       doc[PARAM_ERROR] = "Internal error creating formula.";
       break;
     case ERR_FORMULA_NOTENOUGHVALUES:
-      doc[PARAM_ERROR] = "Not enough values to create formula.";
+      doc[PARAM_ERROR] =
+          "Not enough values to create formula, need at least 3 angles.";
       break;
     case ERR_FORMULA_UNABLETOFFIND:
-      doc[PARAM_ERROR] = "Unable to find an accurate formula based on input.";
+      doc[PARAM_ERROR] =
+          "Unable to find an accurate formula based on input, check error log "
+          "and graph below.";
       break;
     default:
       doc[PARAM_GRAVITY_FORMULA] = myConfig.getGravityFormula();
@@ -731,6 +810,11 @@ void WebServerHandler::webHandleFormulaRead() {
   doc["a3"] = reduceFloatPrecision(fd.a[2], 2);
   doc["a4"] = reduceFloatPrecision(fd.a[3], 2);
   doc["a5"] = reduceFloatPrecision(fd.a[4], 2);
+  doc["a6"] = reduceFloatPrecision(fd.a[5], 2);
+  doc["a7"] = reduceFloatPrecision(fd.a[6], 2);
+  doc["a8"] = reduceFloatPrecision(fd.a[7], 2);
+  doc["a9"] = reduceFloatPrecision(fd.a[8], 2);
+  doc["a10"] = reduceFloatPrecision(fd.a[9], 2);
 
   if (myConfig.isGravityPlato()) {
     doc["g1"] = reduceFloatPrecision(convertToPlato(fd.g[0]), 1);
@@ -738,12 +822,22 @@ void WebServerHandler::webHandleFormulaRead() {
     doc["g3"] = reduceFloatPrecision(convertToPlato(fd.g[2]), 1);
     doc["g4"] = reduceFloatPrecision(convertToPlato(fd.g[3]), 1);
     doc["g5"] = reduceFloatPrecision(convertToPlato(fd.g[4]), 1);
+    doc["g6"] = reduceFloatPrecision(convertToPlato(fd.g[5]), 1);
+    doc["g7"] = reduceFloatPrecision(convertToPlato(fd.g[6]), 1);
+    doc["g8"] = reduceFloatPrecision(convertToPlato(fd.g[7]), 1);
+    doc["g9"] = reduceFloatPrecision(convertToPlato(fd.g[8]), 1);
+    doc["g10"] = reduceFloatPrecision(convertToPlato(fd.g[9]), 1);
   } else {
     doc["g1"] = reduceFloatPrecision(fd.g[0], 4);
     doc["g2"] = reduceFloatPrecision(fd.g[1], 4);
     doc["g3"] = reduceFloatPrecision(fd.g[2], 4);
     doc["g4"] = reduceFloatPrecision(fd.g[3], 4);
     doc["g5"] = reduceFloatPrecision(fd.g[4], 4);
+    doc["g6"] = reduceFloatPrecision(fd.g[5], 4);
+    doc["g7"] = reduceFloatPrecision(fd.g[6], 4);
+    doc["g8"] = reduceFloatPrecision(fd.g[7], 4);
+    doc["g9"] = reduceFloatPrecision(fd.g[8], 4);
+    doc["g10"] = reduceFloatPrecision(fd.g[9], 4);
   }
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
@@ -752,8 +846,9 @@ void WebServerHandler::webHandleFormulaRead() {
 #endif
 
   String out;
-  out.reserve(256);
+  out.reserve(500);
   serializeJson(doc, out);
+  doc.clear();
   _server->send(200, "application/json", out.c_str());
   LOG_PERF_STOP("webserver-api-formula-read");
 }
@@ -792,10 +887,6 @@ void WebServerHandler::webHandleConfigFormatWrite() {
   } else if (_server->hasArg(PARAM_FORMAT_MQTT)) {
     success = writeFile(TPL_FNAME_MQTT, _server->arg(PARAM_FORMAT_MQTT));
   }
-  /*else if (_server->hasArg(PARAM_FORMAT_BREWFATHER)) {
-    success = writeFile(TPL_FNAME_BREWFATHER,
-  _server->arg(PARAM_FORMAT_BREWFATHER));
-  }*/
 
   if (success) {
     _server->sendHeader("Location", "/format.htm", true);
@@ -832,7 +923,8 @@ void WebServerHandler::webHandleTestPush() {
   float angle = myGyro.getAngle();
   float tempC = myTempSensor.getTempC(myConfig.isGyroTemp());
   float gravitySG = calculateGravity(angle, tempC);
-  float corrGravitySG = gravityTemperatureCorrectionC(gravitySG, tempC);
+  float corrGravitySG = gravityTemperatureCorrectionC(
+      gravitySG, tempC, myAdvancedConfig.getDefaultCalibrationTemp());
 
   TemplatingEngine engine;
   engine.initialize(angle, gravitySG, corrGravitySG, tempC, 2.1);
@@ -841,11 +933,7 @@ void WebServerHandler::webHandleTestPush() {
   PushTarget push;
   bool enabled = false;
 
-  if (!type.compareTo(PARAM_FORMAT_BREWFATHER) &&
-      myConfig.isBrewfatherActive()) {
-    push.sendBrewfather(engine);
-    enabled = true;
-  } else if (!type.compareTo(PARAM_FORMAT_HTTP1) && myConfig.isHttpActive()) {
+  if (!type.compareTo(PARAM_FORMAT_HTTP1) && myConfig.isHttpActive()) {
     push.sendHttp1(engine, myConfig.isHttpSSL());
     enabled = true;
   } else if (!type.compareTo(PARAM_FORMAT_HTTP2) && myConfig.isHttp2Active()) {
@@ -856,7 +944,7 @@ void WebServerHandler::webHandleTestPush() {
     enabled = true;
   } else if (!type.compareTo(PARAM_FORMAT_INFLUXDB) &&
              myConfig.isInfluxDb2Active()) {
-    push.sendInfluxDb2(engine);
+    push.sendInfluxDb2(engine, myConfig.isInfluxSSL());
     enabled = true;
   } else if (!type.compareTo(PARAM_FORMAT_MQTT) && myConfig.isMqttActive()) {
     push.sendMqtt(engine, myConfig.isMqttSSL());
@@ -871,6 +959,7 @@ void WebServerHandler::webHandleTestPush() {
   String out;
   out.reserve(100);
   serializeJson(doc, out);
+  doc.clear();
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
   serializeJson(doc, Serial);
@@ -933,7 +1022,7 @@ void WebServerHandler::webHandleConfigFormatRead() {
   LOG_PERF_START("webserver-api-config-format-read");
   Log.notice(F("WEB : webServer callback for /api/config/formula(get)." CR));
 
-  DynamicJsonDocument doc(2048);
+  DynamicJsonDocument doc(5000);
 
   doc[PARAM_ID] = myConfig.getID();
 
@@ -955,12 +1044,6 @@ void WebServerHandler::webHandleConfigFormatRead() {
   else
     doc[PARAM_FORMAT_HTTP3] = urlencode(String(&iHttpGetFormat[0]));
 
-  /*s = readFile(TPL_FNAME_BREWFATHER);
-  if (s.length())
-    doc[PARAM_FORMAT_BREWFATHER] = urlencode(s);
-  else
-    doc[PARAM_FORMAT_BREWFATHER] = urlencode(&brewfatherFormat[0]);*/
-
   s = readFile(TPL_FNAME_INFLUXDB);
   if (s.length())
     doc[PARAM_FORMAT_INFLUXDB] = urlencode(s);
@@ -979,8 +1062,9 @@ void WebServerHandler::webHandleConfigFormatRead() {
 #endif
 
   String out;
-  out.reserve(2048);
+  out.reserve(3000);
   serializeJson(doc, out);
+  doc.clear();
   _server->send(200, "application/json", out.c_str());
   LOG_PERF_STOP("webserver-api-config-format-read");
 }
@@ -1011,6 +1095,11 @@ void WebServerHandler::webHandleFormulaWrite() {
   fd.a[2] = _server->arg("a3").toDouble();
   fd.a[3] = _server->arg("a4").toDouble();
   fd.a[4] = _server->arg("a5").toDouble();
+  fd.a[5] = _server->arg("a6").toDouble();
+  fd.a[6] = _server->arg("a7").toDouble();
+  fd.a[7] = _server->arg("a8").toDouble();
+  fd.a[8] = _server->arg("a9").toDouble();
+  fd.a[9] = _server->arg("a10").toDouble();
 
   if (myConfig.isGravityPlato()) {
     fd.g[0] = convertToSG(_server->arg("g1").toDouble());
@@ -1018,14 +1107,25 @@ void WebServerHandler::webHandleFormulaWrite() {
     fd.g[2] = convertToSG(_server->arg("g3").toDouble());
     fd.g[3] = convertToSG(_server->arg("g4").toDouble());
     fd.g[4] = convertToSG(_server->arg("g5").toDouble());
+    fd.g[5] = convertToSG(_server->arg("g6").toDouble());
+    fd.g[6] = convertToSG(_server->arg("g7").toDouble());
+    fd.g[7] = convertToSG(_server->arg("g8").toDouble());
+    fd.g[8] = convertToSG(_server->arg("g9").toDouble());
+    fd.g[9] = convertToSG(_server->arg("g10").toDouble());
   } else {
     fd.g[0] = _server->arg("g1").toDouble();
     fd.g[1] = _server->arg("g2").toDouble();
     fd.g[2] = _server->arg("g3").toDouble();
     fd.g[3] = _server->arg("g4").toDouble();
     fd.g[4] = _server->arg("g5").toDouble();
+    fd.g[5] = _server->arg("g6").toDouble();
+    fd.g[6] = _server->arg("g7").toDouble();
+    fd.g[7] = _server->arg("g8").toDouble();
+    fd.g[8] = _server->arg("g9").toDouble();
+    fd.g[9] = _server->arg("g10").toDouble();
   }
 
+  fd.g[0] = 1;  // force first point to SG gravity of water
   myConfig.setFormulaData(fd);
 
   int e;
@@ -1071,17 +1171,17 @@ const char* WebServerHandler::getHtmlFileName(HtmlFile item) {
   Log.notice(F("WEB : Looking up filename for %d." CR), item);
 
   switch (item) {
-    case HTML_INDEX:
+    case HtmlFile::HTML_INDEX:
       return "index.min.htm";
-    case HTML_CONFIG:
+    case HtmlFile::HTML_CONFIG:
       return "config.min.htm";
-    case HTML_CALIBRATION:
+    case HtmlFile::HTML_CALIBRATION:
       return "calibration.min.htm";
-    case HTML_FORMAT:
+    case HtmlFile::HTML_FORMAT:
       return "format.min.htm";
-    case HTML_ABOUT:
+    case HtmlFile::HTML_ABOUT:
       return "about.min.htm";
-    case HTML_TEST:
+    case HtmlFile::HTML_TEST:
       return "test.min.htm";
   }
 
@@ -1123,6 +1223,37 @@ bool WebServerHandler::setupWebServer() {
   MDNS.begin(myConfig.getMDNS());
   MDNS.addService("http", "tcp", 80);
 
+  // Show files in the filessytem at startup
+#if defined(ESP8266)
+  FSInfo fs;
+  LittleFS.info(fs);
+  Log.notice(F("WEB : File system Total=%d, Used=%d." CR), fs.totalBytes,
+             fs.usedBytes);
+  Dir dir = LittleFS.openDir("/");
+  while (dir.next()) {
+    Log.notice(F("WEB : File=%s, %d bytes" CR), dir.fileName().c_str(),
+               dir.fileSize());
+    if (!dir.fileSize()) {
+      Log.notice(F("WEB : Empty file detected, removing file." CR));
+      LittleFS.remove(dir.fileName().c_str());
+    }
+  }
+#else  // defined( ESP32 )
+  File root = LittleFS.open("/");
+  File f = root.openNextFile();
+  while (f) {
+    Log.notice(F("WEB : File=%s, %d bytes" CR), f.name(), f.size());
+    if (!f.size()) {
+      Log.notice(F("WEB : Empty file detected, removing file." CR));
+      LittleFS.remove(f.name());
+    }
+
+    f = root.openNextFile();
+  }
+  f.close();
+  root.close();
+#endif
+
   // Static content
 #if defined(EMBED_HTML)
   _server->on("/", std::bind(&WebServerHandler::webReturnIndexHtm, this));
@@ -1139,18 +1270,6 @@ bool WebServerHandler::setupWebServer() {
   _server->on("/test.htm",
               std::bind(&WebServerHandler::webReturnTestHtm, this));
 #else
-  // Show files in the filessytem at startup
-
-  FSInfo fs;
-  LittleFS.info(fs);
-  Log.notice(F("WEB : File system Total=%d, Used=%d." CR), fs.totalBytes,
-             fs.usedBytes);
-  Dir dir = LittleFS.openDir("/");
-  while (dir.next()) {
-    Log.notice(F("WEB : File=%s, %d bytes" CR), dir.fileName().c_str(),
-               dir.fileSize());
-  }
-
   // Check if the html files exist, if so serve them, else show the static
   // upload page.
   if (checkHtmlFile(HTML_INDEX) && checkHtmlFile(HTML_CONFIG) &&
@@ -1231,9 +1350,12 @@ bool WebServerHandler::setupWebServer() {
   _server->on("/api/config/format", HTTP_POST,
               std::bind(&WebServerHandler::webHandleConfigFormatWrite,
                         this));  // Change template formats
-  _server->on("/api/device/param", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleDeviceParam,
-                        this));  // Change device params
+  _server->on("/api/config/advanced", HTTP_GET,
+              std::bind(&WebServerHandler::webHandleConfigAdvancedRead,
+                        this));  // Read advanced settings
+  _server->on("/api/config/advanced", HTTP_POST,
+              std::bind(&WebServerHandler::webHandleConfigAdvancedWrite,
+                        this));  // Change advanced params
   _server->on("/api/test/push", HTTP_GET,
               std::bind(&WebServerHandler::webHandleTestPush,
                         this));  //

src/webserver.hpp

@@ -28,12 +28,12 @@ SOFTWARE.
 #include <ESP8266WebServer.h>
 #include <ESP8266WiFi.h>
 #include <ESP8266mDNS.h>
-#define MAX_SKETCH_SPACE 1044464  
+#define MAX_SKETCH_SPACE 1044464
 #else  // defined (ESP32)
 #include <ESPmDNS.h>
+#include <Update.h>
 #include <WebServer.h>
 #include <WiFi.h>
-#include <Update.h>
 #define MAX_SKETCH_SPACE 1835008
 #endif
 #include <incbin.h>
@@ -60,6 +60,8 @@ class WebServerHandler {
   void webHandleConfig();
   void webHandleFormulaWrite();
   void webHandleFormulaRead();
+  void webHandleConfigAdvancedRead();
+  void webHandleConfigAdvancedWrite();
   void webHandleConfigHardware();
   void webHandleConfigGravity();
   void webHandleConfigPush();
@@ -74,7 +76,6 @@ class WebServerHandler {
   void webHandleCalibrate();
   void webHandleUploadFile();
   void webHandleUpload();
-  void webHandleDeviceParam();
   void webHandlePageNotFound();
 
   String readFile(String fname);

src/wifi.cpp

@@ -52,20 +52,8 @@ SOFTWARE.
 #define USE_STATIC_IP_CONFIG_IN_CP false
 #define _WIFIMGR_LOGLEVEL_ 3
 #include <ESP_WiFiManager.h>
-// Override the look and feel of the standard ui (hide secondary forms)
-const char WM_HTTP_FORM_START[] PROGMEM =
-    "<form method='get' "
-    "action='wifisave'><fieldset><div><label>SSID</label><input id='s' "
-    "name='s' length=32 "
-    "placeholder='SSID'><div></div></div><div><label>Password</label><input "
-    "id='p' name='p' length=64 placeholder='password'><div></div></div><div "
-    "hidden><label>SSID1</label><input id='s1' name='s1' length=32 "
-    "placeholder='SSID1'><div></div></div><div "
-    "hidden><label>Password</label><input id='p1' name='p1' length=64 "
-    "placeholder='password1'><div></div></div></fieldset>";
 ESP_WiFiManager *myWifiManager;
 DoubleResetDetector *myDRD;
-
 WifiConnection myWifi;
 
 const char *userSSID = USER_SSID;
@@ -82,21 +70,25 @@ void WifiConnection::init() {
 // Check if we have a valid wifi configuration
 //
 bool WifiConnection::hasConfig() {
-  if (strlen(myConfig.getWifiSSID())) return true;
+  if (strlen(myConfig.getWifiSSID(0))) return true;
   if (strlen(userSSID)) return true;
 
-  // Check if there are stored WIFI Settings we can use.
+    // Check if there are stored WIFI Settings we can use.
+#if defined(ESP8266)
   String ssid = WiFi.SSID();
   if (ssid.length()) {
     Log.notice(F("WIFI: Found credentials in EEPORM." CR));
-    myConfig.setWifiSSID(ssid);
+    myConfig.setWifiSSID(ssid, 0);
+
+    if (WiFi.psk().length()) myConfig.setWifiPass(WiFi.psk(), 0);
 
-    if (WiFi.psk().length()) 
-      myConfig.setWifiPass(WiFi.psk());
-    
     myConfig.saveFile();
     return true;
   }
+#else  // defined( ESP32 )
+#warning "Cant read SSID property on ESP32 until a connection has been made!"
+#endif
+
   return false;
 }
 
@@ -137,7 +129,7 @@ void WifiConnection::startPortal() {
   myWifiManager->setMinimumSignalQuality(-1);
   myWifiManager->setConfigPortalChannel(0);
   myWifiManager->setConfigPortalTimeout(
-      myHardwareConfig.getWifiPortalTimeout());
+      myAdvancedConfig.getWifiPortalTimeout());
 
   String mdns("<p>Default mDNS name is: http://");
   mdns += myConfig.getMDNS();
@@ -145,21 +137,29 @@ void WifiConnection::startPortal() {
   ESP_WMParameter deviceName(mdns.c_str());
   myWifiManager->addParameter(&deviceName);
 
-  if (myWifiManager->startConfigPortal(WIFI_DEFAULT_SSID, WIFI_DEFAULT_PWD)) {
-    Log.notice(F("WIFI: Exited portal, connected to wifi. Rebooting..." CR));
+  myWifiManager->startConfigPortal(WIFI_DEFAULT_SSID, WIFI_DEFAULT_PWD);
 
-    if (myWifiManager->getSSID().length())
-      myConfig.setWifiSSID(myWifiManager->getSSID());
-  
-    if (myWifiManager->getPW().length())
-      myConfig.setWifiPass(myWifiManager->getPW());
+  if (myWifiManager->getSSID(0).length()) {
+    myConfig.setWifiSSID(myWifiManager->getSSID(0), 0);
+    myConfig.setWifiPass(myWifiManager->getPW(0), 0);
+    myConfig.setWifiSSID(myWifiManager->getSSID(1), 1);
+    myConfig.setWifiPass(myWifiManager->getPW(1), 1);
 
+    // If the same SSID has been used, lets delete the second
+    if (!strcmp(myConfig.getWifiSSID(0), myConfig.getWifiSSID(1))) {
+      myConfig.setWifiSSID("", 1);
+      myConfig.setWifiPass("", 1);
+    }
+
+    Log.notice(F("WIFI: Stored SSID1:'%s' SSID2:'%s'" CR),
+               myConfig.getWifiSSID(0), myConfig.getWifiSSID(1));
     myConfig.saveFile();
   } else {
     Log.notice(
-        F("WIFI: Exited portal, no connection to wifi. Rebooting..." CR));
+        F("WIFI: Could not find first SSID so assuming we got a timeout." CR));
   }
 
+  Log.notice(F("WIFI: Exited wifi config portal. Rebooting..." CR));
   stopDoubleReset();
   delay(500);
   ESP_RESET();
@@ -173,7 +173,7 @@ void WifiConnection::loop() { myDRD->loop(); }
 //
 // Connect to last known access point, non blocking mode.
 //
-void WifiConnection::connectAsync() {
+void WifiConnection::connectAsync(int wifiIndex) {
   WiFi.persistent(true);
   WiFi.mode(WIFI_STA);
   if (strlen(userSSID)) {
@@ -181,9 +181,10 @@ void WifiConnection::connectAsync() {
                userSSID);
     WiFi.begin(userSSID, userPWD);
   } else {
-    Log.notice(F("WIFI: Connecting to wifi using stored settings %s." CR),
-               myConfig.getWifiSSID());
-    WiFi.begin(myConfig.getWifiSSID(), myConfig.getWifiPass());
+    Log.notice(F("WIFI: Connecting to wifi (%d) using stored settings %s." CR),
+               wifiIndex, myConfig.getWifiSSID(wifiIndex));
+    WiFi.begin(myConfig.getWifiSSID(wifiIndex),
+               myConfig.getWifiPass(wifiIndex));
   }
 }
 
@@ -211,17 +212,94 @@ bool WifiConnection::waitForConnection(int maxTime) {
     }
   }
   Serial.print(CR);
-  Log.notice(F("WIFI: Connected to wifi ip=%s." CR), getIPAddress().c_str());
+  Log.notice(F("WIFI: Connected to wifi %s ip=%s." CR), WiFi.SSID().c_str(),
+             getIPAddress().c_str());
   Log.notice(F("WIFI: Using mDNS name %s." CR), myConfig.getMDNS());
   return true;
 }
 
+//
+// Check what network is the strongest.
+//
+int WifiConnection::findStrongestNetwork() {
+  if (!myConfig.dualWifiConfigured()) {
+    Log.notice(F("WIFI: Only one wifi SSID is configured, skipping scan." CR));
+    return -1;
+  }
+
+  Log.notice(F("WIFI: Scanning for wifi." CR));
+  int noNetwork = WiFi.scanNetworks(false, false);
+  int strenght[2] = {-100, -100};
+
+  for (int i = 0; i < noNetwork; i++) {
+    int rssi = WiFi.RSSI(i);
+    String ssid = WiFi.SSID(i);
+
+    if (ssid.compareTo(myConfig.getWifiSSID(0)))
+      strenght[0] = rssi;
+    else if (ssid.compareTo(myConfig.getWifiSSID(1)))
+      strenght[1] = rssi;
+
+#if LOG_LEVEL == 6
+    Log.verbose(F("WIFI: Found %s %d." CR), ssid.c_str(), rssi);
+#endif
+  }
+
+  if (strenght[0] == -100 && strenght[1] == -100)
+    return -1;  // None of the stored networks can be seen
+
+  if (strenght[0] >= strenght[1])
+    return 0;  // First network is strongest or they have equal strength
+
+  return 1;  // Second network is the strongest
+}
+
 //
 // Connect to last known access point, blocking mode.
 //
 bool WifiConnection::connect() {
-  connectAsync();
-  return waitForConnection(20);  // 20 seconds.
+  /*
+  // Alternative code for connecting to strongest wifi.
+  // Takes approximatly 2 seconds to scan for available network
+  int i = findStrongestNetwork();
+
+  if (i != -1) {
+    Log.notice(F("WIFI: Wifi %d:'%s' is strongest." CR), i,
+  myConfig.getWifiSSID(i)); } else { i = 0; // Use first SSID as default.
+  }
+
+  connectAsync(i);
+  return waitForConnection(myAdvancedConfig.getWifiConnectTimeout());
+  */
+
+  // Alternative code for using seconday wifi settings as fallback.
+  // If success to seconday is successful this is used as standard
+  int timeout = myAdvancedConfig.getWifiConnectTimeout();
+
+  connectAsync(0);
+  if (!waitForConnection(timeout)) {
+    Log.warning(F("WIFI: Failed to connect to first SSID %s." CR),
+                myConfig.getWifiSSID(0));
+
+    if (strlen(myConfig.getWifiSSID(1))) {
+      connectAsync(1);
+
+      if (waitForConnection(timeout)) {
+        Log.notice(F("WIFI: Connected to second SSID %s, making secondary "
+                     "default." CR),
+                   myConfig.getWifiSSID(1));
+
+        myConfig.swapPrimaryWifi();
+        myConfig.saveFile();
+        return true;
+      }
+    }
+
+    Log.warning(F("WIFI: Failed to connect to any SSID." CR));
+    return false;
+  }
+
+  return true;
 }
 
 //

src/wifi.hpp

@@ -42,8 +42,11 @@ class WifiConnection {
   bool _newFirmware = false;
   bool parseFirmwareVersionString(int (&num)[3], const char* version);
   void downloadFile(HTTPClient& http, String& fname);
-  void connectAsync();
+
+  // WIFI
+  void connectAsync(int wifiIndex);
   bool waitForConnection(int maxTime = 20);
+  int findStrongestNetwork();
 
  public:
   // WIFI

src_docs/source/advanced.rst

@@ -19,6 +19,10 @@ To reduce the need for adding custom endpoints for various services there is an
 You enter the format data in the text field and the test button will show an example on what the output would look like. If the data cannot be formatted in json it will just be displayed as a long string.
 The save button will save the current formla and reload the data from the device. 
 
+You can also select a template from the list and copy that to the current endpoint. 
+
+Saving an empty formula will reset it to the default value.
+
 .. tip::
 
    If you save a blank string the default template will be loaded.
@@ -95,4 +99,10 @@ These are the format keys available for use in the format.
    * - ${gravity-unit}
      - Gravity format, `G` or `P`
      - G
+   * - ${app-ver}
+     - Software version
+     - 1.1.0
+   * - ${app-build}
+     - Software revision (git hash)
+     - ..e456743
 

src_docs/source/api.rst

@@ -24,7 +24,6 @@ Other parameters are the same as in the configuration guide.
       "ota-url": "http://192.168.1.50:80/firmware/gravmon/",
       "temp-format": "C",
       "ble": "color",
-      "brewfather-push": "http://log.brewfather.net/stream?id=Qwerty",
       "token": "token",
       "token2": "token2",
       "http-push": "http://192.168.1.50:9090/api/v1/Qwerty/telemetry",
@@ -59,15 +58,9 @@ Other parameters are the same as in the configuration guide.
       },
       "formula-calculation-data": {
          "a1":25,
-         "a2":30,
-         "a3":35,
-         "a4":40,
-         "a5":45,
+         "a10":0,
          "g1":1,
-         "g2":1.01,
-         "g3":1.02,
-         "g4":1.03,
-         "g5":1.04
+         "g10":1
       },
       "angle": 90.93,
       "gravity": 1.105,
@@ -102,6 +95,7 @@ Other parameters are the same as in the configuration guide.
       "temp-c": 0,
       "temp-f": 32,
       "battery": 0,
+      "wifi-ssid": "connected SSID",
       "temp-format": "C",
       "sleep-mode": false,
       "token": "token",
@@ -120,8 +114,8 @@ GET: /api/config/formula
 
 Retrive the data used for formula calculation data via an HTTP GET command. Payload is in JSON format.
 
-* ``a1``-``a4`` are the angles/tilt readings (up to 5 are currently supported)
-* ``g1``-``g4`` are the corresponding gravity reaadings in SG or Plato depending on the device-format.
+* ``a1``-``a10`` are the angles/tilt readings (up to 10 are currently supported)
+* ``g1``-``g10`` are the corresponding gravity reaadings in SG or Plato depending on the device-format.
 
 .. code-block:: json
 
@@ -132,16 +126,61 @@ Retrive the data used for formula calculation data via an HTTP GET command. Payl
       "a3": 58, 
       "a4": 0, 
       "a5": 0, 
+      "a6": 0, 
+      "a7": 0, 
+      "a8": 0, 
+      "a9": 0, 
+      "a10": 0, 
       "g1": 1.000,      
       "g2": 1.053, 
       "g3": 1.062, 
       "g4": 1, 
       "g5": 1,
+      "g6": 1,
+      "g7": 1,
+      "g8": 1,
+      "g9": 1,
+      "g10": 1,
+      "error": "Potential error message",
       "gravity-format": "G", 
       "gravity-formula": "0.0*tilt^3+0.0*tilt^2+0.0017978*tilt+0.9436"
    }
 
 
+GET: /api/config/advanced
+=========================
+
+Used for adjusting some internal constants and other advanced settings. Should be used with caution.
+
+.. code-block:: json
+
+   {
+      "gyro-read-count": 50,
+      "tempsensor-resolution": 9,
+      "gyro-moving-threashold": 500,
+      "formula-max-deviation": 1.6,
+      "wifi-portal-timeout": 120,
+      "wifi-connect-timeout": 20,
+      "formula-calibration-temp": 20,
+      "ignore-low-angles": false,
+      "int-http1": 0,
+      "int-http2": 0,
+      "int-http3": 0,
+      "int-influx": 0,
+      "int-mqtt": 0
+   }
+
+POST: /api/config/advanced
+==========================
+
+Same parameters as above.
+
+Payload should be in standard format used for posting a form. 
+
+.. note::
+  ``ignore-low-angles`` is defined as "on" or "off" when posting since this is the output values 
+  from a checkbox, when reading data it's sent as boolean (true,false).
+
 GET: /api/clearwifi
 ===================
 
@@ -173,7 +212,7 @@ Trigger a push on one of the targets, used to validate the configuration from th
 
 Requires to parameters to function /api/test/push?id=<deviceid>&format=<format>
 
-* ``format`` defines which endpoint to test, valid values are; http-1, http-2, brewfather, influxdb, mqtt
+* ``format`` defines which endpoint to test, valid values are; http-1, http-2, http-3, influxdb, mqtt
 
 The response is an json message with the following values.
 
@@ -223,7 +262,6 @@ Payload should be in standard format used for posting a form. Such as as: `id=va
    http-push-h2=
    http-push2-h1=
    http-push2-h2=
-   brewfather-push=
    influxdb2-push=http://192.168.1.50:8086
    influxdb2-org=
    influxdb2-bucket=
@@ -282,8 +320,8 @@ POST: /api/config/formula
 
 Used to update formula calculation data via an HTTP POST command. Payload is in JSON format.
 
-* ``a1``-``a4`` are the angles/tilt readings (up to 5 are currently supported)
-* ``g1``-``g4`` are the corresponding gravity reaadings (in SG)
+* ``a1``-``a10`` are the angles/tilt readings (up to 10 are currently supported)
+* ``g1``-``g10`` are the corresponding gravity reaadings (in SG)
 
 Payload should be in standard format used for posting a form. Such as as: `id=value&mdns=value` etc. Key value pairs are shown below.
 
@@ -295,11 +333,21 @@ Payload should be in standard format used for posting a form. Such as as: `id=va
    a3=58
    a4=0
    a5=0
+   a6=0
+   a7=0
+   a8=0
+   a9=0
+   a19=0
    g1=1.000      
    g2=1.053 
    g3=1.062
    g4=1
    g5=1 
+   g6=1 
+   g7=1 
+   g8=1 
+   g9=1 
+   g10=1 
 
 
 Calling the API's from Python
@@ -346,7 +394,6 @@ The requests package converts the json to standard form post format.
             "http-push-h2": "",
             "http-push2-h1": ""
             "http-push2-h2": "",
-            "brewfather-push": "",
             "influxdb2-push": "",
             "influxdb2-org": "",
             "influxdb2-bucket": "",
@@ -383,10 +430,20 @@ The requests package converts the json to standard form post format.
             "a3": 58, 
             "a4": 0, 
             "a5": 0, 
+            "a6": 0, 
+            "a7": 0, 
+            "a8": 0, 
+            "a9": 0, 
+            "a10": 0, 
             "g1": 1.000, 
             "g2": 1.053, 
             "g3": 1.062, 
             "g4": 1, 
-            "g5": 1 
+            "g5": 1, 
+            "g6": 1, 
+            "g7": 1, 
+            "g8": 1, 
+            "g9": 1, 
+            "g10": 1 
             }
    set_config( url, json )

src_docs/source/compiling.rst

@@ -29,8 +29,9 @@ In the platformio config there are 3 targets defined
 
 * gravity-debug; Maximum logging for trouble shooting, deep sleep is disabled.
 * gravity-release; Standard release
-* gravity-perf; Standard release but contains code for measuring performance 
-* gravity32-perf: Experimental version for ESP32.
+* gravity-perf; Standard release but contains code for measuring performance.
+* gravity32-release: Version for ESP32.
+* gravity32-perf: Version for ESP32 but contains code for measuring performance.
 
 .. note::
   There is an experimental ESP32 target but since platformio only supports SDK 1.0.6 and the WIFI connection is really slow compared to ESP8266, 
@@ -68,8 +69,6 @@ Source structure
      - Source code for software
    * - /src_docs
      - Source code for documentation
-   * - /stl
-     - 3d models 
    * - /test
      - Test data for developing html files
 

src_docs/source/conf.py

@@ -22,7 +22,7 @@ copyright = '2021-2022, Magnus Persson'
 author = 'Magnus Persson'
 
 # The full version, including alpha/beta/rc tags
-release = '0.9.0'
+release = '1.1.0'
 
 
 # -- General configuration ---------------------------------------------------

src_docs/source/configuration.rst

@@ -55,7 +55,8 @@ Device Setting
 
 * **Device name:** 
 
-This is unique name for the device. It will be used in pushing data as well as mDNS name on the network (<name>.local)
+This is unique name for the device. It will be used in pushing data as well as mDNS name on the network (<name>.local). 
+The limitation is 63 chars but using long names might break endpoints that data is sent to if they have other limitations. 
 
 * **Temperature format:** 
 
@@ -121,12 +122,6 @@ If you add the prefix `https://` then the device will use SSL when sending data.
 
 The token is included in the default format for the HTTP GET url but can be used for any of the formats. For HTTP GET use can use this for an authorization token with for instance ubidots or blynk http api. 
 
-* **Brewfather URL:**
-
-Endpoint to send data via http to brewfather. Format used :ref:`data-formats-brewfather`
-
-SSL is not supported for this target.
-
 * **HTTP Headers**
 
 .. image:: images/config-popup1.png
@@ -239,6 +234,11 @@ Hardware Settings
 
 Factor used to calcualate the battery voltage. If you get a too low/high voltage you can adjust this value.
 
+* **Config voltage:**
+
+Defines the level of voltage when the device should enter config mode due to charging. This might vary between different battery manufacturers. 
+If you dont what the device to go into configuration mode when charging, set this to 6V. 
+
 * **Temperature correction:**
 
 This value will be added to the temperature reading (negative value will reduce temperature reading). This is applied
@@ -251,6 +251,12 @@ longer battery life (this is an experimental feature). The value used is the fir
 device is activated, since the gyro should be cool this is reflecting the surronding temperature. After it has 
 been running the value would be totally off.  
 
+* **Enable storage mode when placed on cap**
+
+When place on the cap (<5 degres tilt) the device will go into max sleep. In order to wake it up you need to do a reset (or wait for the device 
+to wake up). One option is to attach a magnetic reed switch (default open) to the reset pin and use a magnet to force a reset without opening 
+the tube. The reed switch is typically an electronic component of 14 mm long incapsulated in a small glass tube.
+
 * **Bluetooth: (Only ESP32)**
 
 If the build is using an ESP32 then you can send data over BLE, simulating a Tilt device. Choose the color that you want the device to simulate.
@@ -281,3 +287,52 @@ This option gives you the possibility to install an new version of the firmware
   :alt: Update firmware
 
 
+Advanded Settings
++++++++++++++++++
+
+.. image:: images/config5.png
+  :width: 800
+  :alt: Advanced Settings
+
+.. warning::
+
+   Changeing these parameters with caution. The wrong values might cause the device to become unresponsive. 
+
+
+* **Gyro reads:**
+
+This defines how many gyro reads will be done before an angle is calculated. More reads will give better accuracy and also allow detection of 
+movement. Too many reads will take time and affecte batterylife. 50 takes about 800 ms to execute.
+
+* **Gyro moving threashold:**
+
+This is the max amount of deviation allowed for a stable reading. 
+
+* **Formula deviation:**
+
+This is the maximum devation on the formlula allowed for it to be accepted. Once the formula has been derived it will be validated against the supplied 
+data and of the deviation on any point is bigger the formula will be rejected.
+
+* **Ignore angles below water:**
+
+If this option is checked any angles below that of SG 1 will be discarded as invalid and never sent to any server. Default = off.
+
+* **DS18B20 Resolution:**
+
+Define the resolution used on the temp sensor. 9 bits is default and will give an accuracy of 0.5C, 12 bits will give an accuracy of 0.0625C but will also 
+take longer time to measure..
+   
+* **Wifi connect timeout:**
+
+This is the amount of time allowed for a wifi connect. 
+   
+* **Wifi portal timeout:**
+
+If the wifi portal is triggered (can be triggerd by reset) then this is the amount of time allowed before it exists again.
+   
+* **Skip Interval (...):**
+
+These options allow the user to have variable push intervals for the diffrent endpoints. 0 means that every wakeup will send data to that endpoint. If you enter another number then that defines how many sleep cycles will be skipped.
+
+If the sleep interval is 300s and MQTT is set to 0 and HTTP1 is set to 2 then MQTT will be sent every 300s while HTTP1 would be sent 900s. This is great if you want to send data to a local mqtt server often but brewfather will only 
+accept data every 15 min.

src_docs/source/contributing.rst

@@ -1,5 +1,33 @@
 Contributing
+############
+
+Anyone is welcome to contribute to this project or create their own variant of it. I would appreciate a PR if your feature would be of benefit other users. 
+
+In order to keep the source code in good condition I use `pre-commit <https://pre-commit.com/>`_ to validate and format the code using their standards for C++/C. 
+
+.. note::  
+
+  If you are using Windows as a base platform I would suggest that you install pre-commit under wsl (Windows Subssytem for Windows) and run it from there, I have found 
+  that this approach works fine. 
+
+
+The following command will run pre-commit on all the source files. Assuming you are inte project directory.
+
+.. code-block:: 
+
+  pre-commit run --files src/*
+
+
+Design goals
 ------------
 
-This section is under construction.
+My goals with this software has been the following:
 
+* Create an open software for the excellent iSpindle hardware platform that is open and available for anyone. 
+* Add user requested features that have not made it into the iSpindle project. 
+* Focus on long battery life and stability.
+* Explore new technologies and create the next generation gravity monitoring for home brewers. 
+
+I will do my best to assist users and respond to new features, pr and suggestions. But keep in mind I'm doing this on my spare time. 
+
+Regards, Magnus

src_docs/source/data.rst

@@ -26,7 +26,7 @@ This is the format used for standard http posts.
       "gravity": 1.0050,
       "angle": 45.34,
       "battery": 3.67,
-      "rssi": -12,
+      "RSSI": -12,
 
       "corr-gravity": 1.0050,
       "gravity-unit": "G",
@@ -40,39 +40,20 @@ This is the format template used to create the json above.
   {
    "name" : "${mdns}",
    "ID": "${id}",
-   "token" : "gravmon",
+   "token" : "${token}",
    "interval": ${sleep-interval}, 
    "temperature": ${temp},
    "temp_units": "${temp-unit}",
    "gravity": ${gravity},
    "angle": ${angle},
    "battery": ${battery},
-   "rssi": ${rssi},
+   "RSSI": ${rssi},
    "corr-gravity": ${corr-gravity},
    "gravity-unit": "${gravity-unit}",
    "run-time": ${run-time}
   }
 
 
-.. _data-formats-brewfather:
-
-Brewfather format 
-=================
-
-This is the format for Brewfather. See: `Brewfather API docs <https://docs.brewfather.app/integrations/custom-stream>`_
-
-.. code-block:: json
-
-   { 
-      "name" : "gravmon",     
-      "temp": 20.5,
-      "temp_unit": "C",
-      "battery": 3.67,
-      "gravity": 1.0050,
-      "gravity_unit": "G",
-   }
-
-
 .. _data-formats-influxdb2:
 
 HTTP Get
@@ -148,15 +129,6 @@ This is the format template used to create the json above.
   ispindel/${mdns}/interval:${sleep-interval}|
   ispindel/${mdns}/RSSI:${rssi}|
 
-This is a format template that is compatible with v0.6. Just replace the `topic` with the topic you want to post data to.
-
-.. code-block::
-   
-   topic:{"name":"gravmon", "ID":"${id}", "token":"gravmon", "interval": ${sleep-interval},
-   "temperature": ${temp}, "temp_units": "${temp-unit}", "gravity":${gravity},
-   "angle": ${angle}, "battery":${battery}, "rssi": ${rssi}, "corr-gravity":${corr-gravity},
-   "gravity-unit": "${gravity-unit}", "run-time": ${run-time}}|
-
 
 version.json
 ============
@@ -169,13 +141,6 @@ they can be uploaded manually afterwards.
 
    { 
       "project":"gravmon", 
-      "version":"0.7.0",  
-      "html": [ 
-         "index.min.htm", 
-         "test.min.htm", 
-         "config.min.htm", 
-         "format.min.htm", 
-         "calibration.min.htm", 
-         "about.min.htm" 
-      ] 
+      "version":"1.0.0",  
+      "html": [ ] 
    }

src_docs/source/formula.rst

@@ -7,10 +7,33 @@ Create formula
   :width: 800
   :alt: Formula data
 
-Here you can enter up to 5 values (angles + gravity) that is then used to create the formula. Angles equal to zero will be regarded as empty even if there is a gravity reading.
+Here you can enter up to 10 values (angles + gravity) that is then used to create the formula. Angles equal to zero will be regarded as empty even if there is a gravity reading.
+
+When you submit the values the device will try create a forumla with increasing level of complexity. It will start
+with a order 2 formula and then try 3 and 4.
+
+Once the formula has been created it will validate the formula against the supplied angles/gravity and if there is a too
+high difference, it will fail. You can adjust the sensitivity under advanced settings if you have issues. 
+
+Under the Error Log you will also find hints to what problem the formula creator encountered. Here is an example:
+
+`CALC: Validation failed on angle 33.430000, deviation too large 5.86, formula order 4`
+
+`CALC: Validation failed on angle 33.430000, deviation too large 3.14, formula order 2`
+
+This means that the angle 33.43 had a deviation of 5.8 SG and since the default threashold is 3, it will fail. You 
+can also see that it has failed on that point in both a order 2 and 4 formula.
+
+.. image:: images/qa_1.png
+  :width: 400
+  :alt: Example of deviating value
+
+So in this case you can either increase the threashold or remove the angle that has an issue. You can also 
+use the graph on the calibration page to identify angles that is probably not correct.
 
 .. image:: images/formula2.png
   :width: 800
   :alt: Formula graph
 
 Once the formula is created a graph over the entered values and a simulation of the formula will give you a nice overview on how the formula will work.
+

src_docs/source/functionallity.rst

@@ -33,10 +33,10 @@ The main features
 
   Currently the device supports the following endpoints.  
 
-  * http or https
-  * influxdb v2
+  * http (ssl optional)
+  * influxdb v2 (ssl optional)
+  * MQTT (ssl optional)
   * Brewfather
-  * MQTT
   * Home Assistant
   * Brew Spy
   * Brewers Friend
@@ -65,11 +65,9 @@ The main features
   Another big difference is that this software can create the gravity formula in the device, just enter the 
   angle/gravity data that you have collected. You will also see a graph simulating how the formula would work. 
 
-  Currently the device can handle 5 data points which should be enough to get a accurate formula. At least 3 data points 
+  Currently the device can handle 10 data points which should be enough to get a accurate formula. At least 3 data points 
   is needed to get an accurate formula.
 
-  If there is a need for more data points, raise a comment on github.
-
 * **Customize the data format beeing sent to push targets**
 
   In order to make it easier to support more targets there is a built in format editor that can be used to 
@@ -86,7 +84,8 @@ The main features
 * **OTA support from webserver**
 
   When starting up in configuration mode the device will check for a software update from a webserver. This is an easily
-  way to keep the software up to date. In the future I might add a hosted endpoint for providing updates.
+  way to keep the software up to date. In the future I might add a hosted endpoint for providing updates. OTA can also be 
+  done over a SSL connection.
 
 * **DS18B20 temperature adjustments**
 
@@ -95,13 +94,14 @@ The main features
 
 * **Gyro Movement**
 
-  The software will detect if the gyro is moving and if this is the case it will go back to sleep for 60seconds. 
-  This way we should avoid faulty measurements and peaks in the graphs.
+  The software will detect if the gyro is moving and if this is the case it will go back to sleep for 60 seconds. 
+  This way we should avoid faulty measurements and peaks in the graphs. 
 
 * **WIFI connection issues**
 
   The software will not wait indefiently for a wifi connection. If it takes longer than 20 seconds to connect then
-  the device will go into deep sleep for 60 seoncds and then retry later. This to conserve batter as much as possible.
+  the device will try the seconday wifi configuration, and that also failes it will go into deep sleep for 60 seconds and then 
+  retry later. This to conserve batter as much as possible.
 
 * **Use gyro temperature sensor**
 

src_docs/source/hardware.rst

@@ -24,3 +24,22 @@ need to adjust the voltage factor so the battery reading is correct.
   :width: 500
   :alt: Mounting esp32
 
+Schema for esp8266 build
+------------------------
+
+.. image:: images/schema_esp8266.png
+  :width: 700
+  :alt: Schema esp8266
+
+Schema for esp32 build
+----------------------
+
+.. note::  
+  This schema assumes that an ESP32 D1 Mini (pin compatible with ESP8266 D1 Mini is used)
+  The ESP32 has two rows of pins but only the inner row is used. The main difference is the added resistor R3 so we 
+  get a voltage divider for measuring battery. The ESP8266 has a built in resistor thats not visible on the schema. 
+
+
+.. image:: images/schema_esp32.png
+  :width: 700
+  :alt: Schema esp32

src_docs/source/index.rst

@@ -7,7 +7,10 @@ Welcome to GravityMon's documentation!
 ######################################
 
 .. note::
-  This documentation reflects **v0.9**. Last updated 2022-04-23
+  This documentation reflects **v1.1 BETA 2**. Last updated 2022-07-23
+
+* Docs for: `v1.0 <https://mp-se.github.io/gravitymon/v1.0/index.html>`_
+* Docs for: `v0.9 <https://mp-se.github.io/gravitymon/v0.9/index.html>`_
 
 .. image:: images/gravitymon.gif
   :width: 800

src_docs/source/installation.rst

@@ -13,7 +13,8 @@ Brewflasher
 ===========
 
 The prefered option for flashing GravityMon is using BrewFlasher, its a tools that support many brewing related firmwares for ESP8266 and ESP32. This works 
-on both Windows and Mac. You can download the latest version from here: `Brewflasher <https://www.brewflasher.com/>`_
+on both Windows and Mac. You can download the latest version from here: `Brewflasher <https://www.brewflasher.com/>`_ there is also a web based version 
+available here `Brewflasher WEB <https://web.brewflasher.com/>`_.
 
 .. image:: images/brewflasher.png
   :width: 600
@@ -34,7 +35,8 @@ In the /bin directory you will find 3 different firmware builds;
 
 * **firmware32.bin**
 
-  This is the standard release build for an ESP32 variant
+  This is the standard release build for an ESP32 variant. When flashing an ESP32 you also need the **partition32.bin** file that outlines the flash memory structure. Due to 
+  the size of the firmware we are using a custom partition setup.
 
 In these versions all the html files are embedded in the binaries. The file system is currently only used for storing 
 the configuration file. 
@@ -90,7 +92,6 @@ browser and select the firmware.bin file that corresponds to the version you wan
 ``http://<device_name>/firmware.htm``
 
 
-
 .. _serial_monitoring:
 
 Serial Monitoring
@@ -120,6 +121,14 @@ in the browser: **http://192.168.4.1**
 Before pressing save on the network infomration, make a note of the devicename that is shown on the screen, this will be the name that is used 
 in the next step to access the configuration pages. The link would look like this: **http://gravitymon56EA34.local**
 
+.. note::
+  When selecting a SSID in the list this will be populated in both wifi fields. This is the behaviour of the wifi manager library that I'm using,
+  in the future this is planned to be moved to the normal UI.
+
+Under wifi settings you can define a primary and seconday wifi SSID. The seconday will be used in case the primary fails. If the seconday is 
+successful then it will be used as primary. *The second wifi setting is optional and not needed.*
+
+
 .. image:: images/wifi.png
   :width: 200
   :alt: Wifi page

src_docs/source/intro.rst

@@ -19,6 +19,12 @@ Step 2 - Setup WIFI
 When the device starts up the first time it will first start an WIFI access point so that the WIFI Settings 
 can be configured. The instructions for that can be found here :ref:`setup_wifi`
 
+.. note::
+  Since the user interface is built using modern frameworks the device requires access to the internet 
+  for the UI to render and data to be populated. The sites that are needed are; https://cdn.jsdelivr.net/npm/bootstrap
+  and https://code.jquery.com
+
+
 Step 3 - Configuration
 ----------------------
 

src_docs/source/q_and_a.rst

@@ -12,3 +12,36 @@ My device reports a temperature of -273C or -491F
 -------------------------------------------------
 - The DS18B20 temperature sensor cannot be found and this is the default value reported in this case.
 - Check the orienation of the sensor and soldering.
+
+Calibration error (unable to find a valid formula)
+--------------------------------------------------
+If you have issues to get a calibration formula. When a formula has been created the device always tries to validate the formula against the supplied values and if there is a to high deviation on any of the values then the formula will be rejected.
+
+The image here shows such a case, one of the values is out of bounds. 
+
+.. image:: images/qa_1.png
+  :width: 500
+  :alt: Calibration Error
+
+To fix these this you can;
+
+- remove the value from the list (setting the angle to zero will do that)
+- change the advanced setting (Formula max deviation) to a higher value and save the values again. 
+
+In the case above this paramater was changed from 1.6 SG to 4 SG and the formula was accepted. The deviation on this point was just above 3 SG. 
+
+User interface does not render correctly
+----------------------------------------
+
+Since the user interface is built using bootstrap v5 the device requires access to the internet 
+to download required javascripts and css files. Due to size it would not be possible to store these
+on the device. Make sure the device can access: https://cdn.jsdelivr.net/npm/bootstrap
+
+Data is not popoulated in the fields
+------------------------------------
+
+The user interface uses JQuery to fetch data from the device. This javascript library needs to be downloaded 
+from the internet.  Due to size it would not be possible to store these on the device. Make sure the 
+device can access: https://code.jquery.com
+
+Also ensure that any security tools does not block the execution of these features.

src_docs/source/releases.rst

@@ -3,10 +3,97 @@
 Releases 
 ########
 
+v1.1.0 - beta 2
+===============
+
+Documentation
++++++++++++++
+* Fixed errors in data format section
+* Added q&a on formula creation and value deviation
+* Added documentation for Brewpiless as target
+* Updated docs for ubidots service integration.
+* Added brewblox as new service
+* (beta2) Updated docs for HA integration since method was depricated
+
+User interface
+++++++++++++++
+* Under format options its now possible to select brewfather ispindle format to avoid mixing endpoints. 
+* Added brewblox as format under format options. 
+* User can now edit the voltage level that forces the device into config mode (charging)
+* (beta2) Calibration temperature (for temp adjustment) can now be set under advanced settings.
+* (beta2) Changes length of device name from 12 to 63 chars. 63 is the max limit according to mdns. 
+
+Features
+++++++++
+* Added storage mode which is activated under hardware setting. When place on the cap (<5 degres tilt) the device will go into storage mode and sleep for the max allowed time. 
+* Added ${app-ver} and ${app-build} to format template as new variables.
+* Added format templates for HA auto registration
+* (beta2) Improved error messages when creating formula so the meaasurement points can be identified.
+* (beta2) Changed defaule validation threashold from 1.6 SG to 3.0 SG, this should allow for some more variance when creating formula. 
+* (beta2) Updated format template for Home Assistant for using manual configuration (Aligned with new mqtt configuration format)
+* (beta2) Added format template for Home Assistant with automatic device registration
+ 
+Other
++++++
+* Upgraded framework for ESP8266 to v5.0.0
+* Upgraded framework for ESP32 to v2.0.2
+* Updated OneWire library to be complaint with new ESP32 SDK
+* Fixed issue in i2cdev connected to wrong usage of TwoWire on ESP32 (Gyro initialization hang). 
+
+Issues adressed
+++++++++++++++++
+* BUG: Copy format templates used an old format for iSpindle and Gravmon where the token was not used.
+* BUG: Gravity correction formula not calculating correctly.
+* (beta2) BUG: Temp corrected gravity was not used when pushing data to removed
+* (beta2) BUG: Low memory in format api which resulted in mqtt template to be set to null
+* (beta2) BUG: Large format templates could be saved but when loading it's only blank. Increased total memory from 3kb to 5kb
+
+v1.0.0
+======
+
+Documentation
++++++++++++++
+* Update documentation to match v1.0
 * Installation instructions updated on how to find the device after wifi has been configured. 
+* Documentation on brewfather has been updated to adress SG/Plato conversion
+* Added circuit diagram for esp8266 and esp32
+* Added additional http error codes to troubleshooting documentation
+
+User interface
+++++++++++++++
+* Upgraded to bootstrap v5.1 for web pages.
+* Added button on indexpage to direct to github issues.
+* Added button to extract important information for support requests. 
+* First point in gravity formula is now reserved for water gravity, this to allow detection of angles below water that can be filtered out.
+* Changed layout on index page with measured data on top.
+* Added tooltips to all fields in user interface
+* Added function on format page so that it's easy to copy a format template from the docs (simplify service integration).
+
+Features
+++++++++
+* Added advanced setting to ignore angles that are lower than water. This is disabled by default.
+* Added support for MPU6500 (standard is MPU6050).
+* Removed brewfather option (can use standard HTTP options), the old apporach can still be used via changing format template.
+* Added 5 more points for formula creation, so a total of 10 angles/gravity values can be stored.
+* Added https support for Influxdb v2
+* Added possibility to set 2 wifi ssid where the second acts as a fallback in case it fails to connect. If succesful the seconday becomes the new primary.
+* SSL connections are skipped on ESP8266 when in config mode since there is a high probability it will crash due to low memory. 
+* Advanced settings: Added possibility to have variable push intervals for different endpoints so that different frequency can be used, for example; 5min mqtt, 15min brewfather. 
+* Advanced settings: Changes how many times the gyro is read (less reads, quicker but less accurate)
+* Advanced settings: Set amount of gyro movement is allowed for a accurate read.
+* Advanced settings: What deviation is acceptable for creating formula deviation
+* Advanced settings: Various timeouts, wifi connect, wifi portal, http connects.
+* Advanced settings: Adjust resolution of temp sensor (9 bits to 12 bits), higher resolution takes longer thus reducing batterylife
+
+Issues adressed
+++++++++++++++++
+* BUG: Fixed issue in formula calculation in case there were a gap in the data series
+* BUG: Field name for wifi strength changed from "rssi" to "RSSI"
+* BUG: Fixed issue with probing MFLN on non standard ports
+* BUG: Changed http connection to keep-alive so that server does not close port before the client has had a chance to read the response.
 
 v0.9.0
-------
+======
 * Added one http push target that uses HTTP GET. This can be used with ubidots or blynk api's. 
 * Added function to test push targets from configuration page. It will send data and show the return code as a first step. 
 * Added documetation on how to integrate with Blynk.io using http get.
@@ -31,8 +118,7 @@ v0.9.0
 * BUG: Entering wifi setup and a timeout occured the wifi settings could be deleted.
 
 v0.8.0
-------
-
+======
 * Added option to set http headers (2 per http endpoint), these can be used for 
   other http formats than json (default) and for adding authentication headers.
 * Added possibility to view last 10 errors on device page. 
@@ -52,8 +138,7 @@ v0.8.0
 * Tested batterylife, 47 days using an update frequency of 5 min
 
 v0.7.1
-------
-
+======
 * Added instructions for how to configure integration with Fermentrack
 * Added instructions for how to configure integration with Ubidots
 * Added instructions for how to configure integration with HomeAssistant
@@ -63,8 +148,7 @@ v0.7.1
 * BUG: Fixed issue with default template so it now includes the device name correctly. 
 
 v0.7.0
-------
-
+======
 Latest stable version. `Release v0.7 on Github <https://github.com/mp-se/gravitymon/releases/tag/v0.7.0>`_
 
 * SSL support for HTTP targets
@@ -90,10 +174,7 @@ Latest stable version. `Release v0.7 on Github <https://github.com/mp-se/gravity
   the behaviour in v0.6 is wanted this can be done via the format editor. 
 
 v0.6.0
-------
-
-`Release v0.6 on Github <https://github.com/mp-se/gravitymon/releases/tag/v0.6.0>`_
-
+======
 * Changed the wifi manager and refactored wifi.cpp
 * LED is now turned on when Wifi Portal is open
 * Refactored main.cpp to make it easier to read
@@ -106,10 +187,7 @@ v0.6.0
 * Bug: MPU init sometimes caused crash during startup.
 
 v0.5.0
-------
-
-`Release v0.5 on Github <https://github.com/mp-se/gravitymon/releases/tag/v0.5.0>`_
-
+======
 * Added feature to calcuate formula on device
 * Total rewrite of documentation
 * WIFI settings are now stored in config file
@@ -118,8 +196,5 @@ v0.5.0
 * Refactor code from C to C++
 
 v0.4.0
-------
-
-`Release v0.4 on Github <https://github.com/mp-se/gravitymon/releases/tag/v0.4.0>`_
-
-* First release
+======
+* First public release

src_docs/source/services.rst

@@ -10,14 +10,26 @@ Brewfather
 
 Brewfather is an all in one service that allows you to manage you recepies and brews. 
 
-.. tip::
+**Option 1** - iSpindle Endpoint
 
-   The integration named Brewfather is uses the custom stream endpoint in brewfather not the standard iSpindle 
-   endpoint. You can use the iSpindle endpoint as well. In that case just use the http-1 or http-2 fields.  
+This opion makes use of the standard http (1 or 2) endpoints in the push section. If you are using SG then the device name needs to end with [SG] or brewfather will assume 
+that the data is in plato. You can also modify the format template using the following options:
 
-**Option 1** - Custom Stream
+Update the following part `"gravity": ${gravity-plato},` or `"name" : "${mdns}[SG]",``
 
-This option makes use of the push endpoint called Brewfather in the UI. Just enter the http stream adress found 
+This makes use of the standard format template, no changes needed.
+
+.. code-block::
+
+   http://log.brewfather.net/ispindel?id=<yourid>
+
+
+Documentation on this can be found under `Brewfather iSpindle Endpoint <https://docs.brewfather.app/integrations/ispindel>`_
+
+
+**Option 2** - Custom Stream
+
+This option makes use of the http push endpoint with a custom format template. Just enter the http stream adress found 
 on brewfather, not other settings are needed. The stream endpoint URL has the following format:
 
 .. code-block::
@@ -48,18 +60,6 @@ The implementation is basically a http request with the following format templat
    }
 
 
-**Option 2** - iSpindle Endpoint
-
-This opion makes use of the standard http (1 or 2) endpoints in the push section. If you are using SG then the device name needs to end with [SG] or brewfather will assume 
-that the data is in plato. The brewfather iSpindle endpoint has the following format:
-
-.. code-block::
-
-   http://log.brewfather.net/ispindel?id=<yourid>
-
-
-Documentation on this can be found under `Brewfather iSpindle Endpoint <https://docs.brewfather.app/integrations/ispindel>`_
-
 Fermentrack
 +++++++++++
 
@@ -75,7 +75,9 @@ GravityMon can be installed and used as an iSpindle. Just register the device as
 UBIdots
 +++++++
 
-`UBIdots <https://www.ubidots.com>`_ is a IoT service that display data collected various sources. 
+`UBIdots <https://www.ubidots.com>`_ is a IoT service that display data collected various sources. There is a limitation on this service where it can only handle 10 variables per device so 
+you might need to reduce the number of values sent to the service. It will also treat every parameter as a number unless you create a custom device type and explicit define the string values 
+as text. This will require a paid subscription (as I interpret the documentation). The example format below will only send numbers so that should work fine with the paid subscription. 
 
 For this service there are two options to configure the integration. First you will need your default token which is found under `API Credentials` (<api-tokem> in the example below).
 Swap the text <devicename> with the name you want to show in ubidots. 
@@ -120,14 +122,14 @@ format template that can be used. For information on customizing the format see
       "gravity": ${gravity}, 
       "angle": ${angle}, 
       "battery": ${battery}, 
-      "rssi": ${rssi} 
+      "RSSI": ${rssi} 
    }
 
 
 Home Assistant
 +++++++++++++++
 
-`HomeAssistant <https://www.homeassistant.com>`_ is a platform for home automation and can collect sensor data
+`HomeAssistant <https://www.homeassistant.io>`_ is a platform for home automation and can collect sensor data
 from multiple devices. 
 
 This setup uses the MQTT integration with home assistant to collect values from the device.
@@ -137,27 +139,50 @@ device is named `gravmon2`
 
 ::
 
+   mqtt:
    sensor:
-   - platform: mqtt
-      name: "gravmon2_gravity"
-      state_topic: "gravmon/gravmon2/gravity"
-   - platform: mqtt
-      name: "gravmon2_battery"
-      state_topic: "gravmon/gravmon2/battery"
-   - platform: mqtt
-      name: "gravmon2_rssi"
-      state_topic: "gravmon/gravmon2/rssi"
+      - name: "Gravmon2-Gravity"
+         state_topic: "gravmon/gravmon2/gravity"
+         unique_id: gravmon2_grav
+         unit_of_measurement: "SG"
+      - name: "Gravmon2-RSSI"
+         state_topic: "gravmon/gravmon2/rssi"
+         unique_id: gravmon2_rssi
+         unit_of_measurement: "dBm"
 
 
 Enter the name of the MQTT server in Home Assistant in the URL. You might need to install that option 
 first. This is the format needed to submit the data to the correct topics as needed above. You can add as 
-many sensors / topics as you want.
+many sensors / topics as you want. It's also possible that you will need to create a user and supply the 
+username / password to be able to publish messages on a topic.
+
+::
+
+   gravmon/${mdns}/gravity:${gravity}|
+   gravmon/${mdns}/rssi:${rssi}|
+   gravmon/${mdns}/battery:${battery}|
+
+
+It's also possible to allow home assistant to do autodisovery and automatically create the sensor. This format 
+template will create two sensors and update the values for them. 
+
+.. warning::
+  This will only work on 1.1+ since the the memory allocation on previous versions are not enough to handle this large payload.
+  Earlier version can handle 2 of the values.
+
 
 ::
 
-   gravmon/${mdns}/tilt:${angle}|
    gravmon/${mdns}/temperature:${temp}|
-   gravmon/${mdns}/temp_units:${temp-unit}|
+   gravmon/${mdns}/gravity:${gravity}|
+   gravmon/${mdns}/rssi:${rssi}|
+   gravmon/${mdns}/tilt:${tilt}|
+   gravmon/${mdns}/battery:${battery}|
+   homeassistant/sensor/gravmon_${id}/temperature/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_temp","name":"temperature","dev_cla":"temperature","unit_of_meas":"${temp-unit}","stat_t":"gravmon/${mdns}/temperature"}|
+   homeassistant/sensor/gravmon_${id}/gravity/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_grav","name":"gravity","dev_cla":"temperature","unit_of_meas":" ${gravity-unit}","stat_t":"gravmon/${mdns}/gravity"}|
+   homeassistant/sensor/gravmon_${id}/rssi/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_rssi","name":"rssi","dev_cla":"temperature","unit_of_meas":"dBm","stat_t":"gravmon/${mdns}/rssi"}|
+   homeassistant/sensor/gravmon_${id}/tilt/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_tilt","name":"tilt","dev_cla":"temperature","stat_t":"gravmon/${mdns}/tilt"}|
+   homeassistant/sensor/gravmon_${id}/battery/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_batt","name":"battery","dev_cla":"temperature","unit_of_meas":"V","stat_t":"gravmon/${mdns}/battery"}|
 
 
 Brewer's Friend
@@ -194,7 +219,7 @@ format for the endpoint. Just add you API key after token.
    "gravity": ${gravity},
    "angle": ${angle},
    "battery": ${battery},
-   "rssi": ${rssi}
+   "RSSI": ${rssi}
   }
 
 
@@ -261,3 +286,43 @@ starting with a ``?``. This string will be added to the URL above when doing the
 
    ?token=${token2}&v1=${temp}&v2=${gravity}&v3=${angle}
 
+
+Brewpiless
+++++++++++
+
+If you connect the device to the brewpiless access point there is not way to access the user interface for configuration so it's recommended to connect the device to your normal network. 
+
+The device need to have a name starting with iSpindle, for example `iSpindel000`. Set the URL for one of the http POST targets to `http://ip/gravity` where ip is the ip adress of Brewpiless. 
+
+
+BrewBlox
+++++++++++
+
+To send iSpindel data to brewblox over mqtt you need to modify the format template to match the expected format. Once you have configured the mqtt information you also need to update the format template 
+for this target. 
+
+This format template will post the expected json document on the topic, dont forget the `|` character at the end of the line which is needed to parse the payload. The first to words are the topic 
+name and after the first `:` this is the json playload. Text within the brackets will be used as the unit for the value and degC is displayed as °C. You can add other parameters under the data section 
+in the json document if you need other values as well.
+
+.. code-block::
+
+   brewcast/history:{"key":"${mdns}","data":{"Temperature[degC]": ${temp-c},"Temperature[degF]": ${temp-f},"Battery[V]":${battery},"Tilt[deg]":${angle},"Rssi[dBm]":${rssi},"SG":${gravity-sg},"Plato":${gravity-plato}}}|
+
+
+The json message on the mqtt topic  would look like this:
+
+.. code-block:: json
+
+   {
+      "key": "gravitymon",
+      "data": {
+         "Temperature[degC]": 27,
+         "Temperature[degF]": 80,
+         "Battery[V]": 4.1,
+         "Tilt[deg]": 25,
+         "Rssi[dBm]": -78,
+         "SG": 1,
+         "Plato": 0
+      }
+   }

src_docs/source/troubleshooting.rst

@@ -31,7 +31,6 @@ Log errors
   Check the format for your custom header. This means it has not a correct format.
 
 * Influxdb push failed response
-* Brewfather push failed response
 * HTTP push failed response
 
   All these errors are standard http error codes. This are the commone ones;
@@ -41,8 +40,28 @@ Log errors
   *  403 - Forbidden. Could be an issue with token or URL. 
   *  404 - Not found. Probably a wrong URL.
   
+  In some cases there can be negative error codes which have the following meaning:
+
+  * -1 - Connection refused
+  * -2 - Send header failed
+  * -3 - Send payload failed
+  * -4 - Not connected
+  * -5 - Connection lost
+  * -6 - No stream
+  * -7 - No HTTP server
+  * -8 - Too little RAM available
+  * -9 - Error encoding
+  * -10 - Error writing to stream
+  * -11 - Read timeout
+  * -100 - Endpoint skipped since its SSL and the device is in gravity mode
+
 * MQTT push on <topic> failed error
 
+  * -1 - Buffer to short
+  * -2 - Overflow
   * -3 - Network failed connected
+  * -4 - Network timeout
+  * -5 - Network read failed
+  * -6 - Network write failed
   * -10 - Connection denied
-
+  * -11 - Failed subscription