GitHub Action Build

.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/'

README.md

@@ -21,18 +21,24 @@ Note! If Brewflasher being flagged as malware by your antivirus software, try th
 The main differences:
 ---------------------
 
-* Modern web based user interface for configuration when connected to WIFI
-* 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 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 or firmware upload via web interface
-* REST API for scripting
-
+* Operates in two modes gravity monitoring and configuration mode
+* Gravity mode is comparable to how the iSpindle works when collectintg data
+* Configuration mode has a modern HTML5 based web UI. No need to start the access point to change settings
+* Offloading some of the functionallity to run in the web browser, this allows for more advanced features.
+* REST API to enable scripted configuration
+* Send data to multiple endpoints and services at once (2xHTTP POST, HTTP GET, MQTT, INFLUXDB2)
+* Directly test all endpoints from user interface with feedback to simplify troubleshooting
+* Complete format customization for all endpoints using templates (dont really need to change the software to support new services)
+* Setup guides for how to send data to many popular services. Currently 10+ are documented
+* Automatic temperature adjustment of gravity (just tick a checkbox)
+* OTA support from webserver
+* Firmware update via web interface
+* Built in function to create gravity formulas, no need for additional software, just enter tilt/gravity and let GravityMon creates a formula
+* Visual graph showing how formula will be interpreted based on entered values
+* Using the temperature sensor in gyro instead of DS18B20 (faster)
+* SSL support in all endpoints (no certificate validation due to limitations on esp8266).
+* Built in performance measurements (used to optimise code)
+* Storage mode when placed on cap (indefinite sleep)
+* Customize various hardware parameters to opimize device functionallity.
+* 
 No code has been reused from the iSpindle project. 

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://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>
+<!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 dropdown"><a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Configuration</a><ul class="dropdown-menu"><li><a class="dropdown-item" href="/config.htm">Configuration</a></li><li><a class="dropdown-item" href="/format.htm">Format editor</a></li><li><a class="dropdown-item" href="/test.htm">Test push</a></li><li><a class="dropdown-item" href="/firmware.htm">Upload firmware</a></li></ul></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link active" href="#">About</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></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":"1.0.0",  "html": [ ] }
+{ "project":"gravmon", "version":"1.1.0",  "html": [ ] }

html/about.htm

@@ -28,20 +28,29 @@
           <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 class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+              Configuration
+            </a>
+            <ul class="dropdown-menu">
+              <li><a class="dropdown-item" href="/config.htm">Configuration</a></li>
+              <li><a class="dropdown-item" href="/format.htm">Format editor</a></li>
+              <li><a class="dropdown-item" href="/test.htm">Test push</a></li>
+              <li><a class="dropdown-item" href="/firmware.htm">Upload firmware</a></li>
+            </ul>
           </li>
-          <li class="nav-item">
+                  <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 class="nav-item">
+            <a class="nav-link active" href="#">About</a>
           </li> 
         </ul>
       </div>
+      <div class="spinner-border text-light" id="spinner" role="status"></div>
     </div>
   </nav>
-
+  
   <!-- START BODY -->
 
   <div class="container row-margin-10">

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://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>
+<!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 dropdown"><a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Configuration</a><ul class="dropdown-menu"><li><a class="dropdown-item" href="/config.htm">Configuration</a></li><li><a class="dropdown-item" href="/format.htm">Format editor</a></li><li><a class="dropdown-item" href="/test.htm">Test push</a></li><li><a class="dropdown-item" href="/firmware.htm">Upload firmware</a></li></ul></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link active" href="#">About</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></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

@@ -16,8 +16,6 @@
   <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>
 
-  <!-- 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>
@@ -29,11 +27,19 @@
           <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 class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+              Configuration
+            </a>
+            <ul class="dropdown-menu">
+              <li><a class="dropdown-item" href="/config.htm">Configuration</a></li>
+              <li><a class="dropdown-item" href="/format.htm">Format editor</a></li>
+              <li><a class="dropdown-item" href="/test.htm">Test push</a></li>
+              <li><a class="dropdown-item" href="/firmware.htm">Upload firmware</a></li>
+            </ul>
           </li>
-          <li class="nav-item active">
-            <a class="nav-link" href="#"><b>Calibration</b></a>
+                  <li class="nav-item">
+            <a class="nav-link active" href="#">Calibration</a>
           </li>
           <li class="nav-item">
             <a class="nav-link" href="/about.htm">About</a>

html/config.htm

@@ -28,10 +28,18 @@
           <li class="nav-item">
             <a class="nav-link" href="/index.htm">Home</a>
           </li>
-          <li class="nav-item">
-            <a class="nav-link active" href="#"><b>Configuration</b></a>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle active" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+              Configuration
+            </a>
+            <ul class="dropdown-menu">
+              <li><a class="dropdown-item" href="#">Configuration</a></li>
+              <li><a class="dropdown-item" href="/format.htm">Format editor</a></li>
+              <li><a class="dropdown-item" href="/test.htm">Test push</a></li>
+              <li><a class="dropdown-item" href="/firmware.htm">Upload firmware</a></li>
+            </ul>
           </li>
-          <li class="nav-item">
+                  <li class="nav-item">
             <a class="nav-link" href="/calibration.htm">Calibration</a>
           </li>
           <li class="nav-item">
@@ -107,7 +115,7 @@
             <div class="row mb-3">
               <label for="mdns" class="col-sm-2 col-form-label">Device name</label>
               <div class="col-sm-3">
-                <input type="text" maxlength="12" class="form-control" name="mdns" id="mdns" placeholder="gravmon" data-bs-toggle="tooltip" title="Name of the device. Will be used for identifying the device when pushing data and on the local network.">
+                <input type="text" maxlength="63" class="form-control" name="mdns" id="mdns" placeholder="gravmon" data-bs-toggle="tooltip" title="Name of the device. Will be used for identifying the device when pushing data and on the local network.">
               </div>
             </div>
 
@@ -390,11 +398,18 @@
             <div class="row mb-3">
               <label for="voltage-factor" class="col-sm-2 col-form-label">Voltage factor</label>
               <div class="col-sm-2">
-                <input type="number" step=".01" class="form-control" name="voltage-factor" id="voltage-factor" placeholder="1.59" data-bs-toggle="tooltip" title="Factor used to calculate the battery voltage. When running on battery, the voltage should be less than 4.15V">
+                <input type="number" step=".01" class="form-control" name="voltage-factor" id="voltage-factor" placeholder="1.59" data-bs-toggle="tooltip" title="Factor used to calculate the battery voltage. Can vary depending on the R2 value">
               </div>
               <label for="voltage-factor" class="col-sm-3 col-form-label" id="battery">Loading...</label>
             </div>
 
+            <div class="row mb-3">
+              <label for="voltage-config" class="col-sm-2 col-form-label">Config voltage</label>
+              <div class="col-sm-2">
+                <input type="number" step=".01" min="3.00" max="6.00" class="form-control" name="voltage-config" id="voltage-config" placeholder="4.16" data-bs-toggle="tooltip" title="Over this level the device will always go into configuration mode, some batteries might have a higher voltage when fully charged">
+              </div>
+            </div>
+
             <div class="row mb-3">
               <label for="temp-adjustment-value" class="col-sm-2 col-form-label">Temp Sensor Adj</label>
               <div class="col-sm-2">
@@ -403,7 +418,7 @@
             </div>
 
             <div class="row mb-3">
-              <div class="col-sm-3 offset-sm-2">
+              <div class="col-sm-4 offset-sm-2">
                 <div class="form-check">
                   <input class="form-check-input" type="checkbox" name="gyro-temp" id="gyro-temp" data-bs-toggle="tooltip" title="Use the temperature sensor in the gyro instead of DS18B20, require 300s update interval to be accurate">
                   <label class="form-check-label" for="gyro-temp">Use gyro temperature</label>
@@ -411,6 +426,15 @@
               </div>
             </div>
 
+            <div class="row mb-3">
+              <div class="col-sm-4 offset-sm-2">
+                <div class="form-check">
+                  <input class="form-check-input" type="checkbox" name="storage-sleep" id="storage-sleep" data-bs-toggle="tooltip" title="If enabled and the device is placed on its cap (less than 5 degress) it will go into sleep for 2000 minutes">
+                  <label class="form-check-label" for="storage-sleep">Enable storage mode when placed on cap</label>
+                </div>
+              </div>
+            </div>
+
             <div class="row mb-3">
               <label class="col-sm-2 col-form-label" for="ble">Bluetooth tilt color:</label>
               <div class="col-sm-2">
@@ -490,9 +514,9 @@
             <div class="row mb-3">
               <label for="formula-max-deviation" class="col-sm-3 col-form-label">Formula max deviation (SG)</label>
               <div class="col-sm-3">
-                <input disabled type="number" step=".1" min="1" max="10" class="form-control" name="formula-max-deviation" id="formula-max-deviation" placeholder="1.6" checked data-bs-toggle="tooltip" title="When validating the derived formula this is the maximum accepted deviation for the supplied values"> 
+                <input disabled type="number" step=".1" min="1" max="10" class="form-control" name="formula-max-deviation" id="formula-max-deviation" placeholder="3" checked data-bs-toggle="tooltip" title="When validating the derived formula this is the maximum accepted deviation for the supplied values"> 
               </div>
-              <div class="col-sm-5">(1 - 10) - default 1.6 SG</div>
+              <div class="col-sm-5">(1 - 10) - default 3 SG</div>
             </div>
 
             <div class="row mb-3">
@@ -505,6 +529,14 @@
               <div class="col-sm-5" name="water-angle" id="water-angle"></div>
             </div>
 
+            <div class="row mb-3">
+              <label for="formula-calibration-temp" class="col-sm-3 col-form-label">Gravity calibration temp</label>
+              <div class="col-sm-3">
+                <input disabled type="number" step=".01" min="0" max="100" class="form-control" name="formula-calibration-temp" id="formula-calibration-temp" placeholder="20" checked data-bs-toggle="tooltip" title="Calibration temperature, used in temperatur correction formula, default 20C/68F"> 
+              </div>
+              <div class="col-sm-5">(0 - 100) - default 20C/68F</div>
+            </div>
+
             <hr>
 
             <div class="row mb-3">
@@ -764,6 +796,7 @@
       $("#formula-max-deviation").prop("disabled", b);
       $("#wifi-portal-timeout").prop("disabled", b);
       $("#wifi-connect-timeout").prop("disabled", b);
+      $("#formula-calibration-temp").prop("disabled", b);     
       $("#int-http1").prop("disabled", b);
       $("#int-http2").prop("disabled", b);
       $("#int-http3").prop("disabled", b);
@@ -790,14 +823,15 @@
         $("#wifi-connect-timeout").val(cfg["wifi-connect-timeout"]);
         $("#tempsensor-resolution").val(cfg["tempsensor-resolution"]);
         $("#ignore-low-angles").prop( "checked", cfg["ignore-low-angles"] );
+        $("#formula-calibration-temp").val(cfg["formula-calibration-temp"]);
         $("#int-http1").val(cfg["int-http1"]);
         $("#int-http2").val(cfg["int-http2"]);
         $("#int-http3").val(cfg["int-http3"]);
         $("#int-influx").val(cfg["int-influx"]);
         $("#int-mqtt").val(cfg["int-mqtt"]);
 
-        if ( cfg["gyro-read-count"] != 50 || cfg["gyro-moving-threashold"] != 500 || cfg["formula-max-deviation"] != 1.6 || cfg["wifi-portal-timeout"] != 120 || cfg["wifi-connect-timeout"] != 20 || cfg["tempsensor-resolution"] != 9 || 
-             cfg["int-http1"] != 0 || cfg["int-http2"] != 0 || cfg["int-http3"] != 0 || cfg["int-influx"] != 0 || cfg["int-mqtt"] != 0 || cfg["ignore-low-angles"] != false ) {
+        if ( cfg["gyro-read-count"] != 50 || cfg["gyro-moving-threashold"] != 500 || cfg["formula-max-deviation"] != 3 || cfg["wifi-portal-timeout"] != 120 || cfg["wifi-connect-timeout"] != 20 || cfg["tempsensor-resolution"] != 9 || 
+             cfg["int-http1"] != 0 || cfg["int-http2"] != 0 || cfg["int-http3"] != 0 || cfg["int-influx"] != 0 || cfg["int-mqtt"] != 0 || cfg["ignore-low-angles"] != false || (cfg["formula-calibration-temp"] != 20 && cfg["formula-calibration-temp"] != 68)) {
           $("#adv-config").attr("checked", false );
         }
       })
@@ -856,10 +890,12 @@
         $("#mqtt-pass").val(cfg["mqtt-pass"]);
         $("#sleep-interval").val(cfg["sleep-interval"]);
         $("#voltage-factor").val(cfg["voltage-factor"]);
+        $("#voltage-config").val(cfg["voltage-config"]);
         $("#gravity-formula").val(cfg["gravity-formula"]);
         $("#temp-adjustment-value").val(cfg["temp-adjustment-value"]);
         $("#gravity-temp-adjustment").prop( "checked", cfg["gravity-temp-adjustment"] );
         $("#gyro-temp").prop( "checked", cfg["gyro-temp"] );
+        $("#storage-sleep").prop( "checked", cfg["storage-sleep"] );
         $("#gyro-calibration-data").text( cfg["gyro-calibration-data"]["ax"] + "," + cfg["gyro-calibration-data"]["ay"] + "," + cfg["gyro-calibration-data"]["az"] + "," + cfg["gyro-calibration-data"]["gx"] + "," + cfg["gyro-calibration-data"]["gy"] + "," + cfg["gyro-calibration-data"]["gz"] );
         $("#battery").text(cfg["battery"] + " V");
         $("#angle").text(cfg["angle"]);

html/firmware.htm

@@ -15,8 +15,6 @@
   <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>
@@ -24,16 +22,34 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarNav">
-        <ul class="navbar-nav mr-auto">
+        <ul class="navbar-nav">
           <li class="nav-item">
-            <a class="nav-link" href="javascript:history.back()">Back to configuration</a>
+            <a class="nav-link" href="/index.htm">Home</a>
           </li>
-        </ul>  
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle active" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+              Configuration
+            </a>
+            <ul class="dropdown-menu">
+              <li><a class="dropdown-item" href="/config.htm">Configuration</a></li>
+              <li><a class="dropdown-item" href="/format.htm">Format editor</a></li>
+              <li><a class="dropdown-item" href="/test.htm">Test push</a></li>
+              <li><a class="dropdown-item" href="#">Upload firmware</a></li>
+            </ul>
+          </li>
+                  <li class="nav-item">
+            <a class="nav-link" href="/calibration.htm">Calibration</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="/about.htm">About</a>
+          </li> 
+        </ul>
       </div>
       <div class="spinner-border text-light" id="spinner" role="status"></div>
     </div>
   </nav>
 
+
   <!-- START MAIN INDEX -->
 
   <div class="container row-margin-10">
@@ -135,7 +151,7 @@
             showError("Upload failed");
           },
           success: function(resp) {
-            showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser.");
+            showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser. If you don't get any gyro readings after update, please press the reset button!");
             setTimeout(() => {  
               window.location = "/";
             }, 10000);

html/firmware.min.htm

@@ -1,4 +1,4 @@
-<!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;
+<!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><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 dropdown"><a class="nav-link dropdown-toggle active" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Configuration</a><ul class="dropdown-menu"><li><a class="dropdown-item" href="/config.htm">Configuration</a></li><li><a class="dropdown-item" href="/format.htm">Format editor</a></li><li><a class="dropdown-item" href="/test.htm">Test push</a></li><li><a class="dropdown-item" href="#">Upload firmware</a></li></ul></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container row-margin-10"><div class="alert alert-success alert-dismissible hide fade d-none" role="alert"><div id="alert"></div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><script type="text/javascript">function showError(s){$(".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) {
@@ -26,7 +26,7 @@
             showError("Upload failed");
           },
           success: function(resp) {
-            showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser.");
+            showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser. If you don't get any gyro readings after update, please press the reset button!");
             setTimeout(() => {  
               window.location = "/";
             }, 10000);

html/format.htm

@@ -15,8 +15,6 @@
   <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>
@@ -24,39 +22,81 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarNav">
-        <ul class="navbar-nav mr-auto">
+        <ul class="navbar-nav">
           <li class="nav-item">
-            <a class="nav-link" href="javascript:history.back()">Back to configuration</a>
+            <a class="nav-link" href="/index.htm">Home</a>
           </li>
-        </ul>  
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle active" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+              Configuration
+            </a>
+            <ul class="dropdown-menu">
+              <li><a class="dropdown-item" href="/config.htm">Configuration</a></li>
+              <li><a class="dropdown-item" href="#">Format editor</a></li>
+              <li><a class="dropdown-item" href="/test.htm">Test push</a></li>
+              <li><a class="dropdown-item" href="/firmware.htm">Upload firmware</a></li>
+            </ul>
+          </li>
+                  <li class="nav-item">
+            <a class="nav-link" href="/calibration.htm">Calibration</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="/about.htm">About</a>
+          </li> 
+        </ul>
       </div>
       <div class="spinner-border text-light" id="spinner" role="status"></div>
     </div>
   </nav>
 
+
   <!-- START MAIN INDEX -->
 
   <div class="container row-margin-10">
 
-    <div class="alert alert-success alert-dismissible hide fade d-none" role="alert">
-      <div id="alert"></div>
+    <div class="alert alert-success alert-dismissible hide fade d-none" role="alert" id="alert">
+      <div id="alert-msg"></div>
+      <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+    </div>
+
+    <div class="alert alert-warning alert-dismissible hide fade d-none" role="alert" id="warning-ha">
+      <div>Home Assistant device configuration detected in MQTT format. These messages will be posted when format is saved and not during gravity measurement.</div>
+      <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+    </div>
+
+    <div class="alert alert-warning alert-dismissible hide fade d-none" role="alert" id="warning-length">
+      <div>The format template is quite large, its possible the device will not have enough memory to handle it.</div>
       <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></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 );
+        $('#alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert-msg').text( msg );
       }
 
       function showSuccess( msg ) {
-        $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
-        $('#alert').text( msg );
+        $('#alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert-msg').text( msg );
       }
 
       $("#alert-btn").click(function(e){
-        $('.alert').addClass('hide').removeClass('show').addClass('d-none');
+        $('#alert').addClass('hide').removeClass('show').addClass('d-none');
       });    
+
+      function showWarningHomeAssistant() {
+        $('#warning-ha').removeClass('d-none').addClass('show').removeClass('hide');
+      }
+      function hideWarningHomeAssistant() {
+        $('#warning-ha').addClass('d-none').removeClass('show').addClass('hide');
+      }
+
+      function showWarningLength() {
+        $('#warning-length').removeClass('d-none').addClass('show').removeClass('hide');
+      }
+      function hideWarningLength() {
+        $('#warning-length').addClass('d-none').removeClass('show').addClass('hide');
+      }
     </script>
 
     <div class="accordion" id="accordion">
@@ -89,19 +129,21 @@
 
             <div class="row mb-3">
               <div class="col-sm-12">
-                <textarea rows="10" class="form-control" name="format" id="format">  
+                <textarea rows="10" class="form-control" name="format" id="format" onchange="updateStatusField()" onkeydown="updateStatusField()">
                 </textarea>
               </div>
             </div>
 
             <script>
               let formatTemplates = [
-              { "id": "GravityMon-Post", "format": "%7B%0A%20%22name%22%20%3A%20%22%24%7Bmdns%7D%22%2C%0A%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%0A%20%22token%22%20%3A%20%22gravmon%22%2C%0A%20%22interval%22%3A%20%24%7Bsleep-interval%7D%2C%0A%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%22temp_units%22%3A%20%22%24%7Btemp-unit%7D%22%2C%0A%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%22RSSI%22%3A%20%24%7Brssi%7D%2C%0A%20%22corr-gravity%22%3A%20%24%7Bcorr-gravity%7D%2C%0A%20%22gravity-unit%22%3A%20%22%24%7Bgravity-unit%7D%22%2C%0A%20%22run-time%22%3A%20%24%7Brun-time%7D%0A%7D" },
+              { "id": "GravityMon-Post", "format": "%7B%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%0A%20%22name%22%20%3A%20%22%24%7Bmdns%7D%22%2C%0A%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%0A%20%22token%22%20%3A%20%22gravmon%22%2C%0A%20%22interval%22%3A%20%24%7Bsleep-interval%7D%2C%0A%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%22temp_units%22%3A%20%22%24%7Btemp-unit%7D%22%2C%0A%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%22RSSI%22%3A%20%24%7Brssi%7D%0A%7D" },
-              { "id": "BrewFatherCustom-Post", "format": "%7B%0A%20%20%20%22name%22%3A%20%22%24%7Bmdns%7D%22%2C%0A%20%20%20%22temp%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22aux_temp%22%3A%200%2C%0A%20%20%20%22ext_temp%22%3A%200%2C%0A%20%20%20%22temp_unit%22%3A%20%22%24%7Btemp-unit%7D%22%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22gravity_unit%22%3A%20%22%24%7Bgravity-unit%7D%22%2C%0A%20%20%20%22pressure%22%3A%200%2C%0A%20%20%20%22pressure_unit%22%3A%20%22PSI%22%2C%0A%20%20%20%22ph%22%3A%200%2C%0A%20%20%20%22bpm%22%3A%200%2C%0A%20%20%20%22comment%22%3A%20%22%22%2C%0A%20%20%20%22beer%22%3A%20%22%22%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%0A%7D" },
+              { "id": "iSpindle-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%2Ftilt%3A%24%7Bangle%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftemp_units%3A%24%7Btemp-unit%7D%7C" },
+              { "id": "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%22signal_strength%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%22voltage%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>
 
@@ -115,9 +157,12 @@
                 <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="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>
@@ -125,6 +170,9 @@
               </div>
             </div>
 
+            <div class="col-sm-8" id="status">             
+            </div>
+
             <hr class="my-2">
 
             <pre class="card-preview" id="preview" name="preview"></pre> 
@@ -138,6 +186,8 @@
   <script type="text/javascript">
     window.onload = getConfig;
 
+    var maxCharsInFormatTemplate = 1500;
+
     setButtonDisabled( true );
 
     // Opens the targetet according (if URL has #collapseOne to #collapseFour)
@@ -148,6 +198,17 @@
       }
     });
 
+    function updateStatusField() {
+      var t = $("#format").val();
+      $("#status").text( t.length + " characters in template, recommended maximum is " + maxCharsInFormatTemplate );
+
+      if (t.length > maxCharsInFormatTemplate) {
+        showWarningLength();
+      } else {
+        hideWarningLength();
+      }
+    };
+
     $("#push-target").change(function(e){
       console.log(e)
       selectFormat();
@@ -164,29 +225,88 @@
           $("#format").val( decodeURIComponent(item.format) );
         }
       });
+
+      updateStatusField();
     });
 
     // Clear the selected template
     $("#clear-btn").click(function(e) {
       $("#format").val( "" );
+      updateStatusField();
     });
 
     // 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);
 
+      /*if (s.length > maxCharsInFormatTemplate) {
+        showError("Format template is too large for the device to handle, unable to save.")
+        return;
+      }*/
+
+      $('#spinner').show(); 
+      setButtonDisabled( true );
+      var ha = false;   
+
+      hideWarningHomeAssistant();
+      if ($("#push-target").val() == "mqtt") {
+        if (s.search("homeassistant/sensor/") != -1) {
+          console.log("Current format is mqtt, it contains topics for Home Assistant device registration.")
+          showWarningHomeAssistant();
+          ha = true;
+        }
+      }
+
+      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.'); }
+        success: function(result) { showSuccess('Format stored successfully.'); postHomeAssistant(ha); },
+        error: function(result) { showError('Unable to store format.'); $('#spinner').hide(); },
+        always: function() {  $('#spinner').hide(); setButtonDisabled( false ); }
       } );
     });
-    
+ 
+    function postHomeAssistant(active) {
+      if (!active) {
+        getConfig();        
+        return;
+      }
+
+      console.log("Current format is mqtt, running post tests to register device.")
+      $('#spinner').show(); 
+      setButtonDisabled( true );
+
+      var url = "/api/test/push";
+      url += "?id=" + $("#id").val() + "&format=mqtt";
+      //var url = "/test/push.json";  
+      $.getJSON(url, function (cfg) {
+        console.log(cfg);
+
+        var code = cfg["code"];
+        var success = cfg["success"];
+        var enabled = cfg["enabled"];
+
+        if(success) {
+          showSuccess( "Format stored successfully. Home Assistant Device Registration Successful." );
+        } else {
+          showError( "Format stored successfully. Home Assistant Device Registration Failed!" );
+        }
+      })
+      .fail(function() {
+        showError( "Format stored successfully. Home Assistant Device Registration Failed!" );
+      })
+      .always(function() {
+        $('#spinner').hide(); 
+        setButtonDisabled( false );
+        getConfig();        
+      });
+    }
+
     // Test the calibration
     $("#test-btn").click(function(e) {
       var url = "/api/status";
@@ -235,6 +355,8 @@
         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 {
@@ -258,6 +380,9 @@
     function setButtonDisabled( b ) {
       $("#format-btn").prop("disabled", b);
       $("#test-btn").prop("disabled", b);
+      $("#copy-btn").prop("disabled", b);
+      $("#clear-btn").prop("disabled", b);
+      $("#push-target").prop("disabled", b);    
     }
 
     function selectFormat() {
@@ -269,6 +394,7 @@
       console.log(s);
       $("#format").val(s);
       $("#preview").text("");
+      updateStatusField();
     }
 
     // Get the configuration values from the API
@@ -276,7 +402,7 @@
       setButtonDisabled( true );
 
       var url = "/api/config/format";
-      //var url = "/test/format.json";
+      // var url = "/test/format.json";
       $('#spinner').show(); 
       $.getJSON(url, function (cfg) {
         console.log( cfg );
@@ -296,6 +422,8 @@
         $('#spinner').hide(); 
         setButtonDisabled( false );
       });
+
+      updateStatusField();
     }
   </script>
 

html/index.htm

@@ -16,8 +16,6 @@
   <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>
@@ -27,12 +25,20 @@
       <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>
+            <a class="nav-link active" href="#">Home</a>
           </li>
-          <li class="nav-item">
-            <a class="nav-link" href="/config.htm">Configuration</a>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+              Configuration
+            </a>
+            <ul class="dropdown-menu">
+              <li><a class="dropdown-item" href="/config.htm">Configuration</a></li>
+              <li><a class="dropdown-item" href="/format.htm">Format editor</a></li>
+              <li><a class="dropdown-item" href="/test.htm">Test push</a></li>
+              <li><a class="dropdown-item" href="/firmware.htm">Upload firmware</a></li>
+            </ul>
           </li>
-          <li class="nav-item">
+                  <li class="nav-item">
             <a class="nav-link" href="/calibration.htm">Calibration</a>
           </li>
           <li class="nav-item">
@@ -44,6 +50,7 @@
     </div>
   </nav>
 
+
   <!-- START MAIN INDEX -->
 
   <div class="container row-margin-10">
@@ -153,11 +160,33 @@
               });
               setInterval(function() {
                 loadLog();
-              }, 5000);
+              }, 30000);
             
               function loadLog() {
-                $("#logContent").load("/log");
-                //$("#logContent").load("/test/log");
+                var url2 = "/log2"; 
+                var url1 = "/log"; 
+                //var url2 = "/test/log2"; 
+                //var url1 = "/test/log1"; 
+                var log = "";
+                
+                $.get(url2, function(data) {
+                  console.log(data);
+                  var list = data.split("\n");
+                  list.forEach(function (item, index) {
+                    log = item + "\n" + log;
+                  });
+                }).always( function() { 
+                  $.get(url1, function(data) {
+                    console.log(data);
+                    var list = data.split("\n");          
+                    list.forEach(function (item, index) {
+                      log = item + "\n" + log;
+                    });
+                  }).always( function() { 
+                    console.log(log);
+                    $("#logContent").text(log);
+                  });
+                });
               };
             </script>
           
@@ -175,13 +204,13 @@
 
             <div class="collapse row-margin-10" id="collapseLog">
               <div class="card card-body">
-                <pre><code class="card-text" id="logContent"></code></pre>
+                <pre><code class="card-text" id="logContent" data-bs-toggle="tooltip" title="Shows the last errors on the device, newest on top.">Loading log data, please wait...</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>
+                <pre><code class="card-text" id="supportContent">Collecting support data, please wait...</code></pre>
               </div>
             </div>
 
@@ -293,7 +322,11 @@
     
         var angle = cfg["angle"];
         
-        if(angle==0) {
+        if(angle==-1) {
+          showError("Unable to connect to gyro, try a reset or power off/on")
+          $("#angle").text("No gyro"); 
+          $("#gravity").text("No gyro");
+        } else if(angle==0) {
           $("#angle").text("Gyro moving"); 
           $("#gravity").text("Gyro moving");
         } else {
@@ -322,10 +355,14 @@
 
         $("#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["temp-c"] == -273) {
+          $("#temp").text("No temp sensor");
+        } else {
+          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 );
@@ -342,7 +379,7 @@
     }
 
     function start() {
-      setInterval(getStatus, 3000);
+      setInterval(getStatus, 5000);
     }
   </script>
 

html/test.htm

@@ -15,8 +15,6 @@
   <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>
@@ -24,11 +22,28 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarNav">
-        <ul class="navbar-nav mr-auto">
+        <ul class="navbar-nav">
           <li class="nav-item">
-            <a class="nav-link" href="javascript:history.back()">Back to configuration</a>
+            <a class="nav-link" href="/index.htm">Home</a>
           </li>
-        </ul>  
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle active" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+              Configuration
+            </a>
+            <ul class="dropdown-menu">
+              <li><a class="dropdown-item" href="/config.htm">Configuration</a></li>
+              <li><a class="dropdown-item" href="/format.htm">Format editor</a></li>
+              <li><a class="dropdown-item" href="#">Test push</a></li>
+              <li><a class="dropdown-item" href="/firmware.htm">Upload firmware</a></li>
+            </ul>
+          </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>

lib/ESP_DoubleResetDetector/ESP_DoubleResetDetector.h

@@ -0,0 +1,399 @@
+/****************************************************************************************************************************
+  ESP_DoubleResetDetector.h
+  For ESP8266 / ESP32 boards
+
+  ESP_DoubleResetDetector is a library for the ESP8266/Arduino platform
+  to enable trigger configure mode by resetting ESP32 / ESP8266 twice.
+
+  Forked from DataCute https://github.com/datacute/DoubleResetDetector
+
+  Built by Khoi Hoang https://github.com/khoih-prog/ESP_DoubleResetDetector
+  Licensed under MIT license
+  Version: 1.3.1
+
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      15/12/2019 Initial coding
+  1.0.1   K Hoang      30/12/2019 Now can use EEPROM or SPIFFS for both ESP8266 and ESP32. RTC still OK for ESP8266
+  1.0.2   K Hoang      10/04/2020 Fix bug by left-over cpp file and in example.
+  1.0.3   K Hoang      13/05/2020 Update to use LittleFS for ESP8266 core 2.7.1+
+  1.1.0   K Hoang      04/12/2020 Add support to LittleFS for ESP32 using LITTLEFS Library
+  1.1.1   K Hoang      28/12/2020 Suppress all possible compiler warnings
+  1.1.2   K Hoang      10/10/2021 Update `platform.ini` and `library.json`
+  1.2.0   K Hoang      26/11/2021 Auto detect ESP32 core and use either built-in LittleFS or LITTLEFS library
+  1.2.1   K Hoang      26/11/2021 Fix compile error for ESP32 core v1.0.5-
+  1.3.0   K Hoang      10/02/2022 Add support to new ESP32-S3
+  1.3.1   K Hoang      04/03/2022 Add waitingForDRD() function to signal in DRD wating period
+*****************************************************************************************************************************/
+
+#pragma once
+
+#ifndef ESP_DoubleResetDetector_H
+#define ESP_DoubleResetDetector_H
+
+#ifndef DOUBLERESETDETECTOR_DEBUG
+  #define DOUBLERESETDETECTOR_DEBUG       false
+#endif
+
+#if defined(ARDUINO) && (ARDUINO >= 100)
+  #include <Arduino.h>
+#else
+  #include <WProgram.h>
+#endif
+
+#ifndef ESP_DOUBLE_RESET_DETECTOR_VERSION
+  #define ESP_DOUBLE_RESET_DETECTOR_VERSION             "ESP_DoubleResetDetector v1.3.1"
+  
+  #define ESP_DOUBLE_RESET_DETECTOR_VERSION_MAJOR       1
+  #define ESP_DOUBLE_RESET_DETECTOR_VERSION_MINOR       3
+  #define ESP_DOUBLE_RESET_DETECTOR_VERSION_PATCH       1
+
+  #define ESP_DOUBLE_RESET_DETECTOR_VERSION_INT         1003001
+#endif
+
+#define ESP_DOUBLERESETDETECTOR_VERSION         ESP_DOUBLE_RESET_DETECTOR_VERSION
+
+//#define ESP_DRD_USE_EEPROM      false
+//#define ESP_DRD_USE_LITTLEFS    false
+//#define ESP_DRD_USE_SPIFFS      false
+//#define ESP8266_DRD_USE_RTC     false   //true
+
+#ifdef ESP32
+  #if (!ESP_DRD_USE_EEPROM && !ESP_DRD_USE_SPIFFS && !ESP_DRD_USE_LITTLEFS)
+  
+    #if (DOUBLERESETDETECTOR_DEBUG)
+      #warning Neither EEPROM, SPIFFS nor LittleFS selected. Default to EEPROM
+    #endif
+      
+    #ifdef ESP_DRD_USE_EEPROM
+      #undef ESP_DRD_USE_EEPROM
+      #define ESP_DRD_USE_EEPROM      true
+    #endif
+  #endif
+#endif
+
+#ifdef ESP8266
+  #if (!ESP8266_DRD_USE_RTC && !ESP_DRD_USE_EEPROM && !ESP_DRD_USE_SPIFFS && !ESP_DRD_USE_LITTLEFS)
+    #if (DOUBLERESETDETECTOR_DEBUG)
+      #warning Neither RTC, EEPROM, LITTLEFS nor SPIFFS selected. Default to EEPROM
+    #endif   
+    
+    #ifdef ESP_DRD_USE_EEPROM
+      #undef ESP_DRD_USE_EEPROM
+      #define ESP_DRD_USE_EEPROM      true
+    #endif
+  #endif
+#endif
+
+//default to use EEPROM, otherwise, use LITTLEFS (higher priority), then SPIFFS
+#if ESP_DRD_USE_EEPROM
+  #include <EEPROM.h>
+
+  #define  FLAG_DATA_SIZE     4
+
+  #ifndef EEPROM_SIZE
+    #define EEPROM_SIZE     512
+  #endif
+
+  #ifndef EEPROM_START
+    #define EEPROM_START    256
+  #endif
+
+#elif ( ESP_DRD_USE_LITTLEFS || ESP_DRD_USE_SPIFFS )
+
+#include <FS.h>
+
+#ifdef ESP32
+
+  #if ESP_DRD_USE_LITTLEFS
+    // Check cores/esp32/esp_arduino_version.h and cores/esp32/core_version.h
+    //#if ( ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) )  //(ESP_ARDUINO_VERSION_MAJOR >= 2)
+    #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) )
+      #if (DOUBLERESETDETECTOR_DEBUG)
+        #warning Using ESP32 Core 1.0.6 or 2.0.0+
+      #endif 
+      
+      // The library has been merged into esp32 core from release 1.0.6
+      #include <LittleFS.h>
+      
+      #define FileFS        LittleFS
+      #define FS_Name       "LittleFS"
+    #else
+      #if (DOUBLERESETDETECTOR_DEBUG)
+        #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library
+      #endif 
+      
+      // The library has been merged into esp32 core from release 1.0.6
+      #include <LITTLEFS.h>             // https://github.com/lorol/LITTLEFS
+      
+      #define FileFS        LITTLEFS
+      #define FS_Name       "LittleFS"
+    #endif
+  #else
+    #include "SPIFFS.h"
+    // ESP32 core 1.0.4 still uses SPIFFS
+    #define FileFS   SPIFFS
+  #endif
+
+#else
+  // From ESP8266 core 2.7.1
+  #include <LittleFS.h>
+
+  #if ESP_DRD_USE_LITTLEFS
+    #define FileFS    LittleFS
+  #else
+    #define FileFS   SPIFFS
+  #endif
+
+#endif    // #if ESP_DRD_USE_EEPROM
+
+
+
+#define  DRD_FILENAME     "/drd.dat"
+
+#endif    //#if ESP_DRD_USE_EEPROM
+
+
+
+#define DOUBLERESETDETECTOR_FLAG_SET    0xD0D01234
+#define DOUBLERESETDETECTOR_FLAG_CLEAR  0xD0D04321
+
+class DoubleResetDetector
+{
+  public:
+    DoubleResetDetector(int timeout, int address)
+    {
+#if ESP_DRD_USE_EEPROM
+#if (DOUBLERESETDETECTOR_DEBUG)
+      Serial.printf("EEPROM size = %d, start = %d\n", EEPROM_SIZE, EEPROM_START);
+#endif
+
+      EEPROM.begin(EEPROM_SIZE);
+#elif ( ESP_DRD_USE_LITTLEFS || ESP_DRD_USE_SPIFFS )
+      // LittleFS / SPIFFS code
+      if (!FileFS.begin())
+      {
+#if (DOUBLERESETDETECTOR_DEBUG)
+
+#if ESP_DRD_USE_LITTLEFS
+        Serial.println("LittleFS failed!. Please use SPIFFS or EEPROM.");
+#else
+        Serial.println("SPIFFS failed!. Please use LittleFS or EEPROM.");
+#endif
+
+#endif
+      }
+#else
+#ifdef ESP8266
+      //RTC only for ESP8266
+#endif
+#endif
+
+      this->timeout = timeout * 1000;
+      this->address = address;
+      doubleResetDetected = false;
+      waitingForDoubleReset = false;
+    };
+
+    bool detectDoubleReset()
+    {
+      doubleResetDetected = detectRecentlyResetFlag();
+
+      if (doubleResetDetected)
+      {
+#if (DOUBLERESETDETECTOR_DEBUG)
+        Serial.println("doubleResetDetected");
+#endif
+
+        clearRecentlyResetFlag();
+      }
+      else
+      {
+#if (DOUBLERESETDETECTOR_DEBUG)
+        Serial.println("No doubleResetDetected");
+#endif
+
+        setRecentlyResetFlag();
+        waitingForDoubleReset = true;
+      }
+
+      return doubleResetDetected;
+
+    };
+    
+    bool waitingForDRD()
+    {
+      return waitingForDoubleReset;
+    }
+
+    void loop()
+    {
+      if (waitingForDoubleReset && millis() > timeout)
+      {
+#if (DOUBLERESETDETECTOR_DEBUG)
+        Serial.println("Stop doubleResetDetecting");
+#endif
+
+        stop();
+      }
+    };
+
+    void stop()
+    {
+      clearRecentlyResetFlag();
+      waitingForDoubleReset = false;
+    };
+
+    bool doubleResetDetected;
+
+
+  private:
+    uint32_t DOUBLERESETDETECTOR_FLAG;
+    unsigned long timeout;
+    int address;
+    bool waitingForDoubleReset;
+
+    bool detectRecentlyResetFlag()
+    {
+#if (ESP_DRD_USE_EEPROM)
+      EEPROM.get(EEPROM_START, DOUBLERESETDETECTOR_FLAG);
+      doubleResetDetectorFlag = DOUBLERESETDETECTOR_FLAG;
+
+#if (DOUBLERESETDETECTOR_DEBUG)
+      Serial.printf("EEPROM Flag read = 0x%X\n", DOUBLERESETDETECTOR_FLAG);
+#endif
+#elif ( ESP_DRD_USE_LITTLEFS || ESP_DRD_USE_SPIFFS )
+      // LittleFS / SPIFFS code
+      if (FileFS.exists(DRD_FILENAME))
+      {
+        // if config file exists, load
+        File file = FileFS.open(DRD_FILENAME, "r");
+
+        if (!file)
+        {
+#if (DOUBLERESETDETECTOR_DEBUG)
+          Serial.println("Loading config file failed");
+#endif
+        }
+
+        file.readBytes((char *) &DOUBLERESETDETECTOR_FLAG, sizeof(DOUBLERESETDETECTOR_FLAG));
+        doubleResetDetectorFlag = DOUBLERESETDETECTOR_FLAG;
+
+#if (DOUBLERESETDETECTOR_DEBUG)
+
+#if ESP_DRD_USE_LITTLEFS
+        Serial.printf("LittleFS Flag read = 0x%X\n", DOUBLERESETDETECTOR_FLAG);
+#else
+        Serial.printf("SPIFFS Flag read = 0x%X\n", DOUBLERESETDETECTOR_FLAG);
+#endif
+
+#endif
+
+        file.close();
+      }
+#else
+#ifdef ESP8266
+      //RTC only for ESP8266
+      ESP.rtcUserMemoryRead(address, &doubleResetDetectorFlag, sizeof(doubleResetDetectorFlag));
+#endif
+#endif
+
+      doubleResetDetected = (doubleResetDetectorFlag == DOUBLERESETDETECTOR_FLAG_SET);
+      return doubleResetDetected;
+    };
+
+    void setRecentlyResetFlag()
+    {
+      doubleResetDetectorFlag = DOUBLERESETDETECTOR_FLAG_SET;
+
+      DOUBLERESETDETECTOR_FLAG = DOUBLERESETDETECTOR_FLAG_SET;
+
+#if (ESP_DRD_USE_EEPROM)
+      EEPROM.put(EEPROM_START, DOUBLERESETDETECTOR_FLAG);
+      EEPROM.commit();
+
+#if (DOUBLERESETDETECTOR_DEBUG)
+      delay(1000);
+      EEPROM.get(EEPROM_START, DOUBLERESETDETECTOR_FLAG);
+
+      Serial.printf("SetFlag write = 0x%X\n", DOUBLERESETDETECTOR_FLAG);
+#endif
+#elif ( ESP_DRD_USE_LITTLEFS || ESP_DRD_USE_SPIFFS )
+      // LittleFS / SPIFFS code
+      File file = FileFS.open(DRD_FILENAME, "w");
+#if (DOUBLERESETDETECTOR_DEBUG)
+      Serial.println("Saving config file...");
+#endif
+
+      if (file)
+      {
+        file.write((uint8_t *) &DOUBLERESETDETECTOR_FLAG, sizeof(DOUBLERESETDETECTOR_FLAG));
+        file.close();
+#if (DOUBLERESETDETECTOR_DEBUG)
+        Serial.println("Saving config file OK");
+#endif
+      }
+      else
+      {
+#if (DOUBLERESETDETECTOR_DEBUG)
+        Serial.println("Saving config file failed");
+#endif
+      }
+#else
+#ifdef ESP8266
+      //RTC only for ESP8266
+      ESP.rtcUserMemoryWrite(address, &doubleResetDetectorFlag, sizeof(doubleResetDetectorFlag));
+#endif
+#endif
+    };
+
+
+    void clearRecentlyResetFlag()
+    {
+      doubleResetDetectorFlag = DOUBLERESETDETECTOR_FLAG_CLEAR;
+      DOUBLERESETDETECTOR_FLAG = DOUBLERESETDETECTOR_FLAG_CLEAR;
+
+#if (ESP_DRD_USE_EEPROM)
+      //DOUBLERESETDETECTOR_FLAG = DOUBLERESETDETECTOR_FLAG_CLEAR;
+      EEPROM.put(EEPROM_START, DOUBLERESETDETECTOR_FLAG);
+      EEPROM.commit();
+
+#if (DOUBLERESETDETECTOR_DEBUG)
+      delay(1000);
+      EEPROM.get(EEPROM_START, DOUBLERESETDETECTOR_FLAG);
+
+      Serial.printf("ClearFlag write = 0x%X\n", DOUBLERESETDETECTOR_FLAG);
+#endif
+#elif ( ESP_DRD_USE_LITTLEFS || ESP_DRD_USE_SPIFFS )
+      // LittleFS / SPIFFS code
+      File file = FileFS.open(DRD_FILENAME, "w");
+#if (DOUBLERESETDETECTOR_DEBUG)
+      Serial.println("Saving config file...");
+#endif
+
+      if (file)
+      {
+        file.write((uint8_t *) &DOUBLERESETDETECTOR_FLAG, sizeof(DOUBLERESETDETECTOR_FLAG));
+        file.close();
+#if (DOUBLERESETDETECTOR_DEBUG)
+        Serial.println("Saving config file OK");
+#endif
+      }
+      else
+      {
+#if (DOUBLERESETDETECTOR_DEBUG)
+        Serial.println("Saving config file failed");
+#endif
+      }
+
+#else
+#ifdef ESP8266
+      //RTC only for ESP8266
+      ESP.rtcUserMemoryWrite(address, &doubleResetDetectorFlag, sizeof(doubleResetDetectorFlag));
+#endif
+#endif
+    };
+
+    uint32_t doubleResetDetectorFlag;
+};
+#endif // ESP_DoubleResetDetector_H

lib/ESP_WifiManager/ESP_WiFiManager.h

@@ -0,0 +1,72 @@
+/****************************************************************************************************************************
+  ESP_WiFiManager.h
+  For ESP8266 / ESP32 boards
+
+  ESP_WiFiManager is a library for the ESP8266/Arduino platform
+  (https://github.com/esp8266/Arduino) to enable easy
+  configuration and reconfiguration of WiFi credentials using a Captive Portal
+  inspired by:
+  http://www.esp8266.com/viewtopic.php?f=29&t=2520
+  https://github.com/chriscook8/esp-arduino-apboot
+  https://github.com/esp8266/Arduino/blob/master/libraries/DNSServer/examples/CaptivePortalAdvanced/
+
+  Modified from Tzapu https://github.com/tzapu/WiFiManager
+  and from Ken Taylor https://github.com/kentaylor
+
+  Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
+  Licensed under MIT license
+  
+  Version: 1.9.0
+
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
+  1.2.0   K Hoang      09/10/2020 Restore cpp code besides Impl.h code to use if linker error. Fix bug.
+  1.3.0   K Hoang      04/12/2020 Add LittleFS support to ESP32 using LITTLEFS Library
+  1.4.1   K Hoang      22/12/2020 Fix staticIP not saved. Add functions. Add complex examples. Sync with ESPAsync_WiFiManager
+  1.4.2   K Hoang      14/01/2021 Fix examples' bug not using saved WiFi Credentials after losing all WiFi connections.
+  1.4.3   K Hoang      23/01/2021 Fix examples' bug not saving Static IP in certain cases.
+  1.5.0   K Hoang      12/02/2021 Add support to new ESP32-S2
+  1.5.1   K Hoang      26/03/2021 Fix compiler error if setting Compiler Warnings to All. Retest with esp32 core v1.0.6
+  1.5.2   K Hoang      08/04/2021 Fix example misleading messages.
+  1.5.3   K Hoang      13/04/2021 Add dnsServer error message.
+  1.6.0   K Hoang      20/04/2021 Add support to new ESP32-C3 using SPIFFS or EEPROM
+  1.6.1   K Hoang      25/04/2021 Fix MultiWiFi bug. Fix captive-portal bug if CP AP address is not default 192.168.4.1
+  1.7.0   K Hoang      06/05/2021 Set _timezoneName. Add support to new ESP32-S2 (METRO_ESP32S2, FUNHOUSE_ESP32S2, etc.)
+  1.7.1   K Hoang      08/05/2021 Fix Json bug. Fix timezoneName not displayed in Info page.
+  1.7.2   K Hoang      08/05/2021 Fix warnings with ESP8266 core v3.0.0
+  1.7.3   K Hoang      29/07/2021 Fix MultiWiFi connection issue with ESP32 core v2.0.0-rc1+
+  1.7.4   K Hoang      13/08/2021 Add WiFi scanning of hidden SSIDs
+  1.7.5   K Hoang      10/10/2021 Update `platform.ini` and `library.json`
+  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
+ *****************************************************************************************************************************/
+
+#pragma once
+
+#ifndef ESP_WiFiManager_h
+#define ESP_WiFiManager_h
+
+#include <ESP_WiFiManager.hpp>              //https://github.com/khoih-prog/ESP_WiFiManager
+#include <ESP_WiFiManager-Impl.h>           //https://github.com/khoih-prog/ESP_WiFiManager
+
+#endif    // ESP_WiFiManager_h
+

lib/ESP_WifiManager/ESP_WiFiManager_Debug.h

@@ -0,0 +1,128 @@
+/****************************************************************************************************************************
+  ESP_WiFiManager_Debug.h
+  For ESP8266 / ESP32 boards
+
+  ESP_WiFiManager is a library for the ESP8266/Arduino platform
+  (https://github.com/esp8266/Arduino) to enable easy
+  configuration and reconfiguration of WiFi credentials using a Captive Portal
+  inspired by:
+  http://www.esp8266.com/viewtopic.php?f=29&t=2520
+  https://github.com/chriscook8/esp-arduino-apboot
+  https://github.com/esp8266/Arduino/blob/master/libraries/DNSServer/examples/CaptivePortalAdvanced/
+
+  Modified from Tzapu https://github.com/tzapu/WiFiManager
+  and from Ken Taylor https://github.com/kentaylor
+
+  Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
+  Licensed under MIT license
+  
+  Version: 1.9.0
+
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
+  1.2.0   K Hoang      09/10/2020 Restore cpp code besides Impl.h code to use if linker error. Fix bug.
+  1.3.0   K Hoang      04/12/2020 Add LittleFS support to ESP32 using LITTLEFS Library
+  1.4.1   K Hoang      22/12/2020 Fix staticIP not saved. Add functions. Add complex examples. Sync with ESPAsync_WiFiManager
+  1.4.2   K Hoang      14/01/2021 Fix examples' bug not using saved WiFi Credentials after losing all WiFi connections.
+  1.4.3   K Hoang      23/01/2021 Fix examples' bug not saving Static IP in certain cases.
+  1.5.0   K Hoang      12/02/2021 Add support to new ESP32-S2
+  1.5.1   K Hoang      26/03/2021 Fix compiler error if setting Compiler Warnings to All. Retest with esp32 core v1.0.6
+  1.5.2   K Hoang      08/04/2021 Fix example misleading messages.
+  1.5.3   K Hoang      13/04/2021 Add dnsServer error message.
+  1.6.0   K Hoang      20/04/2021 Add support to new ESP32-C3 using SPIFFS or EEPROM
+  1.6.1   K Hoang      25/04/2021 Fix MultiWiFi bug. Fix captive-portal bug if CP AP address is not default 192.168.4.1
+  1.7.0   K Hoang      06/05/2021 Set _timezoneName. Add support to new ESP32-S2 (METRO_ESP32S2, FUNHOUSE_ESP32S2, etc.)
+  1.7.1   K Hoang      08/05/2021 Fix Json bug. Fix timezoneName not displayed in Info page.
+  1.7.2   K Hoang      08/05/2021 Fix warnings with ESP8266 core v3.0.0
+  1.7.3   K Hoang      29/07/2021 Fix MultiWiFi connection issue with ESP32 core v2.0.0-rc1+
+  1.7.4   K Hoang      13/08/2021 Add WiFi scanning of hidden SSIDs
+  1.7.5   K Hoang      10/10/2021 Update `platform.ini` and `library.json`
+  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
+ *****************************************************************************************************************************/
+
+#pragma once
+
+#ifndef ESP_WiFiManager_Debug_H
+#define ESP_WiFiManager_Debug_H
+
+#ifdef WIFIMGR_DEBUG_PORT
+  #define WM_DBG_PORT      WIFIMGR_DEBUG_PORT
+#else
+  #define WM_DBG_PORT      Serial
+#endif
+
+// Change _WIFIMGR_LOGLEVEL_ to set tracing and logging verbosity
+// 0: DISABLED: no logging
+// 1: ERROR: errors
+// 2: WARN: errors and warnings
+// 3: INFO: errors, warnings and informational (default)
+// 4: DEBUG: errors, warnings, informational and debug
+
+#ifndef _WIFIMGR_LOGLEVEL_
+  #define _WIFIMGR_LOGLEVEL_       0
+#endif
+
+const char WM_MARK[] = "[WM] ";
+const char WM_SP[]   = " ";
+
+#define WM_PRINT        WM_DBG_PORT.print
+#define WM_PRINTLN      WM_DBG_PORT.println
+
+#define WM_PRINT_MARK   WM_PRINT(WM_MARK)
+#define WM_PRINT_SP     WM_PRINT(WM_SP)
+
+////////////////////////////////////////////////////
+
+#define LOGERROR(x)         if(_WIFIMGR_LOGLEVEL_>0) { WM_PRINT_MARK; WM_PRINTLN(x); }
+#define LOGERROR0(x)        if(_WIFIMGR_LOGLEVEL_>0) { WM_PRINT(x); }
+#define LOGERROR1(x,y)      if(_WIFIMGR_LOGLEVEL_>0) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINTLN(y); }
+#define LOGERROR2(x,y,z)    if(_WIFIMGR_LOGLEVEL_>0) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINT(y); WM_PRINT_SP; WM_PRINTLN(z); }
+#define LOGERROR3(x,y,z,w)  if(_WIFIMGR_LOGLEVEL_>0) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINT(y); WM_PRINT_SP; WM_PRINT(z); WM_PRINT_SP; WM_PRINTLN(w); }
+
+////////////////////////////////////////////////////
+
+#define LOGWARN(x)          if(_WIFIMGR_LOGLEVEL_>1) { WM_PRINT_MARK; WM_PRINTLN(x); }
+#define LOGWARN0(x)         if(_WIFIMGR_LOGLEVEL_>1) { WM_PRINT(x); }
+#define LOGWARN1(x,y)       if(_WIFIMGR_LOGLEVEL_>1) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINTLN(y); }
+#define LOGWARN2(x,y,z)     if(_WIFIMGR_LOGLEVEL_>1) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINT(y); WM_PRINT_SP; WM_PRINTLN(z); }
+#define LOGWARN3(x,y,z,w)   if(_WIFIMGR_LOGLEVEL_>1) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINT(y); WM_PRINT_SP; WM_PRINT(z); WM_PRINT_SP; WM_PRINTLN(w); }
+
+////////////////////////////////////////////////////
+
+#define LOGINFO(x)          if(_WIFIMGR_LOGLEVEL_>2) { WM_PRINT_MARK; WM_PRINTLN(x); }
+#define LOGINFO0(x)         if(_WIFIMGR_LOGLEVEL_>2) { WM_PRINT(x); }
+#define LOGINFO1(x,y)       if(_WIFIMGR_LOGLEVEL_>2) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINTLN(y); }
+#define LOGINFO2(x,y,z)     if(_WIFIMGR_LOGLEVEL_>2) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINT(y); WM_PRINT_SP; WM_PRINTLN(z); }
+#define LOGINFO3(x,y,z,w)   if(_WIFIMGR_LOGLEVEL_>2) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINT(y); WM_PRINT_SP; WM_PRINT(z); WM_PRINT_SP; WM_PRINTLN(w); }
+
+////////////////////////////////////////////////////
+
+#define LOGDEBUG(x)         if(_WIFIMGR_LOGLEVEL_>3) { WM_PRINT_MARK; WM_PRINTLN(x); }
+#define LOGDEBUG0(x)        if(_WIFIMGR_LOGLEVEL_>3) { WM_PRINT(x); }
+#define LOGDEBUG1(x,y)      if(_WIFIMGR_LOGLEVEL_>3) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINTLN(y); }
+#define LOGDEBUG2(x,y,z)    if(_WIFIMGR_LOGLEVEL_>3) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINT(y); WM_PRINT_SP; WM_PRINTLN(z); }
+#define LOGDEBUG3(x,y,z,w)  if(_WIFIMGR_LOGLEVEL_>3) { WM_PRINT_MARK; WM_PRINT(x); WM_PRINT_SP; WM_PRINT(y); WM_PRINT_SP; WM_PRINT(z); WM_PRINT_SP; WM_PRINTLN(w); }
+
+////////////////////////////////////////////////////
+
+#endif    //ESP_WiFiManager_Debug_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

@@ -66,7 +66,7 @@ void MPU6050_Base::initialize() {
  * @return True if connection is valid, false otherwise
  */
 bool MPU6050_Base::testConnection() {
-    return getDeviceID() == 0x34 || getDeviceID() == 0x38;  // Allow both MPU6050 and MPU6000
+    return getDeviceID() == 0x34;
 }
 
 // AUX_VDDIO register (InvenSense demo code calls this RA_*G_OFFS_TC)
@@ -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,11 +15,12 @@ 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 = 
 build_flags = 
+	-Wl,-Map,output.map
 	-D BAUD=${common_env_data.monitor_speed}
 	-D ACTIVATE_OTA
 	#-D DEBUG_ESP_HTTP_CLIENT	
@@ -33,16 +34,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="\"1.0.0\""
-	#-D CFG_GITREV=\""beta-2\""
+	-D CFG_APPVER="\"1.1.0\""
+	#-D CFG_GITREV=\""beta-4\""
 	!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/PaulStoffregen/OneWire
-	#https://github.com/milesburton/Arduino-Temperature-Control-Library
-	https://github.com/mp-se/ESP_WiFiManager#v1.9.0												# https://github.com/khoih-prog/ESP_WiFiManager
-	https://github.com/mp-se/ESP_DoubleResetDetector#v1.2.1						  	# https://github.com/khoih-prog/ESP_DoubleResetDetector
+  #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
@@ -62,9 +63,8 @@ extra_scripts =
 build_unflags = 
 	${common_env_data.build_unflags}
 build_flags = 
-	-Wl,-Map,output.map
   ${common_env_data.build_flags}
-	#-D PIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS
+	-D PIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS
 	#-D SKIP_SLEEPMODE
 	#-D DOUBLERESETDETECTOR_DEBUG=true
 	#-D FORCE_GRAVITY_MODE # used to debug gravity mode
@@ -128,7 +128,7 @@ board_build.filesystem = littlefs
 
 [env:gravity32-release]
 framework = arduino
-platform = espressif32 @ 3.5.0
+platform = espressif32 @ 5.0.0
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
 extra_scripts =  
@@ -153,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/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
@@ -163,7 +163,7 @@ monitor_filters = esp32_exception_decoder
 
 [env:gravity32-perf]
 framework = arduino
-platform = espressif32 @ 3.5.0
+platform = espressif32 @ 5.0.0
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
 extra_scripts =  
@@ -179,35 +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/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
-#platform = espressif32 @ 4.1.0
-#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/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 

src/calc.cpp

@@ -52,8 +52,7 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
 #endif
 
   if (noAngles < 3) {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("CALC: Not enough values for deriving formula"));
+    writeErrorLog("CALC: Not enough values for deriving formula");
     return ERR_FORMULA_NOTENOUGHVALUES;
   } else {
     double coeffs[order + 1];
@@ -98,18 +97,15 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
 
         // If the deviation is more than 2 degress we mark it as failed.
         if (dev * 1000 > myAdvancedConfig.getMaxFormulaCreationDeviation()) {
-          char s[20];
-          snprintf(&s[0], sizeof(s), "%.8f", dev);
-          Log.error(F("CALC: Deviation to large: %s" CR), &s[0]);
+          writeErrorLog(
+              "CALC: Validation failed on angle %.2f, deviation too large %.4f "
+              "SG, formula order %d",
+              fd.a[i], dev * 1000, order);
           valid = false;
         }
       }
 
       if (!valid) {
-        ErrorFileLog errLog;
-        errLog.addEntry(
-            F("CALC: Error validating created formula. Deviation to large, "
-              "formula rejected."));
         return ERR_FORMULA_UNABLETOFFIND;
       }
 
@@ -118,8 +114,7 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
     }
   }
 
-  ErrorFileLog errLog;
-  errLog.addEntry(F("CALC: Internal error finding formula."));
+  writeErrorLog("CALC: Internal error finding formula.");
   return ERR_FORMULA_INTERNAL;
 }
 
@@ -164,8 +159,7 @@ double calculateGravity(double angle, double temp, const char *tempFormula) {
     return g;
   }
 
-  ErrorFileLog errLog;
-  errLog.addEntry("CALC: Failed to parse gravity expression " + String(err));
+  writeErrorLog("CALC: Failed to parse gravity expression %d", err);
   return 0;
 }
 
@@ -175,16 +169,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)/"
@@ -193,7 +186,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.
@@ -204,18 +197,18 @@ 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;
   }
 
-  ErrorFileLog errLog;
-  errLog.addEntry(
-      "CALC: Failed to parse expression for gravity temperature correction " +
-      String(err));
-  return gravity;
+  writeErrorLog(
+      "CALC: Failed to parse expression for gravity temperature correction %d",
+      err);
+  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 = myAdvancedConfig.getDefaultCalibrationTemp());
+double gravityTemperatureCorrectionC(double gravity, double tempC,
+                                     double calTempC);
 int createFormula(RawFormulaData &fd, char *formulaBuffer,
                   int formulaBufferSize, int order);
 

src/config.cpp

@@ -86,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;
@@ -143,12 +145,11 @@ bool Config::saveFile() {
   File configFile = LittleFS.open(CFG_FILENAME, "w");
 
   if (!configFile) {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("CFG : Failed to save configuration."));
+    writeErrorLog("CFG : Failed to save configuration.");
     return false;
   }
 
-  DynamicJsonDocument doc(CFG_JSON_BUFSIZE);
+  DynamicJsonDocument doc(3000);
   createJson(doc);
 
 #if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
@@ -174,23 +175,21 @@ bool Config::loadFile() {
 #endif
 
   if (!LittleFS.exists(CFG_FILENAME)) {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("CFG : Configuration file does not exist."));
+    writeErrorLog("CFG : Configuration file does not exist.");
     return false;
   }
 
   File configFile = LittleFS.open(CFG_FILENAME, "r");
 
   if (!configFile) {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("CFG : Failed to load configuration."));
+    writeErrorLog("CFG : Failed to load configuration.");
     return false;
   }
 
   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);
@@ -199,8 +198,7 @@ bool Config::loadFile() {
   configFile.close();
 
   if (err) {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("CFG : Failed to parse configuration (json)"));
+    writeErrorLog("CFG : Failed to parse configuration (json)");
     return false;
   }
 
@@ -253,14 +251,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));
@@ -371,8 +373,7 @@ bool AdvancedConfig::saveFile() {
   File configFile = LittleFS.open(CFG_HW_FILENAME, "w");
 
   if (!configFile) {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("CFG : Failed to write hardware configuration "));
+    writeErrorLog("CFG : Failed to write hardware configuration ");
     return false;
   }
 
@@ -423,8 +424,7 @@ bool AdvancedConfig::loadFile() {
   File configFile = LittleFS.open(CFG_HW_FILENAME, "r");
 
   if (!configFile) {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("CFG : Failed to read hardware configuration "));
+    writeErrorLog("CFG : Failed to read hardware configuration");
     return false;
   }
 
@@ -440,8 +440,7 @@ bool AdvancedConfig::loadFile() {
   configFile.close();
 
   if (err) {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("CFG : Failed to parse hardware configuration (json)"));
+    writeErrorLog("CFG : Failed to parse hardware configuration (json)");
     return false;
   }
 

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
@@ -56,12 +54,12 @@ struct RawFormulaData {
 
 class AdvancedConfig {
  private:
-  int _wifiPortalTimeout = 120;
-  int _wifiConnectTimeout = 20;
-  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;
+  int _tempSensorResolution = 9;  // bits
   int _gyroReadCount = 50;
   int _gyroReadDelay = 3150;  // us, empirical, to hold sampling to 200 Hz
   int _pushTimeout = 10;      // seconds
@@ -146,9 +144,11 @@ 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[2] = {"", ""};
@@ -184,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();
 
@@ -206,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;
@@ -370,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;

src/gyro.cpp

@@ -43,9 +43,10 @@ bool GyroSensor::setup() {
   Wire.setClock(400000);  // 400kHz I2C clock. Comment this line if having
                           // compilation difficulties
 
-  if (!accelgyro.testConnection()) {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("GYRO: Failed to connect to gyro, is it connected?"));
+  uint8_t id = accelgyro.getDeviceID();
+
+  if (id != 0x34 && id != 0x38) {  // Allow both MPU6050 and MPU6000
+    writeErrorLog("GYRO: Failed to connect to gyro, is it connected?");
     _sensorConnected = false;
   } else {
 #if !defined(GYRO_DISABLE_LOGGING)
@@ -292,9 +293,8 @@ void GyroSensor::applyCalibration() {
   if ((_calibrationOffset.ax + _calibrationOffset.ay + _calibrationOffset.az +
        _calibrationOffset.gx + _calibrationOffset.gy + _calibrationOffset.gz) ==
       0) {
-    ErrorFileLog errLog;
-    errLog.addEntry(
-        F("GYRO: No valid calibration values, please calibrate the device."));
+    writeErrorLog(
+        "GYRO: No valid calibration values, please calibrate the device.");
     return;
   }
 

src/helper.cpp

@@ -47,75 +47,68 @@ void tcp_cleanup() {
   while (tcp_tw_pcbs) tcp_abort(tcp_tw_pcbs);
 }
 
-//
-// Convert sg to plato
-//
+void checkResetReason() {
+#if defined(ESP8266)
+  rst_info* _rinfo;
+  _rinfo = ESP.getResetInfoPtr();
+
+  Log.notice(F("HELP: Last reset cause %d" CR), _rinfo->exccause);
+
+  if (_rinfo->exccause > 0) {
+    char s[120];
+    snprintf(&s[0], sizeof(s),
+             "HELP: Exception (%d) reason=%d epc1=0x%08x epc2=0x%08x "
+             "epc3=0x%08x execvaddr=0x%08x depc=0x%08x",
+             _rinfo->exccause, _rinfo->reason, _rinfo->epc1, _rinfo->epc2,
+             _rinfo->epc3, _rinfo->excvaddr, _rinfo->depc);
+    writeErrorLog(&s[0]);
+  }
+#else  // defined (ESP32)
+#warning "Todo: Handle reset reasons on ESP32"
+#endif
+}
+
+void writeErrorLog(const char* format, ...) {
+  File f = LittleFS.open(ERR_FILENAME, "a");
+
+  if (f && f.size() > ERR_FILEMAXSIZE) {
+    f.close();
+    LittleFS.remove(ERR_FILENAME2);
+    LittleFS.rename(ERR_FILENAME, ERR_FILENAME2);
+    f = LittleFS.open(ERR_FILENAME, "a");
+  }
+
+  va_list arg;
+  va_start(arg, format);
+  char buf[120];
+  vsnprintf(&buf[0], sizeof(buf), format, arg);
+  va_end(arg);
+  Log.errorln(&buf[0]);
+
+  if (f) {
+#if defined(ESP8266)
+    f.write(&buf[0], strlen(&buf[0]));
+#else  // ESP32
+    f.write((unsigned char*)&buf[0], strlen(&buf[0]));
+#endif
+    f.println();
+    f.close();
+  } else {
+    Log.warning(F("HELP: Failed to open error log." CR));
+  }
+}
+
 double convertToPlato(double sg) {
   if (sg) return 259 - (259 / sg);
   return 0;
 }
 
-//
-// Convert plato to sg
-//
 double convertToSG(double plato) { return 259 / (259 - plato); }
 
-//
-// Conversion to F
-//
 float convertCtoF(float c) { return (c * 1.8) + 32.0; }
 
-//
-// Conversion to C
-//
 float convertFtoC(float f) { return (f - 32.0) / 1.8; }
 
-//
-// Load error log from disk
-//
-ErrorFileLog::ErrorFileLog() {
-  File errFile = LittleFS.open(ERR_FILENAME, "r");
-  int i = 0;
-
-  if (errFile) {
-    do {
-      _errors[i] = errFile.readStringUntil('\n');
-      _errors[i].replace("\r", "");
-      _errors[i].replace("\n", "");
-    } while (_errors[i++].length());
-    errFile.close();
-  }
-}
-
-//
-// Add new entry to top of error log
-//
-void ErrorFileLog::addEntry(String err) {
-  for (int i = (ERR_COUNT - 1); i > 0; i--) {
-    _errors[i] = _errors[i - 1];
-  }
-  _errors[0] = err;
-  err += String(CR);
-  Log.error(err.c_str());
-  save();
-}
-
-//
-// Save error log
-//
-void ErrorFileLog::save() {
-  File errFile = LittleFS.open(ERR_FILENAME, "w");
-  if (errFile) {
-    for (int i = 0; i < ERR_COUNT; i++) {
-      errFile.println(_errors[i]);
-    }
-    errFile.close();
-  }
-}
-
-//
-// Load history log of floats
-//
 FloatHistoryLog::FloatHistoryLog(String fName) {
   _fName = fName;
 
@@ -133,9 +126,6 @@ FloatHistoryLog::FloatHistoryLog(String fName) {
   }
 }
 
-//
-// Add entry to top of log
-//
 void FloatHistoryLog::addEntry(float time) {
   for (int i = (10 - 1); i > 0; i--) {
     _runTime[i] = _runTime[i - 1];
@@ -144,9 +134,6 @@ void FloatHistoryLog::addEntry(float time) {
   save();
 }
 
-//
-// Save log
-//
 void FloatHistoryLog::save() {
   File runFile = LittleFS.open(_fName, "w");
   if (runFile) {
@@ -157,9 +144,6 @@ void FloatHistoryLog::save() {
   }
 }
 
-//
-// Print the heap information.
-//
 void printHeap(String prefix) {
 #if defined(ESP8266)
   Log.notice(
@@ -175,9 +159,6 @@ void printHeap(String prefix) {
 #endif
 }
 
-//
-// Enter deep sleep for the defined duration (Argument is seconds)
-//
 void deepSleep(int t) {
 #if LOG_LEVEL == 6 && !defined(HELPER_DISABLE_LOGGING)
   Log.verbose(F("HELP: Entering sleep mode for %ds." CR), t);
@@ -186,30 +167,18 @@ void deepSleep(int t) {
   ESP.deepSleep(wake);
 }
 
-//
-// Print the build options used
-//
 void printBuildOptions() {
   Log.notice(F("Build options: %s (%s) LOGLEVEL %d "
 #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);
 }
 
-//
-// Configure serial debug output
-//
 SerialDebug::SerialDebug(const uint32_t serialSpeed) {
   // Start serial with auto-detected rate (default to defined BAUD)
   Serial.flush();
@@ -220,18 +189,12 @@ SerialDebug::SerialDebug(const uint32_t serialSpeed) {
   getLog()->notice(F("SDBG: Serial logging started at %u." CR), serialSpeed);
 }
 
-//
-// Print the timestamp (ms since start of device)
-//
 void printTimestamp(Print* _logOutput, int _logLevel) {
   char c[12];
   snprintf(c, sizeof(c), "%10lu ", millis());
   _logOutput->print(c);
 }
 
-//
-// Read and calculate the battery voltage
-//
 void BatteryVoltage::read() {
   // The analog pin can only handle 3.3V maximum voltage so we need to reduce
   // the voltage (from max 5V)
@@ -257,9 +220,6 @@ void BatteryVoltage::read() {
 
 PerfLogging myPerfLogging;
 
-//
-// Clear the current cache
-//
 void PerfLogging::clear() {
   // Clear the measurements
   if (first == 0) return;
@@ -276,17 +236,11 @@ void PerfLogging::clear() {
   } while (pe != 0);
 }
 
-//
-// Start measuring this performance point
-//
 void PerfLogging::start(const char* key) {
   PerfEntry* pe = add(key);
   pe->start = millis();
 }
 
-//
-// Finalize measuring of this performance point
-//
 void PerfLogging::stop(const char* key) {
   PerfEntry* pe = find(key);
 
@@ -299,9 +253,6 @@ void PerfLogging::stop(const char* key) {
   }
 }
 
-//
-// Print the collected performance data
-//
 void PerfLogging::print() {
   PerfEntry* pe = first;
 
@@ -311,9 +262,6 @@ void PerfLogging::print() {
   }
 }
 
-//
-// Push collected performance data to influx (use influx configuration)
-//
 void PerfLogging::pushInflux() {
   if (!myConfig.isInfluxDb2Active()) return;
 
@@ -415,29 +363,19 @@ void PerfLogging::pushInflux() {
 
 #endif  // COLLECT_PERFDATA
 
-//
-// Convert float to formatted string with n decimals. Buffer should be at least
-// 10 chars.
-//
 char* convertFloatToString(float f, char* buffer, int dec) {
   dtostrf(f, 6, dec, buffer);
   return buffer;
 }
 
-//
-// Reduce precision to n decimals
-//
 float reduceFloatPrecision(float f, int dec) {
   char buffer[5];
   dtostrf(f, 6, dec, &buffer[0]);
   return atof(&buffer[0]);
 }
 
-//
 // urlencode
-//
 // https://circuits4you.com/2019/03/21/esp8266-url-encode-decode-example/
-//
 String urlencode(String str) {
   String encodedString;
   encodedString.reserve(str.length() * 2);
@@ -481,9 +419,6 @@ unsigned char h2int(char c) {
   return (0);
 }
 
-//
-// urlencode string
-//
 String urldecode(String str) {
   String encodedString;
   encodedString.reserve(str.length());

src/helper.hpp

@@ -28,13 +28,18 @@ SOFTWARE.
 #include <main.hpp>
 
 #define ERR_FILENAME "/error.log"
-#define ERR_COUNT 15
+#define ERR_FILENAME2 "/error2.log"
+#define ERR_FILEMAXSIZE 4000
 
 #define RUNTIME_FILENAME "/runtime.log"
 
 // tcp cleanup
 void tcp_cleanup();
 
+// Error logging
+void writeErrorLog(const char* format, ...);
+void checkResetReason();
+
 // Sleep mode
 void deepSleep(int t);
 
@@ -67,16 +72,6 @@ class SerialDebug {
   static Logging* getLog() { return &Log; }
 };
 
-class ErrorFileLog {
- private:
-  String _errors[ERR_COUNT];
-
- public:
-  ErrorFileLog();
-  void addEntry(String error);
-  void save();
-};
-
 class FloatHistoryLog {
  private:
   String _fName;

src/main.cpp

@@ -50,9 +50,6 @@ uint32_t stableGyroMillis;  // Used to calculate the total time since last
 
 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;
@@ -83,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;
   }
@@ -104,12 +105,29 @@ 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());
+    ESP.deepSleep(0);  // indefinite sleep
+#else
+#warning "Check and test the max deep sleep for esp32"
+    // deepSleep(70 * 60);  // quick search on internet suggest max time is 70
+    // min
+    ESP.deepSleep(0);  // indefinite sleep
+#endif
   }
 }
 
-//
-// Setup
-//
 void setup() {
   LOG_PERF_START("run-time");
   LOG_PERF_START("main-setup");
@@ -118,12 +136,9 @@ void setup() {
 #if LOG_LEVEL == 6 && !defined(MAIN_DISABLE_LOGGING)
   // Add a delay so that serial is started.
   // delay(3000);
-#if defined(ESP8266)
-  Log.verbose(F("Main: Reset reason %s." CR), ESP.getResetInfo().c_str());
-#else  // defined (ESP32)
-#endif
 #endif
   // Main startup
+
 #if defined(ESP8266)
   Log.notice(F("Main: Started setup for %s." CR),
              String(ESP.getChipId(), HEX).c_str());
@@ -142,6 +157,7 @@ void setup() {
 
   LOG_PERF_START("main-config-load");
   myConfig.checkFileSystem();
+  checkResetReason();
   myConfig.loadFile();
   myWifi.init();
   myAdvancedConfig.loadFile();
@@ -177,14 +193,14 @@ void setup() {
       break;
 
     default:
-      if (!myGyro.setup()) {
-        ErrorFileLog errLog;
-        errLog.addEntry(
-            F("MAIN: Failed to initialize the gyro, is it connected?"));
-      } else {
+      if (myGyro.setup()) {
         LOG_PERF_START("main-gyro-read");
         myGyro.read();
         LOG_PERF_STOP("main-gyro-read");
+      } else {
+        Log.notice(
+            F("Main: Failed to connect to the gyro, software will not be able "
+              "to detect angles." CR));
       }
 
       myBatteryVoltage.read();
@@ -264,7 +280,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, "
@@ -358,11 +379,12 @@ 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:
       if (myWifi.isConnected()) myWebServerHandler.loop();
 

src/main.hpp

@@ -29,7 +29,12 @@ SOFTWARE.
 #include <ArduinoLog.h>
 #include <stdlib.h>
 
-enum RunMode { gravityMode = 0, configurationMode = 1, wifiSetupMode = 2 };
+enum RunMode {
+  gravityMode = 0,
+  configurationMode = 1,
+  wifiSetupMode = 2,
+  storageMode = 3
+};
 extern RunMode runMode;
 
 #if defined(ESP8266)
@@ -41,13 +46,8 @@ extern RunMode runMode;
 #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

@@ -34,9 +34,6 @@ SOFTWARE.
 
 #define PUSHINT_FILENAME "/push.dat"
 
-//
-// Decrease counters
-//
 void PushIntervalTracker::update(const int index, const int defaultValue) {
   if (_counters[index] <= 0)
     _counters[index] = defaultValue;
@@ -44,9 +41,6 @@ void PushIntervalTracker::update(const int index, const int defaultValue) {
     _counters[index]--;
 }
 
-//
-// Load data from file
-//
 void PushIntervalTracker::load() {
   File intFile = LittleFS.open(PUSHINT_FILENAME, "r");
 
@@ -143,10 +137,11 @@ void PushTarget::sendAll(float angle, float gravitySG, float corrGravitySG,
 
   if (myConfig.isMqttActive() && intDelay.useMqtt()) {
     LOG_PERF_START("push-mqtt");
-    sendMqtt(engine, myConfig.isMqttSSL());
+    sendMqtt(engine, myConfig.isMqttSSL(), true);
     LOG_PERF_STOP("push-mqtt");
   }
 
+  engine.freeMemory();
   intDelay.save();
 }
 
@@ -232,8 +227,7 @@ void PushTarget::sendInfluxDb2(TemplatingEngine& engine, bool isSecure) {
     _lastSuccess = true;
     Log.notice(F("PUSH: InfluxDB2 push successful, response=%d" CR), _lastCode);
   } else {
-    ErrorFileLog errLog;
-    errLog.addEntry("PUSH: Influxdb push failed response=" + String(_lastCode));
+    writeErrorLog("PUSH: Influxdb push failed response=%d", _lastCode);
   }
 
   if (isSecure) {
@@ -261,8 +255,8 @@ void PushTarget::addHttpHeader(HTTPClient& http, String header) {
                value.c_str());
     http.addHeader(name, value);
   } else {
-    ErrorFileLog errLog;
-    errLog.addEntry("PUSH: Unable to set header, invalid value " + header);
+    writeErrorLog("PUSH: Unable to set header, invalid value %s",
+                  header.c_str());
   }
 }
 
@@ -338,9 +332,8 @@ void PushTarget::sendHttpPost(TemplatingEngine& engine, bool isSecure,
     _lastSuccess = true;
     Log.notice(F("PUSH: HTTP post successful, response=%d" CR), _lastCode);
   } else {
-    ErrorFileLog errLog;
-    errLog.addEntry("PUSH: HTTP post failed response=" + String(_lastCode) +
-                    String(index == 0 ? " (http)" : " (http2)"));
+    writeErrorLog("PUSH: HTTP post failed response=%d http%d", _lastCode,
+                  index + 1);
   }
 
   if (isSecure) {
@@ -399,8 +392,7 @@ void PushTarget::sendHttpGet(TemplatingEngine& engine, bool isSecure) {
     _lastSuccess = true;
     Log.notice(F("PUSH: HTTP get successful, response=%d" CR), _lastCode);
   } else {
-    ErrorFileLog errLog;
-    errLog.addEntry("PUSH: HTTP get failed response=" + String(_lastCode));
+    writeErrorLog("PUSH: HTTP get failed response=%d", _lastCode);
   }
 
   if (isSecure) {
@@ -416,9 +408,11 @@ void PushTarget::sendHttpGet(TemplatingEngine& engine, bool isSecure) {
 //
 // Send data to mqtt target
 //
-void PushTarget::sendMqtt(TemplatingEngine& engine, bool isSecure) {
+void PushTarget::sendMqtt(TemplatingEngine& engine, bool isSecure,
+                          bool skipHomeAssistantRegistration) {
 #if !defined(PUSH_DISABLE_LOGGING)
-  Log.notice(F("PUSH: Sending values to mqtt." CR));
+  Log.notice(F("PUSH: Sending values to mqtt. Skip HA registration=%s" CR),
+             skipHomeAssistantRegistration ? "yes" : "no");
 #endif
   _lastCode = 0;
   _lastSuccess = false;
@@ -483,15 +477,22 @@ void PushTarget::sendMqtt(TemplatingEngine& engine, bool isSecure) {
     Log.verbose(F("PUSH: topic '%s', value '%s'." CR), topic.c_str(),
                 value.c_str());
 #endif
-    if (mqtt.publish(topic, value)) {
-      _lastSuccess = true;
-      Log.notice(F("PUSH: MQTT publish successful on %s" CR), topic.c_str());
-      _lastCode = 0;
+
+    if (skipHomeAssistantRegistration &&
+        topic.startsWith("homeassistant/sensor/")) {
+      Log.notice(F("PUSH: Ignoring Home Assistant registration topic %s" CR),
+                 topic.c_str());
     } else {
-      _lastCode = mqtt.lastError();
-      ErrorFileLog errLog;
-      errLog.addEntry("PUSH: MQTT push on " + topic +
-                      " failed error=" + String(mqtt.lastError()));
+      if (mqtt.publish(topic, value)) {
+        _lastSuccess = true;
+        Log.notice(F("PUSH: MQTT publish successful on %s" CR), topic.c_str());
+        _lastCode = 0;
+      } else {
+        _lastSuccess = false;
+        _lastCode = mqtt.lastError();
+        writeErrorLog("PUSH: MQTT push on %s  failed error=%d", topic.c_str(),
+                      _lastCode);
+      }
     }
 
     index = next + 1;

src/pushtarget.hpp

@@ -61,7 +61,8 @@ class PushTarget {
     sendHttpGet(engine, isSecure);
   }
   void sendInfluxDb2(TemplatingEngine& engine, bool isSecure);
-  void sendMqtt(TemplatingEngine& engine, bool isSecure);
+  void sendMqtt(TemplatingEngine& engine, bool isSecure,
+                bool skipHomeAssistantRegistration = true);
   int getLastCode() { return _lastCode; }
   bool getLastSuccess() { return _lastSuccess; }
 };

src/resources.hpp

@@ -53,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"

src/templating.cpp

@@ -130,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
@@ -138,30 +141,30 @@ void TemplatingEngine::initialize(float angle, float gravitySG,
 //
 // Create the data using defined template.
 //
-const String& TemplatingEngine::create(TemplatingEngine::Templates idx) {
+const char* TemplatingEngine::create(TemplatingEngine::Templates idx) {
   String fname;
-  baseTemplate.reserve(600);
+  _baseTemplate.reserve(600);
 
   // Load templates from memory
   switch (idx) {
     case TEMPLATE_HTTP1:
-      baseTemplate = String(iSpindleFormat);
+      _baseTemplate = String(iSpindleFormat);
       fname = TPL_FNAME_HTTP1;
       break;
     case TEMPLATE_HTTP2:
-      baseTemplate = String(iSpindleFormat);
+      _baseTemplate = String(iSpindleFormat);
       fname = TPL_FNAME_HTTP2;
       break;
     case TEMPLATE_HTTP3:
-      baseTemplate = String(iHttpGetFormat);
+      _baseTemplate = String(iHttpGetFormat);
       fname = TPL_FNAME_HTTP3;
       break;
     case TEMPLATE_INFLUX:
-      baseTemplate = String(influxDbFormat);
+      _baseTemplate = String(influxDbFormat);
       fname = TPL_FNAME_INFLUXDB;
       break;
     case TEMPLATE_MQTT:
-      baseTemplate = String(mqttFormat);
+      _baseTemplate = String(mqttFormat);
       fname = TPL_FNAME_MQTT;
       break;
   }
@@ -172,7 +175,7 @@ const String& TemplatingEngine::create(TemplatingEngine::Templates idx) {
     char buf[file.size() + 1];
     memset(&buf[0], 0, file.size() + 1);
     file.readBytes(&buf[0], file.size());
-    baseTemplate = String(&buf[0]);
+    _baseTemplate = String(&buf[0]);
     file.close();
     Log.notice(F("TPL : Template loaded from disk %s." CR), fname.c_str());
   }
@@ -182,13 +185,16 @@ const String& TemplatingEngine::create(TemplatingEngine::Templates idx) {
 #endif
 
   // Insert data into template.
-  transform(baseTemplate);
+  transform();
+  _baseTemplate.clear();
 
 #if LOG_LEVEL == 6
   // Log.verbose(F("TPL : Transformed '%s'." CR), baseTemplate.c_str());
 #endif
 
-  return baseTemplate;
+  if (_output) return _output;
+
+  return "";
 }
 
 // EOF

src/templating.hpp

@@ -53,6 +53,8 @@ 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"
@@ -73,33 +75,35 @@ class TemplatingEngine {
     String val;
   };
 
-  KeyVal items[21] = {{TPL_MDNS, ""},           {TPL_ID, ""},
-                      {TPL_SLEEP_INTERVAL, ""}, {TPL_TEMP, ""},
-                      {TPL_TEMP_C, ""},         {TPL_TEMP_F, ""},
-                      {TPL_TEMP_UNITS, ""},     {TPL_BATTERY, ""},
-                      {TPL_RSSI, ""},           {TPL_RUN_TIME, ""},
-                      {TPL_ANGLE, ""},          {TPL_TILT, ""},
-                      {TPL_GRAVITY, ""},        {TPL_GRAVITY_G, ""},
-                      {TPL_GRAVITY_P, ""},      {TPL_GRAVITY_CORR, ""},
-                      {TPL_GRAVITY_CORR_G, ""}, {TPL_GRAVITY_CORR_P, ""},
-                      {TPL_GRAVITY_UNIT, ""},   {TPL_TOKEN, ""},
-                      {TPL_TOKEN2, ""}};
+  KeyVal _items[23] = {{TPL_MDNS, ""},           {TPL_ID, ""},
+                       {TPL_SLEEP_INTERVAL, ""}, {TPL_TEMP, ""},
+                       {TPL_TEMP_C, ""},         {TPL_TEMP_F, ""},
+                       {TPL_TEMP_UNITS, ""},     {TPL_BATTERY, ""},
+                       {TPL_RSSI, ""},           {TPL_RUN_TIME, ""},
+                       {TPL_ANGLE, ""},          {TPL_TILT, ""},
+                       {TPL_GRAVITY, ""},        {TPL_GRAVITY_G, ""},
+                       {TPL_GRAVITY_P, ""},      {TPL_GRAVITY_CORR, ""},
+                       {TPL_GRAVITY_CORR_G, ""}, {TPL_GRAVITY_CORR_P, ""},
+                       {TPL_GRAVITY_UNIT, ""},   {TPL_TOKEN, ""},
+                       {TPL_TOKEN2, ""},         {TPL_APP_VER, ""},
+                       {TPL_APP_BUILD, ""}};
 
-  char buffer[20];
-  String baseTemplate;
+  char _buffer[20] = "";
+  String _baseTemplate;
+  char *_output = 0;
 
   void setVal(String key, float val, int dec = 2) {
-    String s = convertFloatToString(val, &buffer[0], dec);
+    String s = convertFloatToString(val, &_buffer[0], dec);
     s.trim();
     setVal(key, s);
   }
   void setVal(String key, int val) { setVal(key, String(val)); }
   void setVal(String key, char val) { setVal(key, String(val)); }
   void setVal(String key, String val) {
-    int max = sizeof(items) / sizeof(KeyVal);
+    int max = sizeof(_items) / sizeof(KeyVal);
     for (int i = 0; i < max; i++) {
-      if (items[i].key.equals(key)) {
-        items[i].val = val;
+      if (_items[i].key.equals(key)) {
+        _items[i].val = val;
         return;
       }
     }
@@ -107,21 +111,73 @@ class TemplatingEngine {
     Log.warning(F("TPL : Key not found %s." CR), key.c_str());
   }
 
-  void transform(String& s) {
-    int max = sizeof(items) / sizeof(KeyVal);
-    for (int i = 0; i < max; i++) {
-      while (s.indexOf(items[i].key) != -1)
-        s.replace(items[i].key, items[i].val);
+  void transform() {
+    const char *format = _baseTemplate.c_str();
+    int len = _baseTemplate.length();
+    int size = len;
+
+    // Lets check how much memory will be needed to transform the template
+    for (int j = 0; j < len - 2; j++) {
+      if (*(format + j) == '$' && *(format + j + 1) == '{') {
+        // Start of format tag found
+        int max = sizeof(_items) / sizeof(KeyVal);
+        for (int i = 0; i < max; i++) {
+          if (strncmp(format + j, _items[i].key.c_str(),
+                      _items[i].key.length()) == 0) {
+            // Found key
+            size = size - _items[i].key.length() + _items[i].val.length();
+          }
+        }
+      }
     }
+
+    freeMemory();  // In case this is reused
+    _output = static_cast<char *>(malloc(size + 20));
+
+    if (!_output) {
+      Log.error(F("TPL : Unable to allocate memory for transforming template, "
+                  "needed %d." CR),
+                size);
+      return;
+    }
+
+    memset(_output, 0, size + 20);
+
+    // Lets do the transformation
+    int k = 0;
+    for (int j = 0; j < len - 2; j++) {
+      if (*(format + j) == '$' && *(format + j + 1) == '{') {
+        // Start of format tag found
+        int max = sizeof(_items) / sizeof(KeyVal);
+        for (int i = 0; i < max; i++) {
+          if (strncmp(format + j, _items[i].key.c_str(),
+                      _items[i].key.length()) == 0) {
+            // Found key
+            strncat(_output, format + k, j - k);
+            strncat(_output, _items[i].val.c_str(), _items[i].val.length());
+            k = j + _items[i].key.length();
+          }
+        }
+      }
+    }
+    strncat(_output, format + k, size - k);
+    Log.notice(F("TPL : Transformed template %d chars to %d chars" CR),
+               strlen(format), strlen(_output));
+
+#if LOG_LEVEL == 6
+    printHeap("TPL ");
+    Log.verboseln(format);
+    Log.verboseln(_output);
+#endif
   }
 
   void dumpAll() {
-    int max = sizeof(items) / sizeof(KeyVal);
+    int max = sizeof(_items) / sizeof(KeyVal);
     for (int i = 0; i < max; i++) {
       Serial.print("Key=\'");
-      Serial.print(items[i].key.c_str());
+      Serial.print(_items[i].key.c_str());
       Serial.print("\', Val=\'");
-      Serial.print(items[i].val.c_str());
+      Serial.print(_items[i].val.c_str());
       Serial.println("\'");
     }
   }
@@ -135,9 +191,18 @@ class TemplatingEngine {
     TEMPLATE_MQTT = 4
   };
 
+  TemplatingEngine() {}
+  ~TemplatingEngine() { freeMemory(); }
+
+  void freeMemory() {
+    if (_output) free(_output);
+
+    _output = 0;
+    _baseTemplate.clear();
+  }
   void initialize(float angle, float gravitySG, float corrGravitySG,
                   float tempC, float runTime);
-  const String& create(TemplatingEngine::Templates idx);
+  const char *create(TemplatingEngine::Templates idx);
 };
 
 #endif  // SRC_TEMPLATING_HPP_

src/webserver.cpp

@@ -44,12 +44,15 @@ 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;
 
   if (myGyro.hasValue()) angle = myGyro.getAngle();
@@ -69,8 +72,8 @@ void WebServerHandler::webHandleConfig() {
     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()) {
@@ -97,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");
 }
@@ -160,13 +164,11 @@ 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");
 }
 
-//
-// Callback from webServer when / has been accessed.
-//
 void WebServerHandler::webHandleUploadFile() {
   LOG_PERF_START("webserver-api-upload-file");
   Log.verbose(F("WEB : webServer callback for /api/upload(post)." CR));
@@ -208,9 +210,7 @@ void WebServerHandler::webHandleUploadFile() {
                  maxSketchSpace / 1024);
 
       if (!Update.begin(maxSketchSpace, U_FLASH, PIN_LED)) {
-        ErrorFileLog errLog;
-        errLog.addEntry(
-            F("WEB : Not enough space to store for this firmware."));
+        writeErrorLog("WEB : Not enough space to store for this firmware.");
         _uploadReturn = 500;
       }
     } else if (upload.status == UPLOAD_FILE_WRITE) {
@@ -232,9 +232,8 @@ void WebServerHandler::webHandleUploadFile() {
         delay(500);
         ESP_RESET();
       } else {
-        ErrorFileLog errLog;
-        errLog.addEntry("WEB : Failed to finish firmware flashing error=" +
-                        String(Update.getError()));
+        writeErrorLog("WEB : Failed to finish firmware flashing error=%d",
+                      Update.getError());
         _uploadReturn = 500;
       }
     } else {
@@ -292,9 +291,6 @@ void WebServerHandler::webHandleCalibrate() {
   LOG_PERF_STOP("webserver-api-calibrate");
 }
 
-//
-// Callback from webServer when / has been accessed.
-//
 void WebServerHandler::webHandleFactoryDefaults() {
   String id = _server->arg(PARAM_ID);
   Log.notice(F("WEB : webServer callback for /api/factory." CR));
@@ -318,16 +314,27 @@ void WebServerHandler::webHandleFactoryDefaults() {
   }
 }
 
-//
-// Callback from webServer when / has been accessed.
-//
+void WebServerHandler::webHandleLogClear() {
+  String id = _server->arg(PARAM_ID);
+  Log.notice(F("WEB : webServer callback for /api/clearlog." CR));
+
+  if (!id.compareTo(myConfig.getID())) {
+    _server->send(200, "text/plain", "Removing logfiles...");
+    LittleFS.remove(ERR_FILENAME);
+    LittleFS.remove(ERR_FILENAME2);
+    _server->send(200, "text/plain", "Logfiles cleared.");
+  } else {
+    _server->send(400, "text/plain", "Unknown ID.");
+  }
+}
+
 void WebServerHandler::webHandleStatus() {
   LOG_PERF_START("webserver-api-status");
   Log.notice(F("WEB : webServer callback for /api/status(get)." CR));
 
-  DynamicJsonDocument doc(512);
+  DynamicJsonDocument doc(500);
 
-  double angle = 0;
+  double angle = 0;  // Indicate we have no valid gyro value
 
   if (myGyro.hasValue()) angle = myGyro.getAngle();
 
@@ -335,9 +342,13 @@ void WebServerHandler::webHandleStatus() {
   double gravity = calculateGravity(angle, tempC);
 
   doc[PARAM_ID] = myConfig.getID();
-  doc[PARAM_ANGLE] = reduceFloatPrecision(angle);
+  doc[PARAM_ANGLE] = myGyro.isConnected()
+                         ? reduceFloatPrecision(angle)
+                         : -1;  // Indicate that we have no connection to gyro
+
   if (myConfig.isGravityTempAdj()) {
-    gravity = gravityTemperatureCorrectionC(gravity, tempC);
+    gravity = gravityTemperatureCorrectionC(
+        gravity, tempC, myAdvancedConfig.getDefaultCalibrationTemp());
   }
   if (myConfig.isGravityPlato()) {
     doc[PARAM_GRAVITY] = reduceFloatPrecision(convertToPlato(gravity), 1);
@@ -376,15 +387,13 @@ 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");
 }
 
-//
-// Callback from webServer when / has been accessed.
-//
 void WebServerHandler::webHandleClearWIFI() {
   String id = _server->arg(PARAM_ID);
   Log.notice(F("WEB : webServer callback for /api/clearwifi." CR));
@@ -405,9 +414,6 @@ void WebServerHandler::webHandleClearWIFI() {
   }
 }
 
-//
-// Used to force the device to never sleep.
-//
 void WebServerHandler::webHandleStatusSleepmode() {
   LOG_PERF_START("webserver-api-sleepmode");
   String id = _server->arg(PARAM_ID);
@@ -605,8 +611,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));
@@ -624,6 +632,12 @@ void WebServerHandler::webHandleConfigHardware() {
         _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);
@@ -663,9 +677,11 @@ void WebServerHandler::webHandleConfigAdvancedWrite() {
   if (_server->hasArg(PARAM_HW_FORMULA_DEVIATION))
     myAdvancedConfig.setMaxFormulaCreationDeviation(
         _server->arg(PARAM_HW_FORMULA_DEVIATION).toFloat());
-  if (_server->hasArg(PARAM_HW_FORMULA_CALIBRATION_TEMP))
-    myAdvancedConfig.SetDefaultCalibrationTemp(
-        _server->arg(PARAM_HW_FORMULA_CALIBRATION_TEMP).toFloat());
+  if (_server->hasArg(PARAM_HW_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());
@@ -714,7 +730,7 @@ void WebServerHandler::webHandleConfigAdvancedRead() {
   LOG_PERF_START("webserver-api-config-advanced");
   Log.notice(F("WEB : webServer callback for /api/config/advanced(get)." CR));
 
-  DynamicJsonDocument doc(512);
+  DynamicJsonDocument doc(500);
 
   doc[PARAM_HW_GYRO_READ_COUNT] = myAdvancedConfig.getGyroReadCount();
   // doc[PARAM_HW_GYRO_READ_DELAY] = myAdvancedConfig.getGyroReadDelay();
@@ -725,8 +741,9 @@ void WebServerHandler::webHandleConfigAdvancedRead() {
   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] =
-      myAdvancedConfig.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();
@@ -742,8 +759,9 @@ void WebServerHandler::webHandleConfigAdvancedRead() {
 #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-config-advanced");
 }
@@ -755,7 +773,7 @@ void WebServerHandler::webHandleFormulaRead() {
   LOG_PERF_START("webserver-api-formula-read");
   Log.notice(F("WEB : webServer callback for /api/formula(get)." CR));
 
-  DynamicJsonDocument doc(512);
+  DynamicJsonDocument doc(500);
   const RawFormulaData& fd = myConfig.getFormulaData();
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
@@ -773,10 +791,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();
@@ -824,8 +845,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");
 }
@@ -869,8 +891,7 @@ void WebServerHandler::webHandleConfigFormatWrite() {
     _server->sendHeader("Location", "/format.htm", true);
     _server->send(302, "text/plain", "Format updated");
   } else {
-    ErrorFileLog errLog;
-    errLog.addEntry(F("WEB : Unable to store format file"));
+    writeErrorLog("WEB : Unable to store format file");
     _server->send(400, "text/plain", "Unable to store format in file.");
   }
 
@@ -900,7 +921,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);
@@ -923,10 +945,11 @@ void WebServerHandler::webHandleTestPush() {
     push.sendInfluxDb2(engine, myConfig.isInfluxSSL());
     enabled = true;
   } else if (!type.compareTo(PARAM_FORMAT_MQTT) && myConfig.isMqttActive()) {
-    push.sendMqtt(engine, myConfig.isMqttSSL());
+    push.sendMqtt(engine, myConfig.isMqttSSL(), false);
     enabled = true;
   }
 
+  engine.freeMemory();
   DynamicJsonDocument doc(100);
   doc[PARAM_PUSH_ENABLED] = enabled;
   doc[PARAM_PUSH_SUCCESS] = push.getLastSuccess();
@@ -935,6 +958,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);
@@ -997,48 +1021,52 @@ 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);
-
-  doc[PARAM_ID] = myConfig.getID();
+  String out;
+  out.reserve(7000);
+  out += "{\"id\":\"" + String(myConfig.getID()) + "\",";
 
   String s = readFile(TPL_FNAME_HTTP1);
+  out += "\"" + String(PARAM_FORMAT_HTTP1) + "\":\"";
   if (s.length())
-    doc[PARAM_FORMAT_HTTP1] = urlencode(s);
+    out += urlencode(s);
   else
-    doc[PARAM_FORMAT_HTTP1] = urlencode(String(&iSpindleFormat[0]));
+    out += urlencode(String(&iSpindleFormat[0]));
 
   s = readFile(TPL_FNAME_HTTP2);
+  out += "\",\"" + String(PARAM_FORMAT_HTTP2) + "\":\"";
   if (s.length())
-    doc[PARAM_FORMAT_HTTP2] = urlencode(s);
+    out += urlencode(s);
   else
-    doc[PARAM_FORMAT_HTTP2] = urlencode(String(&iSpindleFormat[0]));
+    out += urlencode(String(&iSpindleFormat[0]));
 
   s = readFile(TPL_FNAME_HTTP3);
+  out += "\",\"" + String(PARAM_FORMAT_HTTP3) + "\":\"";
   if (s.length())
-    doc[PARAM_FORMAT_HTTP3] = urlencode(s);
+    out += urlencode(s);
   else
-    doc[PARAM_FORMAT_HTTP3] = urlencode(String(&iHttpGetFormat[0]));
+    out += urlencode(String(&iHttpGetFormat[0]));
 
   s = readFile(TPL_FNAME_INFLUXDB);
+  out += "\",\"" + String(PARAM_FORMAT_INFLUXDB) + "\":\"";
   if (s.length())
-    doc[PARAM_FORMAT_INFLUXDB] = urlencode(s);
+    out += urlencode(s);
   else
-    doc[PARAM_FORMAT_INFLUXDB] = urlencode(String(&influxDbFormat[0]));
+    out += urlencode(String(&influxDbFormat[0]));
 
   s = readFile(TPL_FNAME_MQTT);
+  out += "\",\"" + String(PARAM_FORMAT_MQTT) + "\":\"";
   if (s.length())
-    doc[PARAM_FORMAT_MQTT] = urlencode(s);
+    out += urlencode(s);
   else
-    doc[PARAM_FORMAT_MQTT] = urlencode(String(&mqttFormat[0]));
+    out += urlencode(String(&mqttFormat[0]));
+
+  out += "\"}";
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
-  serializeJson(doc, Serial);
+  Serial.print(out.c_str());
   Serial.print(CR);
 #endif
 
-  String out;
-  out.reserve(2048);
-  serializeJson(doc, out);
   _server->send(200, "application/json", out.c_str());
   LOG_PERF_STOP("webserver-api-config-format-read");
 }
@@ -1099,6 +1127,7 @@ void WebServerHandler::webHandleFormulaWrite() {
     fd.g[9] = _server->arg("g10").toDouble();
   }
 
+  fd.g[0] = 1;  // force first point to SG gravity of water
   myConfig.setFormulaData(fd);
 
   int e;
@@ -1228,6 +1257,7 @@ bool WebServerHandler::setupWebServer() {
 #endif
 
   // Static content
+  Log.notice(F("WEB : Setting up handlers for web server." CR));
 #if defined(EMBED_HTML)
   _server->on("/", std::bind(&WebServerHandler::webReturnIndexHtm, this));
   _server->on("/index.htm",
@@ -1270,30 +1300,26 @@ bool WebServerHandler::setupWebServer() {
   _server->on("/firmware.htm",
               std::bind(&WebServerHandler::webReturnFirmwareHtm, this));
   _server->serveStatic("/log", LittleFS, ERR_FILENAME);
+  _server->serveStatic("/log2", LittleFS, ERR_FILENAME2);
   _server->serveStatic("/runtime", LittleFS, RUNTIME_FILENAME);
 
   // Dynamic content
-  _server->on(
-      "/api/config", HTTP_GET,
-      std::bind(&WebServerHandler::webHandleConfig, this));  // Get config.json
+  _server->on("/api/clearlog", HTTP_GET,
+              std::bind(&WebServerHandler::webHandleLogClear, this));
+  _server->on("/api/config", HTTP_GET,
+              std::bind(&WebServerHandler::webHandleConfig, this));
   _server->on("/api/formula", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleFormulaRead,
-                        this));  // Get formula.json (calibration page)
+              std::bind(&WebServerHandler::webHandleFormulaRead, this));
   _server->on("/api/formula", HTTP_POST,
-              std::bind(&WebServerHandler::webHandleFormulaWrite,
-                        this));  // Get formula.json (calibration page)
+              std::bind(&WebServerHandler::webHandleFormulaWrite, this));
   _server->on("/api/calibrate", HTTP_POST,
-              std::bind(&WebServerHandler::webHandleCalibrate,
-                        this));  // Run calibration routine (param id)
+              std::bind(&WebServerHandler::webHandleCalibrate, this));
   _server->on("/api/factory", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleFactoryDefaults,
-                        this));  // Reset the device
+              std::bind(&WebServerHandler::webHandleFactoryDefaults, this));
   _server->on("/api/status", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleStatus,
-                        this));  // Get the status.json
+              std::bind(&WebServerHandler::webHandleStatus, this));
   _server->on("/api/clearwifi", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleClearWIFI,
-                        this));  // Clear wifi settings
+              std::bind(&WebServerHandler::webHandleClearWIFI, this));
   _server->on(
       "/api/upload", HTTP_GET,
       std::bind(&WebServerHandler::webHandleUpload, this));  // Get upload.json
@@ -1340,9 +1366,6 @@ bool WebServerHandler::setupWebServer() {
   return true;
 }
 
-//
-// called from main loop
-//
 void WebServerHandler::loop() {
 #if defined(ESP8266)
   MDNS.update();

src/webserver.hpp

@@ -76,6 +76,7 @@ class WebServerHandler {
   void webHandleCalibrate();
   void webHandleUploadFile();
   void webHandleUpload();
+  void webHandleLogClear();
   void webHandlePageNotFound();
 
   String readFile(String fname);

src/wifi.cpp

@@ -203,9 +203,7 @@ bool WifiConnection::waitForConnection(int maxTime) {
 
     if (i++ >
         (maxTime * 10)) {  // Try for maxTime seconds. Since delay is 100ms.
-      ErrorFileLog errLog;
-      errLog.addEntry("WIFI: Failed to connect to wifi " +
-                      String(WiFi.status()));
+      writeErrorLog("WIFI: Failed to connect to wifi %d", WiFi.status());
       WiFi.disconnect();
       Serial.print(CR);
       return false;  // Return to main that we have failed to connect.
@@ -346,9 +344,7 @@ bool WifiConnection::updateFirmware() {
 
   switch (ret) {
     case HTTP_UPDATE_FAILED: {
-      ErrorFileLog errLog;
-      errLog.addEntry("WIFI: OTA update failed " +
-                      String(ESPhttpUpdate.getLastError()));
+      writeErrorLog("WIFI: OTA update failed %d", ESPhttpUpdate.getLastError());
     } break;
     case HTTP_UPDATE_NO_UPDATES:
       break;
@@ -378,9 +374,7 @@ void WifiConnection::downloadFile(HTTPClient &http, String &fname) {
     f.close();
     Log.notice(F("WIFI: Downloaded file %s." CR), fname.c_str());
   } else {
-    ErrorFileLog errLog;
-    errLog.addEntry("WIFI: Failed to download html-file " +
-                    String(httpResponseCode));
+    writeErrorLog("WIFI: Failed to download html-file %d", httpResponseCode);
   }
 }
 
@@ -419,8 +413,7 @@ bool WifiConnection::checkFirmwareVersion() {
 #endif
     DeserializationError err = deserializeJson(ver, payload);
     if (err) {
-      ErrorFileLog errLog;
-      errLog.addEntry(F("WIFI: Failed to parse version.json"));
+      writeErrorLog("WIFI: Failed to parse version.json");
     } else {
 #if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
       Log.verbose(F("WIFI: Project %s version %s." CR),

src_docs/source/advanced.rst

@@ -99,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

@@ -65,6 +65,8 @@ Other parameters are the same as in the configuration guide.
       "angle": 90.93,
       "gravity": 1.105,
       "battery": 0.04,
+      "app-ver": "0.1.0",
+      "app-build": "build",
       "platform": "esp8266",
       "runtime-average": 3.12
    }
@@ -83,6 +85,8 @@ Retrive the current device status via an HTTP GET command. Payload is in JSON fo
 
 * ``temp-format`` can be either ``C`` or ``F``
 * ``platform`` can be either ``esp8266`` or ``esp32``
+* ``temp-c`` will be set to -273 C if there is no temp sensor
+* ``angle`` will be set to 0 if no valid angle is found and -1 if there is no gyro
 
 Other parameters are the same as in the configuration guide.
 
@@ -102,6 +106,7 @@ Other parameters are the same as in the configuration guide.
       "token2": "token2",
       "rssi": -56,
       "app-ver": "0.0.0",
+      "app-build": "gitrev",
       "mdns": "gravmon",
       "sleep-interval": 30,
       "platform": "esp8266",
@@ -156,18 +161,19 @@ Used for adjusting some internal constants and other advanced settings. Should b
 
    {
       "gyro-read-count": 50,
-      "tempsensor-resolution": 9,
       "gyro-moving-threashold": 500,
-      "formula-max-deviation": 1.6,
+      "formula-max-deviation": 3.0,
       "wifi-portal-timeout": 120,
       "wifi-connect-timeout": 20,
+      "push-timeout": 10,
       "formula-calibration-temp": 20,
-      "ignore-low-angles": false,
       "int-http1": 0,
       "int-http2": 0,
       "int-http3": 0,
       "int-influx": 0,
-      "int-mqtt": 0
+      "int-mqtt": 0,
+      "tempsensor-resolution": 9,
+      "ignore-low-angles": false
    }
 
 POST: /api/config/advanced
@@ -354,7 +360,7 @@ Calling the API's from Python
 =============================
 
 Here is some example code for how to access the API's from a python script. Keys should always be 
-present or the API call will fail.
+present or the API call will fail. You only need to include the parameters you want to change. 
 
 The requests package converts the json to standard form post format. 
 

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 = '1.0.0'
+release = '1.1.0'
 
 
 # -- General configuration ---------------------------------------------------

src_docs/source/configuration.rst

@@ -37,8 +37,9 @@ connection. It will show 0 if data has not been collected yet.
 
 .. tip::
 
-   The button `view error log` will show the last 15 errors on the device. This can be useful for checking errors without
-   the need to connect to the serial port or to check what errors has occured while in `gravity mode`.
+   The button `view error log` will show the last error messages on the device. This can be useful for checking errors without
+   the need to connect to the serial port or to check what errors has occured while in `gravity mode`. From v1.1 it will also detect
+   any abnormal restarts or crashes and record these in the logfile. 
 
 
 Configuration 
@@ -55,7 +56,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:** 
 
@@ -214,7 +216,7 @@ build this into the gravity formula.
 
    This formula assumes that the calibration has been done at 20°C / 68°F.
 
-   Formula used in temperature correction. 
+   Formula used in temperature correction. The calibration temperature can be changed under advanced settings. 
 
 ::
 
@@ -233,6 +235,12 @@ 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. This was added since differnt batteries have different 
+voltages when fully charged. 
+
 * **Temperature correction:**
 
 This value will be added to the temperature reading (negative value will reduce temperature reading). This is applied
@@ -245,6 +253,13 @@ 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 deep sleep forever (until reset). In order to wake it 
+up you need to do a reset. 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. See hardware section for more information, :ref:`hardware`.
+
 * **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.
@@ -305,6 +320,10 @@ data and of the deviation on any point is bigger the formula will be rejected.
 
 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.
 
+* **Gravity calibration temp**
+
+This option allows you to set the correction temperature used in the automatic temperature gravity adjustment formula. Standard is 20C. 
+
 * **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 

src_docs/source/data.rst

@@ -40,7 +40,7 @@ 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}",
@@ -129,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
 ============
@@ -150,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

@@ -9,8 +9,31 @@ Create formula
 
 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/hardware.rst

@@ -43,3 +43,24 @@ Schema for esp32 build
 .. image:: images/schema_esp32.png
   :width: 700
   :alt: Schema esp32
+
+Modifying with reed switch
+--------------------------
+
+A reed switch is a switch that reacts to magnetic fields. The ones I have tested are normally open and close in proximity to 
+a magnet. 
+
+.. image:: images/reed.jpg
+  :width: 400
+  :alt: Reed switch
+
+If this is connected to the reset button a magnet can be used to trigger a reset of the device. The image below shows how 
+I mounted the iSPINDLE PCB v4.0 just under the cap. The lower red circle shows the reset connection point for the reed switch.
+
+The reed switch is the glass tube visible under the esp8266.
+
+.. image:: images/reed_build.jpg
+  :width: 400
+  :alt: Reed build
+
+

src_docs/source/index.rst

@@ -7,66 +7,90 @@ Welcome to GravityMon's documentation!
 ######################################
 
 .. note::
-  This documentation reflects **v1.0**. Last updated 2022-05-08
+  This documentation reflects **v1.1**. Last updated 2022-08-14
 
-* Docs for: `v0.8 <https://mp-se.github.io/gravitymon/v0.8/index.html>`_
-* Docs for: `v0.9 <https://mp-se.github.io/gravitymon/v0.9/index.html>`_
+User interface overview
+-----------------------
+
+This animation shows how the user interface is structured, it reflects an older version but the structure is the same.
 
 .. image:: images/gravitymon.gif
   :width: 800
   :alt: User Inteface Walkthrough
 
+.. _main_features:
+
+Main features
+-------------
+
+* Operates in two modes gravity monitoring and configuration mode
+* Gravity mode is comparable to how the iSpindle works when collectintg data
+* Configuration mode has a modern HTML5 based web UI. No need to start the access point to change settings
+* Offloading some of the functionallity to run in the web browser, this allows for more advanced features.
+* REST API to enable scripted configuration
+* Send data to multiple endpoints and services at once (2xHTTP POST, HTTP GET, MQTT, INFLUXDB2)
+* Directly test all endpoints from user interface with feedback to simplify troubleshooting
+* Complete format customization for all endpoints using templates (dont really need to change the software to support new services)
+* Setup guides for how to send data to many popular services. Currently 10+ are documented
+* Automatic temperature adjustment of gravity (just tick a checkbox)
+* OTA support from webserver
+* Firmware update via web interface
+* Built in function to create gravity formulas, no need for additional software, just enter tilt/gravity and let GravityMon creates a formula
+* Visual graph showing how formula will be interpreted based on entered values
+* Using the temperature sensor in gyro instead of DS18B20 (faster)
+* SSL support in all endpoints (no certificate validation due to limitations on esp8266).
+* Built in performance measurements (used to optimise code)
+* Storage mode when placed on cap (indefinite sleep)
+* Customize various hardware parameters to opimize device functionallity.
+
+For a complete breakdown see the :ref:`functionallity`
+
+.. note::
+  If you are missing some feature, please reach out on `Github <https://github.com/mp-se/gravitymon/discussions>`_ or `homebrewtalk.com <https://www.homebrewtalk.com/threads/replacement-firmware-for-ispindel-gravitymon.698058/>`_
+
+What is GravityMon?
+--------------------
+
 GravityMon is used to measure gravity and temperature during fermentation of beer and report the progress. The graph below is
-an example on how the fermentation process can be tracked. This is from my last brew that was over on a few days. The graph is rendered using
-Fermentrack. 
+an example on how the fermentation process can be tracked. The graph has been rendered using Fermentrack. 
 
 .. image:: images/fermentation.png
   :width: 500
   :alt: Example fermentation
 
 GravityMon is a replacement firmware for the iSpindle and uses the same hardware configuration and is 100% compatible. It
-implements a lot of the features that has been requested in the orginal iSpindle project but has been rejected for 
+implements a lot of the features that has been requested in the orginal iSpindle project but never implemented for 
 various reasons. Here is a list of :ref:`main_features`.
 
-From v0.9 the firmware now supports a iSpindle build based on an ESP32 d1 mini (pin compatible with esp8266). See :ref:`hardware`.
+From v0.9 the firmware also supports a iSpindle built using an ESP32 d1 mini (pin compatible with esp8266). Currently this is an experimental 
+version but since it has more memory and processing capacity it could support more functions. See :ref:`hardware`.
 
-I started GravityMon because I like to create software and wanted to do some low level programming. I had done a few
+I started GravityMon because I like to create software and wanted to do some microcontroller programming. I had done a few
 projects based on esp8266 and also started to brew beer so this combination was quite natural. 
 
 The hardware design comes from the fantastic iSpindle project so that is not covered in this documentation. For more 
 information on this topic and function please visit `iSpindel Homepage <https://www.ispindel.de>`_ .
 
-My approach to this software is a little different from that the original iSpindle firmware. The github repository 
-can be found here; `GravityMon on Github <https://github.com/mp-se/gravitymon>`_
+My approach to this software is a little different from that the original iSpindle firmware as can be seen in the list of features. 
+
+The github repository can be found here; `GravityMon on Github <https://github.com/mp-se/gravitymon>`_
 
 .. note::  
   I dont take responsibility for any errors or issues caused by the software. The software is provided as-is. I will however
   try my best to fix issues that might occur. 
 
-  I have tested this software over the last year on 20+ brews with good results.
+  I have tested this software on 40+ brews with good results.
 
-.. _main_features:
 
-Main features:
---------------
+Documentation for older versions
+--------------------------------
 
-* Operates in two modes gravity monitoring and configuration mode (simplify calibration). Gravity mode 
-  is comparable to how the iSpindle works.
-* Modern web based UI when in configuration mode. No need to start the access point changing settings.
-* REST API to enable scripted configuration
-* Send data to multiple endpoints and services at once
-* Setup guides for how to send data to many popular services. Currently 8+ are documented.
-* Automatic temperature adjustment of gravity reading
-* OTA support from webserver
-* Built in function to create gravity formulas, no need for additional software, just enter tilt/gravity and 
-  let GravityMon create the formula. 
-* Visual graph showing how formula will be interpreted based on entered values
-* Using the temperature sensor in gyro instead of DS18B20 (faster)
-* SSL support in standard HTTP and MQTT connections.
-* Option to customize data posted to endpoints using template from the UI.
-* Built in performance measurements (used to optimise code)
+* 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>`_
 
-For a complete breakdown see the :ref:`functionallity`
+
+Software architecture
+---------------------
 
 This is a simple overview of the different components that the software contains. The green ones are only active during `configuration mode` in 
 order to save battery.

src_docs/source/installation.rst

@@ -121,9 +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,6 +3,71 @@
 Releases 
 ########
 
+v1.1.0
+======
+
+Features
+++++++++
+* Added information to error log about abnormal resets (for instance crashes) to detect and fix those
+* Changed storage mode so that the device will go into deep sleep until reset (sleep forever)
+* Updated sensor types in home assistant for auto registration of device
+* Added ${app-ver} and ${app-build} to format template as new variables
+* Improved error messages when creating formula so the troublesome measurement points can be identified
+* Changed defaule validation threashold from 1.6 SG to 3.0 SG, this should allow for some more variance when creating formula
+* Updated format template for Home Assistant, aligned with new mqtt configuration format
+* Added format template for Home Assistant with automatic device registration
+* 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 deep sleep. 
+
+Known issues, not yet fixed
++++++++++++++++++++++++++++
+* When updating firmware and the feature `deep sleep` is active the device will activate deep sleep if the gyro is not responding. FIX: Reboot device
+
+Issues adressed
+++++++++++++++++
+* Refactored error logging function to reduce memory usage and crashes. Max size of error log is 2 x 4 kb
+* Refactored format template engine to reduce memory usage and crashes, can how handle slightly larger payloads than before. Increase from around 1100 chars to 1600 chars
+* BUG: Refactored format api to handle larger payloads
+* BUG: After manual firmware upload the device would crash and go into wifi setup mode.
+* BUG: After manual firmware upload the device will in some cases not be able to connect with the gyro, the symptom is that it will say, "Gyro moving" in the web UI. In this case the device needs to be reset (or powered on/off). I havent found a way to fix this from the code. The message after firmware update has been updated with this information
+* BUG: Temp corrected gravity was not used when pushing data to removed
+* BUG: Low memory in format api which resulted in mqtt template to be set to null
+* BUG: Large format templates could be saved but when loading it's only blank
+* 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
+
+User interface
+++++++++++++++
+* Updated format template with information on size and warning message if the template is too large
+* Added error message if gyro connection/initialization fails (before the message was Gyro Moving only)
+* Added error message if no temp sensor can be found
+* Added drop down menus in user interface to simplify navigation to sub pages (format, test and upload)
+* Added Assistant Device registration, this is only done when format template is saved, during normal operation only data values are posted on MQTT. If HA is restarted then the device will disappear
+* Calibration temperature (for temp adjustment) can now be set under advanced settings, default is 20C
+* Changed length of device name from 12 to 63 chars. 63 is the max limit according to mdns.
+* Under format options its now possible to select brewfather ispindle format to avoid errors connected to using the wrong format template with the various brewfather endpoints
+* Added brewblox as format under format options
+* Added home assistant (with device registration) as format under format options
+* User can now edit the voltage level that forces the device into config mode (device detects charging)
+
+Documentation
++++++++++++++
+* Added documentation for Brewpiless as target
+* Added documentation for BVrewblox as target
+* Updated documentation for HA integration since described method was deprecated
+* Updated documentation for ubidots service integration
+* Updated documentation in data format section
+* Updated hardware section with documentation on installing reed switch
+* Updated configuration section with documentation on new settings
+* Added q&a on formula creation and value deviation
+ 
+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). 
+
+
 v1.0.0
 ======
 

src_docs/source/services.rst

@@ -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. 
@@ -127,7 +129,7 @@ format template that can be used. For information on customizing the format see
 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,31 +139,51 @@ 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"
-   - platform: mqtt
-      name: "gravmon2_temp"
-      state_topic: "gravmon/gravmon2/temp"
+      - 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}|
-   gravmon/${mdns}/RSSI:${rssi}|
-   gravmon/${mdns}/temp:${temp}|
+
+
+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. The registration will occur when you save the format template. If Home Assistant 
+is restarted then the device will dissapear. The first method is the most persistant one. 
+
+.. 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}/temperature:${temp}|
+   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":"voltage","unit_of_meas":"V","stat_t":"gravmon/${mdns}/battery"}|
 
 
 Brewer's Friend
@@ -264,3 +286,44 @@ starting with a ``?``. This string will be added to the URL above when doing the
 .. code-block::
 
    ?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
+      }
+   }

test/adv.json

@@ -1,16 +1,16 @@
 {
   "gyro-read-count": 50,
   "gyro-moving-threashold": 500,
-  "formula-max-deviation": 1.6,
+  "formula-max-deviation": 3,
   "wifi-portal-timeout": 120,
   "wifi-connect-timeout": 20,
-  "formula-calibration-temp": 20,
-  "tempsensor-resolution": 9,
-  "ignore-low-angles": false,
   "push-timeout": 10,
+  "formula-calibration-temp": 20,
   "int-http1": 0,
   "int-http2": 0,
   "int-http3": 0,
   "int-influx": 0,
-  "int-mqtt": 0
+  "int-mqtt": 0,
+  "tempsensor-resolution": 9,
+  "ignore-low-angles": false
 }

test/config.json

@@ -20,8 +20,10 @@
     "mqtt-port": 1883,
     "mqtt-user": "user",
     "mqtt-pass": "pass",
+    "storage-sleep": true,
     "sleep-interval": 30,
     "voltage-factor": 1.59,
+    "voltage-config": 4.15,
     "gravity-formula": "0.0*tilt^3+0.0*tilt^2+0.0017978*tilt+0.9436",
     "gravity-format": "G",
     "temp-adjustment-value": 0,
@@ -62,5 +64,7 @@
     "battery": 0.04,
     "runtime-average": 3.0,
     "ble": "pink",
+    "app-ver": "0.1.0",
+    "app-build": "build",
     "platform": "esp32"
 }

test/log

@@ -1,4 +0,0 @@
-Line 1
-Line 2
-Line 3
-Line 4

test/log1

@@ -0,0 +1,7 @@
+Log Entry 11
+Log Entry 12
+Log Entry 13
+Log Entry 14
+Log Entry 15
+Log Entry 16
+Log Entry 17

test/log2

@@ -0,0 +1,10 @@
+Log Entry 1
+Log Entry 2
+Log Entry 3
+Log Entry 4
+Log Entry 5
+Log Entry 6
+Log Entry 7
+Log Entry 8
+Log Entry 9
+Log Entry 10