.github/workflows/doc-build.yaml

@@ -4,14 +4,13 @@ on:
   push:
     branches: 
       - master
-     #- dev
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - uses: ammaraskar/sphinx-action@master
         with:
@@ -22,7 +21,6 @@ jobs:
             pip install docutils==0.16
             pip install pygments==2.11.1
             pip install furo==2022.1.2
-            pip install sphinx-copybutton
             pip list
           build-command: "sphinx-build -b html ./source ../docs"
 
@@ -40,19 +38,9 @@ jobs:
           git config --local user.name "GitHub Action"
           git add .
           git commit -m "Update documentation" -a || true
-
-      - uses: wangyucode/sftp-upload-action@v1.4.8
-        with:
-          host: ${{ secrets.SFTP_HOST }}   
-          port: 22
-          username: ${{ secrets.SFTP_USER }}
-          password: ${{ secrets.SFTP_PASSWD }}
-          forceUpload: false 
-          localDir: 'docs/'
-          remoteDir: '/run/www/docs/'
-          exclude: ''
-          dryRun: false
-
+#         git push https://${{secrets.token}}@github.com/mp-se/gravitymon.git
+          # The above command will fail if no changes were present, so we ignore
+          # the return code.
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:

.github/workflows/pio-build-patch.yaml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
     
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -21,13 +21,13 @@ jobs:
             ${{ runner.os }}-pip-
     
       - name: Cache PlatformIO
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ~/.platformio
           key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v2
 
       - name: Install PlatformIO
         run: |
@@ -36,9 +36,11 @@ jobs:
           git config --global advice.detachedHead false
 
       - name: Run PlatformIO
-        run: pio run -e gravity-release
+        #run: pio run -e gravity-release -e gravity-perf -e gravity-debug
+        run: pio run -e gravity-release -e gravity-perf
+        #run: pio run -e gravity-release
 
-      - uses: EndBug/add-and-commit@v9 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
+      - uses: EndBug/add-and-commit@v7 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
         with:
           add: 'bin'
           author_name: GitHub Action

.github/workflows/pio-build.yaml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
     
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -21,7 +21,7 @@ jobs:
             ${{ runner.os }}-pip-
     
       - name: Cache PlatformIO
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ~/.platformio
           key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
@@ -36,9 +36,9 @@ jobs:
           git config --global advice.detachedHead false
 
       - name: Run PlatformIO
-        run: pio run -e gravity-release -e gravity32-release -e gravity32c3-release -e gravity32s2-release -e gravity32c3v1-release -e gravity32lite-release
+        run: pio run -e gravity-release -e gravity-perf -e gravity32-release -e gravity32-perf
 
-      - uses: EndBug/add-and-commit@v9 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
+      - uses: EndBug/add-and-commit@v7 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
         with:
           add: 'bin'
           author_name: GitHub Action

.github/workflows/pre-commit.yaml

@@ -11,9 +11,9 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v3 
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2 
     - name: clang format support
       run: |
         sudo apt install clang-format cppcheck
-    - uses: pre-commit/action@v3.0.0
+    - uses: pre-commit/action@v2.0.3

.gitignore

@@ -1,6 +1,9 @@
 .pio/*
 .vscode/*
 *.map
+test/*.md
+test/env/*
+test/configure_*.py
+TODO.md
 src_docs/_build/*
-.env/*
-*.pyc
+data/*.min.htm

README.md

@@ -3,30 +3,36 @@
 ![release](https://img.shields.io/github/v/release/mp-se/gravitymon?label=latest%20release)
 ![issues](https://img.shields.io/github/issues/mp-se/gravitymon)
 ![pr](https://img.shields.io/github/issues-pr/mp-se/gravitymon)
-![dev_build](https://img.shields.io/github/actions/workflow/status/mp-se/gravitymon/pio-build.yaml?branch=dev)
-![doc_build](https://img.shields.io/github/actions/workflow/status/mp-se/gravitymon/doc-build.yaml?branch=master)
+![dev_build](https://img.shields.io/github/workflow/status/mp-se/gravitymon/PlatformIO%20CI/dev?label=dev%20build)
+![doc_build](https://img.shields.io/github/workflow/status/mp-se/gravitymon/Sphinx%20Build/dev?label=doc%20build)
 
 # Gravity Monitor for Beer Brewing
 
-![GravityMon Logo](src_docs/source/images/gravitymon_logo_s.png)
+GravityMon is a replacement firmware for the iSpindle firmware. It's 100% compatible with the iSpindle hardware design so it does not require any hardware changes. 
 
-GravityMon is a replacement firmware for the iSpindle firmware. It's 100% compatible with the iSpindle hardware design so it does not require any hardware changes. From v1.2 you can also use GravityMon for the DIY Floaty Hardware with ESP32 Lite.  
+Now also works with ESP32 (use ESP32 d1 mini which is compatible with ESP8266)
 
-Now also works with ESP32 d1 mini, ESP32 c3 mini, ESP32 S2 mini which both are pin compatible with ESP8266.
+Installation can be made using https://www.brewflasher.com or https://web.brewflasher.com
 
-Installation can be made using https://www.brewflasher.com or the web version at https://web.brewflasher.com
+The documenation can be found here: https://mp-se.github.io/gravitymon/index.html
 
-The documentation can be found here: https://www.gravitymon.com/docs.html
+Note! If Brewflasher being flagged as malware by your antivirus software, try the web version.
 
-Visit the gravitymon homepage here for more information about the project: https://www.gravitymon.com
+The main differences:
+---------------------
 
-If you want to support my work you can do that through these options
+* 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
 
-[<img src="https://gravitymon.com/images/buymecoffee.png" height=40>](https://www.buymeacoffee.com/mpse/) [<img src="https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86" height=40>](https://github.com/sponsors/mp-se)
-
-# Supporters
-
-Thanks to the following persons for supporting me and this project:
-
-* David Conde, @davidconde
-* Lars H.
+No code has been reused from the iSpindle project. 

TEST.md

@@ -1,31 +0,0 @@
-# Unit testing - Python Script
-
-I have moved my test scripts into this project now. They are mainly based on python scrips and validate the features from the API's.
-
-Create a virtual environment and install the needed dependecies
-```
-python -m venv .env
-pip install -r requirements.txt
-```
-
-Before you runt the script you need to update the IP adress to match the device that you have on your network.
-
-Running the ALL tests
-```
-cd src/test
-python3 -m unittest -v apitests.py -v
-```
-
-Running the ONE test
-```
-cd src/test
-python3 -m unittest -v apitests.API.test_status -v
-```
-
-# Unit testing - Specific build
-
-I've added a specific build that uses the AUnit (https://github.com/bxparks/AUnit) testing framework so that we can test functions or classes on the device itself. I hope this will simplify the release and testing cycle.
-
-1. Select the build target (gravity-unit)
-2. Build/upload the code to an iSpindle device. 
-3. Check the output from the serial console.

bin/about.min.htm

@@ -0,0 +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>

bin/version.json

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

html/about.htm

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

html/calibration.htm

@@ -16,6 +16,8 @@
   <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>
@@ -27,19 +29,11 @@
           <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 class="nav-item">
+            <a class="nav-link" href="/config.htm">Configuration</a>
           </li>
-                  <li class="nav-item">
-            <a class="nav-link active" href="#">Calibration</a>
+          <li class="nav-item active">
+            <a class="nav-link" href="#"><b>Calibration</b></a>
           </li>
           <li class="nav-item">
             <a class="nav-link" href="/about.htm">About</a>

html/config.htm

@@ -28,18 +28,10 @@
           <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="#">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 class="nav-item">
+            <a class="nav-link active" href="#"><b>Configuration</b></a>
           </li>
-                  <li class="nav-item">
+          <li class="nav-item">
             <a class="nav-link" href="/calibration.htm">Calibration</a>
           </li>
           <li class="nav-item">
@@ -109,10 +101,6 @@
       <div id="collapseDevice" class="accordion-collapse collapse show" aria-labelledby="headingDevice" data-bs-parent="#accordion">
         <div class="accordion-body">
 
-          <input type="text" name="runtime-average" id="runtime-average" hidden>
-          <input type="text" name="platform" id="platform" hidden>
-          <input type="text" name="voltage-factor-calc" id="voltage-factor-calc" hidden>
-
           <form action="/api/config/device" method="post">
             <input type="text" name="id" id="id1" hidden>
 
@@ -156,21 +144,6 @@
 
           <hr class="my-2">
 
-          <div class="row mb-3">
-            <label class="col-sm-2 col-form-label">Wifi</label>
-            <div class="col-sm-2">
-              <label class="col-sm-4 col-form-label" id="wifi-ssid"></label>
-            </div>
-          </div>
-          <div class="row mb-3">
-            <label class="col-sm-2 col-form-label">Wifi 2</label>
-            <div class="col-sm-2">
-              <label class="col-sm-4 col-form-label" id="wifi-ssid2"></label>
-            </div>
-          </div>
-
-          <hr class="my-2">
-
           <div class="row mb-3">
             <label for="calibrate-btn" class="col-sm-2 col-form-label">Current calibration</label>
             <label for="calibrate-btn" class="col-sm-2 col-form-label" id="gyro-calibration-data">Loading...</label>
@@ -244,11 +217,17 @@
             <div class="row mb-3">
               <div class="col-sm-8 offset-sm-2">
                 <button type="submit" class="btn btn-primary" id="push-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button>
-                <button type="button" class="btn btn-secondary" id="format-btn" data-bs-toggle="tooltip" title="Open up the format editor to change data format posted">Format editor</button>
-                <button type="button" class="btn btn-secondary" id="test-btn" data-bs-toggle="tooltip" title="Test posting data to defined push targets">Test Push</button>
-                </div>
+              </div>
             </div>
           </form>
+
+          <div class="row mb-3">
+            <div class="col-sm-8 offset-sm-2">
+              <button class="btn btn-secondary" id="format-btn" data-bs-toggle="tooltip" title="Open up the format editor to change data format posted">Format editor</button>
+              <button class="btn btn-secondary" id="test-btn" data-bs-toggle="tooltip" title="Test posting data to defined push targets">Test Push</button>
+            </div>
+          </div>
+
         </div>
       </div>
     </div>
@@ -327,12 +306,17 @@
             <div class="row mb-3">
               <div class="col-sm-8 offset-sm-2">
                 <button type="submit" class="btn btn-primary" id="push-btn2" data-bs-toggle="tooltip" title="Save changes in this section">Save</button>
-                <button type="button" class="btn btn-secondary" id="format-btn2" data-bs-toggle="tooltip" title="Open up the format editor to change data format posted">Format editor</button>
-                <button type="button" class="btn btn-secondary" id="test-btn2" data-bs-toggle="tooltip" title="Test posting data to defined push targets">Test Push</button>
-                </div>
+              </div>
             </div>
           </form>
 
+          <div class="row mb-3">
+            <div class="col-sm-8 offset-sm-2">
+              <button class="btn btn-secondary" id="format-btn2" data-bs-toggle="tooltip" title="Open up the format editor to change data format posted">Format editor</button>
+              <button class="btn btn-secondary" id="test-btn2" data-bs-toggle="tooltip" title="Test posting data to defined push targets">Test Push</button>
+            </div>
+          </div>
+
         </div>
       </div>
     </div>
@@ -408,15 +392,7 @@
               <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. Can vary depending on the R2 value">
               </div>
-              <div class="col-sm-2">
-                <label for="voltage-factor" class="col-sm-3 col-form-label" id="battery">Loading...</label>
-              </div>
-              <div class="col-sm-1">
-                <button type="button" class="btn btn-secondary" id="volt-factor-btn" data-bs-toggle="tooltip" title="Calcualte the voltage factor based on measured battery voltage">Calculate</button>
-              </div>
-              <div class="col-sm-2">
-                <input type="number" step=".01" class="form-control" name="measured-voltage" id="measured-voltage" placeholder="" data-bs-toggle="tooltip" title="Enter the measured battery voltage to calcualte the factor">
-              </div>
+              <label for="voltage-factor" class="col-sm-3 col-form-label" id="battery">Loading...</label>
             </div>
 
             <div class="row mb-3">
@@ -468,62 +444,23 @@
               </div>
             </div>
 
-            <div class="row mb-3" id="ota-hide">
+            <div class="row mb-3">
               <label for="ota-url" class="col-sm-2 col-form-label">OTA base URL</label>
               <div class="col-sm-8">
                 <input type="url" maxlength="90" class="form-control" name="ota-url" id="ota-url" placeholder="http://www.local.com/path/" data-bs-toggle="tooltip" title="Base URL to where firmware and version.json file can be found. Needs to end with '/', example: http://www.mysite.com/firmware/">
               </div>
             </div>
 
-            <div class="row mb-3">
-              <div class="col-sm-4 offset-sm-2">
-                <div class="form-check">
-                  <input class="form-check-input" type="checkbox" name="gravitymon-com" id="gravitymon-com" data-bs-toggle="tooltip" title="If enabled gravitymon.com will be checked for new versions.">
-                  <label class="form-check-label" for="gravitymon-com">OTA from gravitymon.com</label>
-                </div>
-              </div>
-            </div>
-
-            <script>
-              $("#volt-factor-btn").click(function(e) {
-                var f = $("#voltage-factor-calc").val();
-                var mv = parseFloat( $("#measured-voltage").val() ); 
-
-                if( isNaN(mv) ) {
-                  showError("You need to enter a measured voltage in order to calculate the factor");
-                  return;
-                }
-
-                var vf = mv / f;
-                $("#voltage-factor").val( parseFloat(vf).toFixed(2) );
-              });
-            </script> 
-
-            <script>
-              var gravitymonUrl = "https://www.gravitymon.com/firmware/";
-
-              $("#gravitymon-com").click(function(e){
-                var b = $("#gravitymon-com").is(":checked");
-
-                if ( b ) {
-                  $("#ota-url").val(gravitymonUrl);
-                  $('#ota-hide').hide();
-                } else {
-                  $('#ota-hide').show();
-                }
-              });
-            </script> 
-
             <div class="row mb-3">
               <div class="col-sm-8 offset-sm-2">
                 <button type="submit" class="btn btn-primary" id="hardware-btn" data-bs-toggle="tooltip" title="Save changes in this section">Save</button>
-                <button type="button" class="btn btn-secondary" id="firmware-btn" checked data-bs-toggle="tooltip" title="Manually upload a new firmware version to the device">Upload firmware</button>
               </div>
             </div>
           </form>
 
           <div class="row mb-3">
             <div class="col-sm-8 offset-sm-2">
+              <button class="btn btn-secondary" id="firmware-btn" checked data-bs-toggle="tooltip" title="Manually upload a new firmware version to the device">Upload firmware</button>
             </div>
           </div>
         </div>
@@ -780,40 +717,10 @@
       // MPU-6050 consumes 4mA
       // DS18B20 consumes 1mA
       // For this estimation we use an average of 160mA
-      var pwrActive = 160; // mA per hour (120-170 mA)
-      var pwrSleep = 15; // mA per day (include all pheripials as well)
-      var batt = 2200; // mA
-      var ble = false;
-      var wifi = true;
-      var platform = $("#platform").val();
 
-      if($("#ble").val() != "") 
-        ble = true;
-
-      if($("#http-push").val() == "" && $("#http-push2").val() == "" && $("#http-push3").val() == "" && $("#influxdb2-push").val() == "" && $("#mqtt-push").val() == "") 
-        wifi = false;
-
-      console.log( "Connection options: BLE=" + (ble?"on":"off") + " WIFI=" + (wifi?"on":"off") );
-
-      if(platform == "esp32" && wifi) {
-        var pwrActive = 320; // mA per hour (260-379 mA)
-      } else if(platform == "esp32" && !wifi) {
-        var pwrActive = 160; 
-      } else if(platform == "esp32c3" && wifi) {
-        var pwrActive = 320; // mA per hour (290-350 mA)
-      } else if(platform == "esp32c3" && !wifi) {
-        var pwrActive = 160; 
-      } else if(platform == "esp32s2" && wifi) {
-        var pwrActive = 280; // mA per hour (260-300 mA)
-      } else if(platform == "esp32s2" && !wifi) {
-        var pwrActive = 160; 
-      } else if(platform == "esp32lite" && wifi) {
-        var pwrActive = 330; // mA per hour (260-379 mA)
-      } else if(platform == "esp32lite" && !wifi) {
-        var pwrActive = 160; 
-      }
-
-      console.log( "Estimated power per hour = " + pwrActive.toString() + "mA on platform = " + platform);
+      var pwrActive = 170; // mA per hour
+      var pwrSleep = 15; // mA per day
+      var batt = 2000; // mA
 
       if(rt<1) rt = 2;
 
@@ -827,11 +734,8 @@
       var rt = parseInt($("#runtime-average").val());
       var j = 0;
 
-      console.log("Average runtime " + $("#runtime-average").val() )
-
-      if( rt>0 ) {
+      if( rt>0 )
         j = estimateBatteryLife(i, rt);
-      }
 
       var t1 = Math.floor(i/60) + " m " + (i%60) + " s";
       var t2 = Math.floor(j/7) + " weeks " + Math.floor(j%7) + " days";
@@ -868,14 +772,14 @@
       $("#test-btn2").prop("disabled", b);
       $("#advanced-btn").prop("disabled", b);
 
-      checkAdvancedSection();
+      checkAdvancedSection( b );
     }
 
     $("#adv-config").click(function(e){
       checkAdvancedSection();
     });
 
-    function checkAdvancedSection() {
+    function checkAdvancedSection( b ) {
       var b = $("#adv-config").is(":checked");
    
       $("#advanced-btn").prop("disabled", b);
@@ -942,15 +846,11 @@
       $.getJSON(url, function (cfg) {
         console.log( cfg );
 
-        if(cfg["platform"]=="esp32" || cfg["platform"]=="esp32c3" || cfg["platform"]=="esp32lite") {
+        if(cfg["platform"]=="esp32") {
           $('#ble').prop('disabled', false);
           $("#ble").val(cfg["ble"]);
         }
 
-        if(cfg["platform"]=="esp32lite") {
-          $('#gyro-temp').prop('disabled', true);
-        }
-
         $("#id1").val(cfg["id"]);
         $("#id2").val(cfg["id"]);
         $("#id3").val(cfg["id"]);
@@ -963,12 +863,6 @@
         if( cfg["gravity-format"] == "G" ) $("#gravity-format-g").click();
         else $("#gravity-format-p").click();
         $("#ota-url").val(cfg["ota-url"]);
-
-        if( cfg["ota-url"] == gravitymonUrl) {
-          $("#gravitymon-com").prop( "checked", true );
-          $("#ota-hide").hide();
-        }
-
         $("#token").val(cfg["token"]);
         $("#token2").val(cfg["token2"]);
         $("#http-push").val(cfg["http-push"]);
@@ -999,10 +893,6 @@
         $("#angle").text(cfg["angle"]);
         $("#runtime-average").val(cfg["runtime-average"]);
         $("#water-angle").text( "(Water angle: " + cfg["formula-calculation-data"]["a1"] + ") - default off");
-        $("#wifi-ssid").text(cfg["wifi-ssid"]);
-        $("#wifi-ssid2").text(cfg["wifi-ssid2"]);
-        $("#platform").val(cfg["platform"]);
-        $("#voltage-factor-calc").val( cfg["battery"] / cfg["voltage-factor"] );
         //$("#gravity").text(cfg["gravity"] + " SG");
       })
       .fail(function () {

html/firmware.htm

@@ -15,6 +15,8 @@
   <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>
@@ -22,34 +24,16 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarNav">
-        <ul class="navbar-nav">
+        <ul class="navbar-nav mr-auto">
           <li class="nav-item">
-            <a class="nav-link" href="/index.htm">Home</a>
+            <a class="nav-link" href="javascript:history.back()">Back to configuration</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>
+        </ul>  
       </div>
       <div class="spinner-border text-light" id="spinner" role="status"></div>
     </div>
   </nav>
 
-
   <!-- START MAIN INDEX -->
 
   <div class="container row-margin-10">
@@ -151,7 +135,7 @@
             showError("Upload failed");
           },
           success: function(resp) {
-            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!");
+            showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser.");
             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><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;
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"><style>.row-margin-10{margin-top:1em}</style></head><body class="py-4"><script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><!-- START MENU --><nav class="navbar navbar-expand-lg navbar-dark bg-primary"><div class="container"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbarNav"><ul class="navbar-nav mr-auto"><li class="nav-item"><a class="nav-link" href="javascript:history.back()">Back to configuration</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container row-margin-10"><div class="alert alert-success alert-dismissible hide fade d-none" role="alert"><div id="alert"></div><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("hide").addClass("show").removeClass("d-none"),$("#alert").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("hide").removeClass("show").addClass("d-none")})</script><div class="accordion" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingFirmware"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFirmware" aria-expanded="true" aria-controls="collapseFirmware"><b>Upload firmware</b></button></h2><div id="collapseFirmware" class="accordion-collapse collapse show" aria-labelledby="headingFirmware" data-bs-parent="#accordion"><div class="accordion-body"><div class="row mb-3"><div class="col-md-12 themed-grid-col bg-light">Here you can upload a new firmware version, it will not check the version number so you can also downgrade the firmware here.</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">Current version:</div><div class="col-md-10 themed-grid-col bg-light" id="app-ver">Loading...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">Platform:</div><div class="col-md-10 themed-grid-col bg-light" id="platform">Loading...</div></div><form id="uploadForm" enctype="multipart/form-data"><div class="row mb-3"><div class="col-md-8 custom-file"><input type="file" accept=".bin" class="custom-file-input" name="name" id="name" onchange="checkName()" data-bs-toggle="tooltip" title="Select a firmware file to upload"></div></div><div class="row mb-3"><div class="col-md-4"><button type="submit" class="btn btn-primary" id="upload-btn" value="upload" data-bs-toggle="tooltip" title="Update the device with the selected firmware">Flash firmware</button></div></div></form><div class="progress"><div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div></div></div></div></div></div><script type="text/javascript">window.onload = getStatus;
     
     $(document).ready(function() {
       $("#uploadForm").on('submit', function(e) {
@@ -26,7 +26,7 @@
             showError("Upload failed");
           },
           success: function(resp) {
-            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!");
+            showSuccess("Upload completed, device is restarting. Waiting 10 seconds to refresh browser.");
             setTimeout(() => {  
               window.location = "/";
             }, 10000);

html/format.htm

@@ -15,6 +15,8 @@
   <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>
@@ -22,81 +24,39 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarNav">
-        <ul class="navbar-nav">
+        <ul class="navbar-nav mr-auto">
           <li class="nav-item">
-            <a class="nav-link" href="/index.htm">Home</a>
+            <a class="nav-link" href="javascript:history.back()">Back to configuration</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 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>
+        </ul>  
       </div>
       <div class="spinner-border text-light" id="spinner" role="status"></div>
     </div>
   </nav>
 
-
   <!-- START MAIN INDEX -->
 
   <div class="container row-margin-10">
 
-    <div class="alert alert-success alert-dismissible hide fade d-none" role="alert" id="alert">
-      <div id="alert-msg"></div>
-      <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-    </div>
-
-    <div class="alert alert-warning alert-dismissible hide fade d-none" role="alert" id="warning-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>
+    <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( msg ) {
-        $('#alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
-        $('#alert-msg').text( msg );
+        $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
       }
 
       function showSuccess( msg ) {
-        $('#alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
-        $('#alert-msg').text( msg );
+        $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
       }
 
       $("#alert-btn").click(function(e){
-        $('#alert').addClass('hide').removeClass('show').addClass('d-none');
+        $('.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">
@@ -129,7 +89,7 @@
 
             <div class="row mb-3">
               <div class="col-sm-12">
-                <textarea rows="10" class="form-control" name="format" id="format" onchange="updateStatusField()" onkeydown="updateStatusField()">
+                <textarea rows="10" class="form-control" name="format" id="format">  
                 </textarea>
               </div>
             </div>
@@ -142,7 +102,7 @@
               { "id": "BrewFatherCustom-Post", "format": "%7B%20%20%20%22name%22%3A%20%22%24%7Bmdns%7D%22%2C%20%20%20%22temp%22%3A%20%24%7Btemp%7D%2C%20%20%20%22aux_temp%22%3A%200%2C%20%20%20%22ext_temp%22%3A%200%2C%20%20%20%22temp_unit%22%3A%20%22%24%7Btemp-unit%7D%22%2C%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%20%20%20%22gravity_unit%22%3A%20%22%24%7Bgravity-unit%7D%22%2C%20%20%20%22pressure%22%3A%200%2C%20%20%20%22pressure_unit%22%3A%20%22PSI%22%2C%20%20%20%22ph%22%3A%200%2C%20%20%20%22bpm%22%3A%200%2C%20%20%20%22comment%22%3A%20%22%22%2C%20%20%20%22beer%22%3A%20%22%22%2C%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%7D" },
               { "id": "iSpindle-Mqtt", "format": "ispindel%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Bangle%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Ftemp_units%3A%24%7Btemp-unit%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2Finterval%3A%24%7Bsleep-interval%7D%7C%0Aispindel%2F%24%7Bmdns%7D%2FRSSI%3A%24%7Brssi%7D%7C" },
               { "id": "HomeAssistant-Mqtt", "format": "gravmon%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Frssi%3A%24%7Brssi%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Btilt%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0A" },
-              { "id": "HomeAssistant-Mqtt2", "format": "gravmon%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Frssi%3A%24%7Brssi%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Btilt%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Ftemperature%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_temp%22%2C%22name%22%3A%22temperature%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22%24%7Btemp-unit%7D%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Ftemperature%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Fgravity%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_grav%22%2C%22name%22%3A%22gravity%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22%20%24%7Bgravity-unit%7D%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Fgravity%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Frssi%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_rssi%22%2C%22name%22%3A%22rssi%22%2C%22dev_cla%22%3A%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": "HomeAssistant-Mqtt2", "format": "gravmon%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Frssi%3A%24%7Brssi%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Btilt%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Ftemperature%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_temp%22%2C%22name%22%3A%22temperature%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22%24%7Btemp-unit%7D%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Ftemperature%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Fgravity%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_grav%22%2C%22name%22%3A%22gravity%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22%20%24%7Bgravity-unit%7D%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Fgravity%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Frssi%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_rssi%22%2C%22name%22%3A%22rssi%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22dBm%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Frssi%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Ftilt%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_tilt%22%2C%22name%22%3A%22tilt%22%2C%22dev_cla%22%3A%22temperature%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Ftilt%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Fbattery%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_batt%22%2C%22name%22%3A%22battery%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22V%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Fbattery%22%7D%7C%0A" },
               { "id": "Brewblox-Mqtt", "format": "brewcast%2Fhistory%3A%7B%22key%22%3A%22%24%7Bmdns%7D%22%2C%22data%22%3A%7B%22Temperature%5BdegC%5D%22%3A%20%24%7Btemp-c%7D%2C%22Temperature%5BdegF%5D%22%3A%20%24%7Btemp-f%7D%2C%22Battery%5BV%5D%22%3A%24%7Bbattery%7D%2C%22Tilt%5Bdeg%5D%22%3A%24%7Bangle%7D%2C%22Rssi%5BdBm%5D%22%3A%24%7Brssi%7D%2C%22SG%22%3A%24%7Bgravity-sg%7D%2C%22Plato%22%3A%24%7Bgravity-plato%7D%7D%7D%7C" },
               { "id": "UBIDots-Post", "format": "%7B%0A%20%20%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%20%20%22rssi%22%3A%20%24%7Brssi%7D%0A%7D" } ];
             </script>
@@ -170,9 +130,6 @@
               </div>
             </div>
 
-            <div class="col-sm-8" id="status">             
-            </div>
-
             <hr class="my-2">
 
             <pre class="card-preview" id="preview" name="preview"></pre> 
@@ -186,8 +143,6 @@
   <script type="text/javascript">
     window.onload = getConfig;
 
-    var maxCharsInFormatTemplate = 1500;
-
     setButtonDisabled( true );
 
     // Opens the targetet according (if URL has #collapseOne to #collapseFour)
@@ -198,17 +153,6 @@
       }
     });
 
-    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();
@@ -225,88 +169,29 @@
           $("#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();
-
-      /*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);
+      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.'); postHomeAssistant(ha); },
-        error: function(result) { showError('Unable to store format.'); $('#spinner').hide(); },
-        always: function() {  $('#spinner').hide(); setButtonDisabled( false ); }
+        success: function(result) { showSuccess('Format stored successfully.'); getConfig(); },
+        error: function(result) { showError('Unable to store format.'); }
       } );
     });
- 
-    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";
@@ -380,9 +265,6 @@
     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() {
@@ -394,7 +276,6 @@
       console.log(s);
       $("#format").val(s);
       $("#preview").text("");
-      updateStatusField();
     }
 
     // Get the configuration values from the API
@@ -402,7 +283,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 );
@@ -422,8 +303,6 @@
         $('#spinner').hide(); 
         setButtonDisabled( false );
       });
-
-      updateStatusField();
     }
   </script>
 

html/index.htm

@@ -16,6 +16,8 @@
   <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>
@@ -25,20 +27,12 @@
       <div class="collapse navbar-collapse" id="navbarNav">
         <ul class="navbar-nav">
           <li class="nav-item">
-            <a class="nav-link active" href="#">Home</a>
+            <a class="nav-link active" href="#"><b>Home</b></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 class="nav-item">
+            <a class="nav-link" href="/config.htm">Configuration</a>
           </li>
-                  <li class="nav-item">
+          <li class="nav-item">
             <a class="nav-link" href="/calibration.htm">Calibration</a>
           </li>
           <li class="nav-item">
@@ -50,7 +44,6 @@
     </div>
   </nav>
 
-
   <!-- START MAIN INDEX -->
 
   <div class="container row-margin-10">
@@ -160,33 +153,11 @@
               });
               setInterval(function() {
                 loadLog();
-              }, 30000);
+              }, 5000);
             
               function loadLog() {
-                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);
-                  });
-                });
+                $("#logContent").load("/log");
+                //$("#logContent").load("/test/log");
               };
             </script>
           
@@ -204,13 +175,13 @@
 
             <div class="collapse row-margin-10" id="collapseLog">
               <div class="card card-body">
-                <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>
+                <pre><code class="card-text" id="logContent"></code></pre>
               </div>
             </div>
 
             <div class="collapse row-margin-10" id="collapseSupport">
               <div class="card card-body">
-                <pre><code class="card-text" id="supportContent">Collecting support data, please wait...</code></pre>
+                <pre><code class="card-text" id="supportContent"></code></pre>
               </div>
             </div>
 
@@ -322,11 +293,7 @@
     
         var angle = cfg["angle"];
         
-        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) {
+        if(angle==0) {
           $("#angle").text("Gyro moving"); 
           $("#gravity").text("Gyro moving");
         } else {
@@ -355,14 +322,10 @@
 
         $("#battery").text(batt + " V (" + charge + "%)" );
 
-        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["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 );
@@ -379,7 +342,7 @@
     }
 
     function start() {
-      setInterval(getStatus, 5000);
+      setInterval(getStatus, 3000);
     }
   </script>
 

html/test.htm

@@ -15,6 +15,8 @@
   <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>
@@ -22,28 +24,11 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarNav">
-        <ul class="navbar-nav">
+        <ul class="navbar-nav mr-auto">
           <li class="nav-item">
-            <a class="nav-link" href="/index.htm">Home</a>
+            <a class="nav-link" href="javascript:history.back()">Back to configuration</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 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>
+        </ul>  
       </div>
       <div class="spinner-border text-light" id="spinner" role="status"></div>
     </div>
@@ -90,7 +75,7 @@
 
             <div class="row mb-3">
               <div class="col-sm-8">
-                <button type="button" class="btn btn-primary" id="test-btn" data-bs-toggle="tooltip" title="Test all push targets">Test</button>
+                <button class="btn btn-primary" id="test-btn" data-bs-toggle="tooltip" title="Test all push targets">Test</button>
               </div>
             </div>
 

html/upload.htm

@@ -0,0 +1,179 @@
+<!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: 1.0em; }
+  </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="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( msg ) {
+        $('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
+
+      function showSuccess( msg ) {
+        $('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
+        $('#alert').text( msg );
+      }
+
+      $("#alert-btn").click(function(e){
+        $('.alert').addClass('hide').removeClass('show').addClass('d-none');
+      });    
+    </script>
+
+    <div class="accordion" id="accordion">
+      <div class="accordion-item">
+        <h2 class="accordion-header" id="headingUpload">
+          <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseUpload" aria-expanded="true" aria-controls="collapseUpload">
+            <b>Upload missing html files</b>
+          </button>
+        </h2>
+        <div id="collapseUpload" class="accordion-collapse collapse show" aria-labelledby="headingUpload" data-bs-parent="#accordion">
+          <div class="accordion-body">
+
+            <div class="row mb-3">
+              <div class="col-md-8 bg-light">The listed files below needs to be uploaded to the FileSystem in order for the GUI to work. 
+                You can also flash the LittleFS filesystem but in that case you will loose your device settings. An OTA upgrade will automatically download 
+                the files if they are found in the same location as the firmware.bin. This page is a fallback option.
+              </div>
+              <div class="col-md-8 bg-light"><br><strong>Once all the files are confirmed, please reboot the device for normal operation.</strong></div>
+            </div>
+          
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">index.min.htm</div>
+              <div class="col-md-6 bg-light" id="index">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">config.min.htm</div>
+              <div class="col-md-6 bg-light" id="config">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">calibration.min.htm</div>
+              <div class="col-md-6 bg-light" id="calibration">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">format.min.htm</div>
+              <div class="col-md-6 bg-light" id="format">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">test.min.htm</div>
+              <div class="col-md-6 bg-light" id="test">Checking...</div>
+            </div>
+            <div class="row mb-3">
+              <div class="col-md-2 bg-light">about.min.htm</div>
+              <div class="col-md-6 bg-light" id="about">Checking...</div>
+            </div>
+
+            <form action="/api/upload" method="post" enctype="multipart/form-data">
+              <div class="row mb-3">
+                <div class="col-md-8 custom-file">
+                  <input type="file" accept=".min.htm" class="custom-file-input" name="name" id="name" data-bs-toggle="tooltip" title="Select a file that matches the name in the list above to upload it to the device">
+                </div>
+              </div>
+              <div class="row mb-3">
+                <div class="col-md-3">
+                  <button type="submit" class="btn btn-primary" id="upload-btn" value="upload" data-bs-toggle="tooltip" title="Upload the selected file to the device">Upload</button>
+                </div>
+              </div>
+            </form>
+          
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <script type="text/javascript">
+  window.onload = getUpload;
+
+  // Add the following code if you want the name of the file appear on select
+  $(".custom-file-input").on("change", function() {
+    var fileName = $(this).val().split("\\").pop();
+    $(this).siblings(".custom-file-label").addClass("selected").html(fileName);
+  });
+
+  function getUpload() {
+      var url = "/api/upload";
+      //var url = "/test/upload.json";
+      $('#spinner').show(); 
+      $.getJSON(url, function (cfg) {
+        console.log( cfg );
+
+        if( cfg["index"] )
+          $("#index").text("Completed.");
+        else
+          $("#index").text("File is missing.");
+
+        if( cfg["config"] )
+          $("#config").text("Completed.");
+        else
+          $("#config").text("File is missing.");
+
+        if( cfg["calibration"] )
+          $("#calibration").text("Completed.");
+        else
+          $("#calibration").text("File is missing.");
+
+        if( cfg["test"] )
+          $("#test").text("Completed.");
+        else
+          $("#test").text("File is missing.");
+
+        if( cfg["format"] )
+          $("#format").text("Completed.");
+        else
+          $("#format").text("File is missing.");
+
+        if( cfg["about"] )
+          $("#about").text("Completed.");
+        else
+          $("#about").text("File is missing.");
+
+
+      })
+      .fail(function () {
+        showError('Unable to get data from the device.');
+      })
+      .always(function() {
+        $('#spinner').hide(); 
+      });
+    }
+  </script>
+
+  <!-- START FOOTER -->
+
+  <div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div>
+</body>
+</html>

lib/ESP_DoubleResetDetector/ESP_DoubleResetDetector.h

@@ -9,7 +9,7 @@
 
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_DoubleResetDetector
   Licensed under MIT license
-  Version: 1.3.2
+  Version: 1.3.1
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -24,7 +24,6 @@
   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
-  1.3.2   K Hoang      09/09/2022 Fix ESP32 chipID for example ConfigOnDoubleReset
 *****************************************************************************************************************************/
 
 #pragma once
@@ -43,13 +42,13 @@
 #endif
 
 #ifndef ESP_DOUBLE_RESET_DETECTOR_VERSION
-  #define ESP_DOUBLE_RESET_DETECTOR_VERSION             "ESP_DoubleResetDetector v1.3.2"
+  #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       2
+  #define ESP_DOUBLE_RESET_DETECTOR_VERSION_PATCH       1
 
-  #define ESP_DOUBLE_RESET_DETECTOR_VERSION_INT         1003002
+  #define ESP_DOUBLE_RESET_DETECTOR_VERSION_INT         1003001
 #endif
 
 #define ESP_DOUBLERESETDETECTOR_VERSION         ESP_DOUBLE_RESET_DETECTOR_VERSION

lib/ESP_WifiManager/ESP_WiFiManager-Impl.h

@@ -16,18 +16,47 @@
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
   
-  Version: 1.11.0
+  Version: 1.8.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.0.0   K Hoang      07/10/2019 Initial coding
-  ...
-  1.8.0   K Hoang      29/12/2021 Fix `multiple-definitions` linker error and weird bug related to src_cpp
-  1.9.0   K Hoang      17/01/2022 Enable compatibility with old code to include only ESP_WiFiManager.h
-  1.10.0  K Hoang      10/02/2022 Add support to new ESP32-S3
-  1.10.1  K Hoang      11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+
-  1.10.2  K Hoang      13/03/2022 Send CORS header in handleWifiSave() function
-  1.11.0  K Hoang      09/09/2022 Fix ESP32 chipID and add ESP_getChipOUI()
+  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 Enable compatibility with old code to include only ESP_WiFiManager.h
  *****************************************************************************************************************************/
 
 #pragma once
@@ -51,7 +80,7 @@ ESP_WMParameter::ESP_WMParameter(const char *custom)
 
 //////////////////////////////////////////
 
-ESP_WMParameter::ESP_WMParameter(const char *id, const char *placeholder, const char *defaultValue, const int& length, const char *custom, const int& labelPlacement)
+ESP_WMParameter::ESP_WMParameter(const char *id, const char *placeholder, const char *defaultValue, int length, const char *custom, int labelPlacement)
 {
   init(id, placeholder, defaultValue, length, custom, labelPlacement);
 }
@@ -65,7 +94,7 @@ ESP_WMParameter::ESP_WMParameter(const WMParam_Data& WMParam_data)
 //////
 //////////////////////////////////////////
 
-void ESP_WMParameter::init(const char *id, const char *placeholder, const char *defaultValue, const int& length, const char *custom, const int& labelPlacement)
+void ESP_WMParameter::init(const char *id, const char *placeholder, const char *defaultValue, int length, const char *custom, int labelPlacement)
 {
   _WMParam_data._id = id;
   _WMParam_data._placeholder = placeholder;
@@ -223,8 +252,7 @@ ESP_WiFiManager::ESP_WiFiManager(const char *iHostname)
 #ifdef ESP8266
     String _hostname = "ESP8266-" + String(ESP.getChipId(), HEX);
 #else		//ESP32
-    String _hostname = "ESP32-" + String(ESP_getChipId(), HEX);
-    
+    String _hostname = "ESP32-" + String((uint32_t)ESP.getEfuseMac(), HEX);
 #endif
     _hostname.toUpperCase();
 
@@ -433,8 +461,7 @@ bool ESP_WiFiManager::autoConnect()
 #ifdef ESP8266
   String ssid = "ESP_" + String(ESP.getChipId());
 #else		//ESP32
-  String ssid = "ESP_" + String(ESP_getChipId());
-  
+  String ssid = "ESP_" + String((uint32_t)ESP.getEfuseMac());
 #endif
 
   return autoConnect(ssid.c_str(), NULL);
@@ -495,7 +522,7 @@ bool  ESP_WiFiManager::startConfigPortal()
 #ifdef ESP8266
   String ssid = "ESP_" + String(ESP.getChipId());
 #else		//ESP32
-  String ssid = "ESP_" + String(ESP_getChipId());
+  String ssid = "ESP_" + String((uint32_t)ESP.getEfuseMac());
 #endif
   ssid.toUpperCase();
 
@@ -837,7 +864,7 @@ void ESP_WiFiManager::startWPS()
 
 //Convenient for debugging but wasteful of program space.
 //Remove if short of space
-const char* ESP_WiFiManager::getStatus(const int& status)
+const char* ESP_WiFiManager::getStatus(int status)
 {
   switch (status)
   {
@@ -893,21 +920,21 @@ void ESP_WiFiManager::resetSettings()
 
 //////////////////////////////////////////
 
-void ESP_WiFiManager::setTimeout(const unsigned long& seconds)
+void ESP_WiFiManager::setTimeout(unsigned long seconds)
 {
   setConfigPortalTimeout(seconds);
 }
 
 //////////////////////////////////////////
 
-void ESP_WiFiManager::setConfigPortalTimeout(const unsigned long& seconds)
+void ESP_WiFiManager::setConfigPortalTimeout(unsigned long seconds)
 {
   _configPortalTimeout = seconds * 1000;
 }
 
 //////////////////////////////////////////
 
-void ESP_WiFiManager::setConnectTimeout(const unsigned long& seconds)
+void ESP_WiFiManager::setConnectTimeout(unsigned long seconds)
 {
   _connectTimeout = seconds * 1000;
 }
@@ -922,7 +949,7 @@ void ESP_WiFiManager::setDebugOutput(bool debug)
 //////////////////////////////////////////
 
 // KH, new from v1.0.10 to enable dynamic/random channel
-int ESP_WiFiManager::setConfigPortalChannel(const int& channel)
+int ESP_WiFiManager::setConfigPortalChannel(int channel)
 {
   // If channel < MIN_WIFI_CHANNEL - 1 or channel > MAX_WIFI_CHANNEL => channel = 1
   // If channel == 0 => will use random channel from MIN_WIFI_CHANNEL to MAX_WIFI_CHANNEL
@@ -1010,7 +1037,7 @@ void ESP_WiFiManager::setSTAStaticIPConfig(const IPAddress& ip, const IPAddress&
 
 //////////////////////////////////////////
 
-void ESP_WiFiManager::setMinimumSignalQuality(const int& quality)
+void ESP_WiFiManager::setMinimumSignalQuality(int quality)
 {
   _minimumQuality = quality;
 }
@@ -1365,11 +1392,6 @@ void ESP_WiFiManager::handleWifiSave()
   _pass1 = server->arg("p1").c_str();
   
   ///////////////////////
-  
-#if USING_CORS_FEATURE
-  // New from v1.10.2, for configure CORS Header, default to WM_HTTP_CORS_ALLOW_ALL = "*"
-  server->sendHeader(FPSTR(WM_HTTP_CORS), _CORS_Header);
-#endif  
 
 #if USE_ESP_WIFIMANAGER_NTP 
   
@@ -1562,23 +1584,10 @@ void ESP_WiFiManager::handleInfo()
   page += F("<table class=\"table\">");
   page += F("<thead><tr><th>Name</th><th>Value</th></tr></thead><tbody><tr><td>Chip ID</td><td>");
 
-  page += F("0x");
 #ifdef ESP8266
   page += String(ESP.getChipId(), HEX);		//ESP.getChipId();
 #else		//ESP32
-
-  page += String(ESP_getChipId(), HEX);		//ESP.getChipId();
-  
-  page += F("</td></tr>");
-  page += F("<tr><td>Chip OUI</td><td>");
-  page += F("0x");
-  page += String(getChipOUI(), HEX);		//ESP.getChipId();
-  
-  page += F("</td></tr>");
-  page += F("<tr><td>Chip Model</td><td>");
-  page += ESP.getChipModel();
-  page += F(" Rev");
-  page += ESP.getChipRevision();
+  page += String((uint32_t)ESP.getEfuseMac(), HEX);		//ESP.getChipId();
 #endif
 
   page += F("</td></tr>");
@@ -2010,7 +2019,7 @@ int ESP_WiFiManager::scanWifiNetworks(int **indicesptr)
 
 //////////////////////////////////////////
 
-int ESP_WiFiManager::getRSSIasQuality(const int& RSSI)
+int ESP_WiFiManager::getRSSIasQuality(int RSSI)
 {
   int quality = 0;
 
@@ -2107,31 +2116,6 @@ String ESP_WiFiManager::getStoredWiFiPass()
   
   return String(reinterpret_cast<char*>(conf.sta.password));
 }
-
-uint32_t getChipID()
-{
-  uint64_t chipId64 = 0;
-
-  for (int i = 0; i < 6; i++)
-  {
-    chipId64 |= ( ( (uint64_t) ESP.getEfuseMac() >> (40 - (i * 8)) ) & 0xff ) << (i * 8);
-  }
-  
-  return (uint32_t) (chipId64 & 0xFFFFFF);
-}
-
-uint32_t getChipOUI()
-{
-  uint64_t chipId64 = 0;
-
-  for (int i = 0; i < 6; i++)
-  {
-    chipId64 |= ( ( (uint64_t) ESP.getEfuseMac() >> (40 - (i * 8)) ) & 0xff ) << (i * 8);
-  }
-  
-  return (uint32_t) (chipId64 >> 24);
-}
-
 #endif
 
 

lib/ESP_WifiManager/ESP_WiFiManager.h

@@ -16,18 +16,48 @@
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
   
-  Version: 1.11.0
+  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
-  1.10.0  K Hoang      10/02/2022 Add support to new ESP32-S3
-  1.10.1  K Hoang      11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+
-  1.10.2  K Hoang      13/03/2022 Send CORS header in handleWifiSave() function
-  1.11.0  K Hoang      09/09/2022 Fix ESP32 chipID and add ESP_getChipOUI()
  *****************************************************************************************************************************/
 
 #pragma once

lib/ESP_WifiManager/ESP_WiFiManager.hpp

@@ -16,18 +16,48 @@
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
   
-  Version: 1.11.0
+  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
-  1.10.0  K Hoang      10/02/2022 Add support to new ESP32-S3
-  1.10.1  K Hoang      11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+
-  1.10.2  K Hoang      13/03/2022 Send CORS header in handleWifiSave() function
-  1.11.0  K Hoang      09/09/2022 Fix ESP32 chipID and add ESP_getChipOUI()
  *****************************************************************************************************************************/
 
 #pragma once
@@ -40,48 +70,33 @@
 #elif ( ARDUINO_ESP32S2_DEV || ARDUINO_FEATHERS2 || ARDUINO_ESP32S2_THING_PLUS || ARDUINO_MICROS2 || \
         ARDUINO_METRO_ESP32S2 || ARDUINO_MAGTAG29_ESP32S2 || ARDUINO_FUNHOUSE_ESP32S2 || \
         ARDUINO_ADAFRUIT_FEATHER_ESP32S2_NOPSRAM )
-  #if (_WIFIMGR_LOGLEVEL_ > 3)
-		#warning Using ESP32_S2. To follow library instructions to install esp32-s2 core and WebServer Patch
-		#warning You have to select HUGE APP or 1.9-2.0 MB APP to be able to run Config Portal. Must use PSRAM
-  #endif
+  #warning Using ESP32_S2. To follow library instructions to install esp32-s2 core and WebServer Patch
+  #warning You have to select HUGE APP or 1.9-2.0 MB APP to be able to run Config Portal. Must use PSRAM
   #define USING_ESP32_S2        true
 #elif ( ARDUINO_ESP32C3_DEV )
-	#if (_WIFIMGR_LOGLEVEL_ > 3)
-		#if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) )
-		  #warning Using ESP32_C3 using core v2.0.0+. Either LittleFS, SPIFFS or EEPROM OK.
-		#else
-		  #warning Using ESP32_C3 using core v1.0.6-. To follow library instructions to install esp32-c3 core. Only SPIFFS and EEPROM OK.
-		#endif
-  #endif
-  
-  // #warning You have to select Flash size 2MB and Minimal APP (1.3MB + 700KB) for some boards
+  #warning Using ESP32_C3. To follow library instructions to install esp32-c3 core. Only SPIFFS and EEPROM OK.
+  #warning You have to select Flash size 2MB and Minimal APP (1.3MB + 700KB) for some boards
   #define USING_ESP32_C3        true
-#elif ( defined(ARDUINO_ESP32S3_DEV) || defined(ARDUINO_ESP32_S3_BOX) || defined(ARDUINO_TINYS3) || \
-        defined(ARDUINO_PROS3) || defined(ARDUINO_FEATHERS3) )
-  #if (_WIFIMGR_LOGLEVEL_ > 3)
-  	#warning Using ESP32_S3. To install esp32-s3-support branch if using core v2.0.2-
-  #endif
-  #define USING_ESP32_S3        true   
 #endif
 
-#define ESP_WIFIMANAGER_VERSION           "ESP_WiFiManager v1.11.0"
+#define ESP_WIFIMANAGER_VERSION           "ESP_WiFiManager v1.9.0"
 
 #define ESP_WIFIMANAGER_VERSION_MAJOR     1
-#define ESP_WIFIMANAGER_VERSION_MINOR     11
+#define ESP_WIFIMANAGER_VERSION_MINOR     9
 #define ESP_WIFIMANAGER_VERSION_PATCH     0
 
-#define ESP_WIFIMANAGER_VERSION_INT      1011000
+#define ESP_WIFIMANAGER_VERSION_INT      1009000
 
 #include "ESP_WiFiManager_Debug.h"
 
 #if ( defined(HTTP_PORT) && (HTTP_PORT < 65536) && (HTTP_PORT > 0) )
-  #if (_WIFIMGR_LOGLEVEL_ > 3)
+  #if (_WIFIMGR_LOGLEVEL_ > 2)
     #warning Using custom HTTP_PORT
   #endif
     
   #define HTTP_PORT_TO_USE     HTTP_PORT
 #else
-  #if (_WIFIMGR_LOGLEVEL_ > 3)
+  #if (_WIFIMGR_LOGLEVEL_ > 2)
     #warning Using default HTTP_PORT = 80
   #endif
   
@@ -111,20 +126,9 @@
   }
   
   #define ESP_getChipId()   (ESP.getChipId())
-  
 #else		//ESP32
-
   #include <esp_wifi.h>
-  
-  uint32_t getChipID();
-  uint32_t getChipOUI();
-   
-  #if defined(ESP_getChipId)
-    #undef ESP_getChipId
-  #endif
-  
-  #define ESP_getChipId()  	getChipID()			// ((uint32_t)ESP.getEfuseMac())
-  #define ESP_getChipOUI() 	getChipOUI()		// ((uint32_t)ESP.getEfuseMac())
+  #define ESP_getChipId()   ((uint32_t)ESP.getEfuseMac())
 #endif
 
 // New in v1.4.0
@@ -195,10 +199,7 @@ const char WM_HTTP_SCRIPT_NTP_HIDDEN[] PROGMEM = "<p><input type='hidden' id='ti
   #if !(USE_CLOUDFLARE_NTP)
     #undef USE_CLOUDFLARE_NTP
     #define USE_CLOUDFLARE_NTP      true
-    
-    #if (_WIFIMGR_LOGLEVEL_ > 3)
-    	#warning Forcing USE_CLOUDFLARE_NTP for ESP8266 as low memory can cause blank page
-    #endif
+    #warning Forcing USE_CLOUDFLARE_NTP for ESP8266 as low memory can cause blank page
   #endif
 #endif
 
@@ -290,8 +291,8 @@ class ESP_WMParameter
 {
   public:
     ESP_WMParameter(const char *custom);
-    ESP_WMParameter(const char *id, const char *placeholder, const char *defaultValue, const int& length, 
-                    const char *custom = "", const int& labelPlacement = WFM_LABEL_BEFORE);
+    ESP_WMParameter(const char *id, const char *placeholder, const char *defaultValue, int length, 
+                    const char *custom = "", int labelPlacement = WFM_LABEL_BEFORE);
     
     // New in v1.4.0              
     ESP_WMParameter(const WMParam_Data& WMParam_data);                   
@@ -301,7 +302,7 @@ class ESP_WMParameter
     
     // New in v1.4.0
     void setWMParam_Data(const WMParam_Data& WMParam_data);
-    void getWMParam_Data(WMParam_Data& WMParam_data);
+    void getWMParam_Data(WMParam_Data &WMParam_data);
     //////
 
     const char *getID();
@@ -317,8 +318,7 @@ class ESP_WMParameter
     
     const char *_customHTML;
 
-    void init(const char *id, const char *placeholder, const char *defaultValue, const int& length, 
-              const char *custom, const int& labelPlacement);
+    void init(const char *id, const char *placeholder, const char *defaultValue, int length, const char *custom, int labelPlacement);
 
     friend class ESP_WiFiManager;
 };
@@ -359,27 +359,27 @@ class ESP_WiFiManager
     //sets timeout before webserver loop ends and exits even if there has been no setup.
     //usefully for devices that failed to connect at some point and got stuck in a webserver loop
     //in seconds setConfigPortalTimeout is a new name for setTimeout
-    void          setConfigPortalTimeout(const unsigned long& seconds);
-    void          setTimeout(const unsigned long& seconds);
+    void          setConfigPortalTimeout(unsigned long seconds);
+    void          setTimeout(unsigned long seconds);
 
     //sets timeout for which to attempt connecting, usefull if you get a lot of failed connects
-    void          setConnectTimeout(const unsigned long& seconds);
+    void          setConnectTimeout(unsigned long seconds);
 
 
     void          setDebugOutput(bool debug);
     //defaults to not showing anything under 8% signal quality if called
-    void          setMinimumSignalQuality(const int& quality = 8);
+    void          setMinimumSignalQuality(int quality = 8);
     
     // KH, new from v1.0.10 to enable dynamic/random channel
-    int           setConfigPortalChannel(const int& channel = 1);
+    int           setConfigPortalChannel(int channel = 1);
     //////
     
     //sets a custom ip /gateway /subnet configuration
     void          setAPStaticIPConfig(const IPAddress& ip, const IPAddress& gw, const IPAddress& sn);
     
     // New in v1.4.0
-    void          setAPStaticIPConfig(const WiFi_AP_IPConfig& WM_AP_IPconfig);
-    void          getAPStaticIPConfig(WiFi_AP_IPConfig& WM_AP_IPconfig);
+    void          setAPStaticIPConfig(const WiFi_AP_IPConfig&  WM_AP_IPconfig);
+    void          getAPStaticIPConfig(WiFi_AP_IPConfig  &WM_AP_IPconfig);
     //////
     
     //sets config for a static IP
@@ -387,7 +387,7 @@ class ESP_WiFiManager
     
     // New in v1.4.0
     void          setSTAStaticIPConfig(const WiFi_STA_IPConfig&  WM_STA_IPconfig);
-    void          getSTAStaticIPConfig(WiFi_STA_IPConfig& WM_STA_IPconfig);
+    void          getSTAStaticIPConfig(WiFi_STA_IPConfig  &WM_STA_IPconfig);
     //////
     
 #if USE_CONFIGURABLE_DNS
@@ -447,7 +447,7 @@ class ESP_WiFiManager
     
     #define MAX_WIFI_CREDENTIALS        2
     
-    String				getSSID(const uint8_t& index) 
+    String				getSSID(uint8_t index) 
     {
       if (index == 0)
         return _ssid;
@@ -457,7 +457,7 @@ class ESP_WiFiManager
         return String("");
     }
     
-    String				getPW(const uint8_t& index) 
+    String				getPW(uint8_t index) 
     {
       if (index == 0)
         return _pass;
@@ -488,7 +488,7 @@ class ESP_WiFiManager
     // returns the Parameters Count
     int           getParametersCount();
 
-    const char*   getStatus(const int& status);
+    const char*   getStatus(int status);
 
 #ifdef ESP32
     String getStoredWiFiSSID();
@@ -605,7 +605,7 @@ class ESP_WiFiManager
 
     void          setupConfigPortal();
     void          startWPS();
-    //const char*   getStatus(const int& status);
+    //const char*   getStatus(int status);
 
     const char*   _apName = "no-net";
     const char*   _apPassword = NULL;
@@ -686,13 +686,13 @@ class ESP_WiFiManager
     void          handleNotFound();
     bool          captivePortal();
     
-    void          reportStatus(String& page);
+    void          reportStatus(String &page);
 
     // DNS server
     const byte    DNS_PORT = 53;
 
     //helpers
-    int           getRSSIasQuality(const int& RSSI);
+    int           getRSSIasQuality(int RSSI);
     bool          isIp(const String& str);
     String        toStringIp(const IPAddress& ip);
 
@@ -715,13 +715,10 @@ class ESP_WiFiManager
     void          DEBUG_WM(Generic text);
 
     template <class T>
-    auto optionalIPFromString(T *obj, const char *s) -> decltype(obj->fromString(s)) 
-    {
+    auto optionalIPFromString(T *obj, const char *s) -> decltype(obj->fromString(s)) {
       return  obj->fromString(s);
     }
-    
-    auto optionalIPFromString(...) -> bool 
-    {
+    auto optionalIPFromString(...) -> bool {
       LOGINFO("NO fromString METHOD ON IPAddress, you need ESP8266 core 2.1.0 or newer for Custom IP configuration to work.");
       return false;
     }

lib/ESP_WifiManager/ESP_WiFiManager_Debug.h

@@ -16,18 +16,48 @@
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
   
-  Version: 1.11.0
+  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
-  1.10.0  K Hoang      10/02/2022 Add support to new ESP32-S3
-  1.10.1  K Hoang      11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+
-  1.10.2  K Hoang      13/03/2022 Send CORS header in handleWifiSave() function
-  1.11.0  K Hoang      09/09/2022 Fix ESP32 chipID and add ESP_getChipOUI()
  *****************************************************************************************************************************/
 
 #pragma once

lib/ESP_WifiManager/utils/TZ.h

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

lib/mpu6050/I2Cdev.cpp

@@ -234,7 +234,9 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
                 useWire->beginTransmission(devAddr);
                 useWire->send(regAddr);
                 useWire->endTransmission();
+                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++) {
                     data[count] = useWire->receive();
                     #ifdef I2CDEV_SERIAL_DEBUG
@@ -242,6 +244,8 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
                         if (count + 1 < length) Serial.print(" ");
                     #endif
                 }
+
+                useWire->endTransmission();
             }
         #elif (ARDUINO == 100)
             // Arduino v1.0.0, Wire library
@@ -254,7 +258,9 @@ 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);
                 useWire->requestFrom((uint8_t)devAddr, (uint8_t)min((int)length - k, I2CDEVLIB_WIRE_BUFFER_LENGTH));
+        
                 for (; useWire->available() && (timeout == 0 || millis() - t1 < timeout); count++) {
                     data[count] = useWire->read();
                     #ifdef I2CDEV_SERIAL_DEBUG
@@ -262,6 +268,8 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
                         if (count + 1 < length) Serial.print(" ");
                     #endif
                 }
+        
+                useWire->endTransmission();
             }
         #elif (ARDUINO > 100)
             // Arduino v1.0.1+, Wire library
@@ -274,7 +282,10 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
                 useWire->beginTransmission(devAddr);
                 useWire->write(regAddr);
                 useWire->endTransmission();
+                // 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++) {
                     data[count] = useWire->read();
                     #ifdef I2CDEV_SERIAL_DEBUG
@@ -346,6 +357,7 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
                 useWire->beginTransmission(devAddr);
                 useWire->send(regAddr);
                 useWire->endTransmission();
+                useWire->beginTransmission(devAddr);
                 useWire->requestFrom(devAddr, (uint8_t)(length * 2)); // length=words, this wants bytes
     
                 bool msb = true; // starts with MSB, then LSB
@@ -364,6 +376,8 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
                     }
                     msb = !msb;
                 }
+
+                useWire->endTransmission();
             }
         #elif (ARDUINO == 100)
             // Arduino v1.0.0, Wire library
@@ -376,6 +390,7 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
                 useWire->beginTransmission(devAddr);
                 useWire->write(regAddr);
                 useWire->endTransmission();
+                useWire->beginTransmission(devAddr);
                 useWire->requestFrom(devAddr, (uint8_t)(length * 2)); // length=words, this wants bytes
     
                 bool msb = true; // starts with MSB, then LSB
@@ -394,6 +409,8 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
                     }
                     msb = !msb;
                 }
+        
+                useWire->endTransmission();
             }
         #elif (ARDUINO > 100)
             // Arduino v1.0.1+, Wire library
@@ -406,6 +423,7 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
                 useWire->beginTransmission(devAddr);
                 useWire->write(regAddr);
                 useWire->endTransmission();
+                useWire->beginTransmission(devAddr);
                 useWire->requestFrom(devAddr, (uint8_t)(length * 2)); // length=words, this wants bytes
         
                 bool msb = true; // starts with MSB, then LSB
@@ -424,6 +442,8 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
                     }
                     msb = !msb;
                 }
+        
+                useWire->endTransmission();
             }
         #endif
 
@@ -1466,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_ */

platformio.ini

@@ -16,327 +16,172 @@ include_dir = lib
 upload_speed = 921600
 monitor_speed =  115200
 platform = espressif8266 @ 4.0.1
-platform32 = espressif32 @ 5.2.0
 framework = arduino
 board = d1_mini
 build_unflags = 
 build_flags = 
-	-Wl,-Map,output.map
-	-DBAUD=${common_env_data.monitor_speed}
+	-D BAUD=${common_env_data.monitor_speed}
+	-D ACTIVATE_OTA
+	#-D DEBUG_ESP_HTTP_CLIENT	
+	#-D DEBUG_ESP_HTTP_SERVER	
+	#-D DEBUG_ESP_PORT=Serial			  	
+	#-D DEBUG_ESP_WIFI
+	#-D DEBUG_ESP_SSL
+	#-D DEBUG_ESP_CORE
 	#-D SKIP_SLEEPMODE
-	#-D FORCE_GRAVITY_MODE
-	#-D DOUBLERESETDETECTOR_DEBUG=true
-	-DACTIVATE_OTA
-	-DCFG_DISABLE_LOGGING # Turn off verbose/notice logging to reduce size and dont overload uart (applies to LOG_LEVEL6)
-	-DGYRO_DISABLE_LOGGING
-	-DCALC_DISABLE_LOGGING
-	-DHELPER_DISABLE_LOGGING
-	-DPUSH_DISABLE_LOGGING
-	-DTSEN_DISABLE_LOGGING
-	-DWIFI_DISABLE_LOGGING
-	-DWEB_DISABLE_LOGGING
-	-DMAIN_DISABLE_LOGGING
-	-DUSE_LITTLEFS=true
-	-DUSER_SSID=\""\""           # =\""myssid\""
-	-DUSER_SSID_PWD=\""\""       # =\""mypwd\""	
-	-DCFG_APPVER="\"1.2.1\""
-	#-DCFG_GITREV=\""beta-3\""
-	!python script/git_rev.py
-lib_deps =
+	-D USE_LITTLEFS=true
+	-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.1.0\""
+	-D CFG_GITREV=\""beta-2\""
+	#!python script/git_rev.py
+lib_deps = # Switched to forks for better version control.
 	# Using local copy of these libraries
-  	# https://github.com/mp-se/i2cdevlib.git#<document> 		
-	# https://github.com/mp-se/OneWire																		  
-	# 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/Arduino-Log#1.1.1    				# https://github.com/thijse/Arduino-Log
-	https://github.com/mp-se/ArduinoJson#v6.18.5 				# https://github.com/bblanchon/ArduinoJson
-	https://github.com/mp-se/arduinoCurveFitting#v1.0.6   		# https://github.com/Rotario/arduinoCurveFitting
-	https://github.com/mp-se/arduino-mqtt#v2.5.0				# https://github.com/256dpi/arduino-mqtt
-lib_deps32 = 
-	https://github.com/mp-se/NimBLE-Arduino#1.3.8	 				# https://github.com/h2zero/NimBLE-Arduino
+  #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
+	https://github.com/mp-se/ArduinoJson#v6.18.5 											   	# https://github.com/bblanchon/ArduinoJson
+	https://github.com/mp-se/arduinoCurveFitting#v1.0.6      							# https://github.com/Rotario/arduinoCurveFitting
+	https://github.com/mp-se/arduino-mqtt#v2.5.0				    							# https://github.com/256dpi/arduino-mqtt
+
+[env:gravity-debug]
+upload_speed = ${common_env_data.upload_speed}
+monitor_speed = ${common_env_data.monitor_speed}
+framework = ${common_env_data.framework}
+platform = ${common_env_data.platform}
 extra_scripts =  
+	script/copy_html.py
 	script/copy_firmware.py
 	script/create_versionjson.py
-
-; [env:gravity-debug]
-; upload_speed = ${common_env_data.upload_speed}
-; monitor_speed = ${common_env_data.monitor_speed}
-; framework = ${common_env_data.framework}
-; platform = ${common_env_data.platform}
-; extra_scripts = ${common_env_data.extra_scripts}
-; build_unflags =	${common_env_data.build_unflags}
-; build_flags = 
-;   ${common_env_data.build_flags}
-; 	#-D DEBUG_ESP_HTTP_CLIENT	
-; 	#-D DEBUG_ESP_HTTP_SERVER	
-; 	#-D DEBUG_ESP_PORT=Serial			  	
-; 	#-D DEBUG_ESP_WIFI
-; 	#-D DEBUG_ESP_SSL
-; 	#-D DEBUG_ESP_CORE
-; 	-DPIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS
-; 	-DCOLLECT_PERFDATA	# Collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb 
-; 	-DLOG_LEVEL=6 
-; lib_deps = 
-; 	https://github.com/mp-se/incbin	#	https://github.com/graphitemaster/incbin
-; 	${common_env_data.lib_deps}
-; board = ${common_env_data.board}
-; build_type = release
-; board_build.filesystem = littlefs
-; monitor_filters = esp8266_exception_decoder
+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 SKIP_SLEEPMODE
+	#-D DOUBLERESETDETECTOR_DEBUG=true
+	#-D FORCE_GRAVITY_MODE # used to debug gravity mode
+	-D COLLECT_PERFDATA	# This option will collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb 
+	-D LOG_LEVEL=6 # Maximum log level for the debug build.
+	-D CFG_DISABLE_LOGGING # Turn off verbose/notice logging to reduce size and dont overload uart. 
+  -D GYRO_DISABLE_LOGGING
+  -D CALC_DISABLE_LOGGING
+  -D HELPER_DISABLE_LOGGING
+  -D PUSH_DISABLE_LOGGING
+  -D TSEN_DISABLE_LOGGING
+  -D WIFI_DISABLE_LOGGING
+  -D WEB_DISABLE_LOGGING
+	-D MAIN_DISABLE_LOGGING
+lib_deps = 
+	${common_env_data.lib_deps}
+board = ${common_env_data.board}
+#build_type = debug
+build_type = release
+board_build.filesystem = littlefs
+monitor_filters = esp8266_exception_decoder
 
 [env:gravity-release]
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
 framework = ${common_env_data.framework}
 platform = ${common_env_data.platform}
-extra_scripts = ${common_env_data.extra_scripts}
+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}
+    ${common_env_data.build_flags}
 	-D LOG_LEVEL=4
-	#-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port
 lib_deps = 
-	https://github.com/mp-se/incbin	#	https://github.com/graphitemaster/incbin
 	${common_env_data.lib_deps}
 board = ${common_env_data.board}
 build_type = release
-#build_type = debug
 board_build.filesystem = littlefs
-build_src_filter = +<*> -<../test/tests*.cpp>
-monitor_filters = esp8266_exception_decoder
 
-[env:gravity-unit]
+[env:gravity-perf]
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
 framework = ${common_env_data.framework}
 platform = ${common_env_data.platform}
-extra_scripts = ${common_env_data.extra_scripts}
+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 LOG_LEVEL=4
+	${common_env_data.build_flags}
+	-D COLLECT_PERFDATA	
+	-D LOG_LEVEL=5
 lib_deps = 
-	https://github.com/mp-se/incbin						# https://github.com/graphitemaster/incbin
-	https://github.com/bxparks/AUnit#v1.6.1
 	${common_env_data.lib_deps}
 board = ${common_env_data.board}
-build_type = debug
+build_type = release
 board_build.filesystem = littlefs
-build_src_filter = +<*> -<main.cpp> +<../test/tests*.cpp>
-monitor_filters = esp8266_exception_decoder
 
 [env:gravity32-release]
-framework = ${common_env_data.framework}
-platform = ${common_env_data.platform32}
+framework = arduino
+platform = espressif32 @ 5.0.0
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
-extra_scripts = ${common_env_data.extra_scripts}
+extra_scripts =  
+	script/copy_html.py
+	script/copy_firmware.py
+	script/create_versionjson.py
 build_unflags = 
 	${common_env_data.build_unflags}
 build_flags = 
 	-Wl,-Map,output.map
-	#-DCORE_DEBUG_LEVEL=0
 	${common_env_data.build_flags}
+	#-D COLLECT_PERFDATA	
 	-D LOG_LEVEL=5
-	-DESP32D1
-	-DCORE_DEBUG_LEVEL=0
-	#-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port
+	-D CFG_DISABLE_LOGGING # Turn off verbose/notice logging to reduce size and dont overload uart (applies to LOG_LEVEL6)
+  -D GYRO_DISABLE_LOGGING
+  -D CALC_DISABLE_LOGGING
+  -D HELPER_DISABLE_LOGGING
+  -D PUSH_DISABLE_LOGGING
+  -D TSEN_DISABLE_LOGGING
+  -D WIFI_DISABLE_LOGGING
+  -D WEB_DISABLE_LOGGING
+	-D MAIN_DISABLE_LOGGING
 lib_deps = 
 	${common_env_data.lib_deps}
-	${common_env_data.lib_deps32}	
+	https://github.com/mp-se/NimBLE-Arduino#1.3.8	 # https://github.com/h2zero/NimBLE-Arduino
 lib_ignore = 
-board = wemos_d1_mini32 
+board = featheresp32
 build_type = release
 board_build.partitions = part32.csv
 board_build.filesystem = littlefs 
-board_build.embed_txtfiles =
-	html/calibration.min.htm
-	html/config.min.htm
-	html/firmware.min.htm
-	html/format.min.htm
-	html/about.min.htm
-	html/index.min.htm
-	html/test.min.htm
+monitor_filters = esp32_exception_decoder
 
-[env:gravity32c3-release]
-framework = ${common_env_data.framework}
-platform = ${common_env_data.platform32}
+[env:gravity32-perf]
+framework = arduino
+platform = espressif32 @ 5.0.0
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
-extra_scripts = ${common_env_data.extra_scripts}
+extra_scripts =  
+	script/copy_html.py
+	script/copy_firmware.py
+	script/create_versionjson.py
 build_unflags = 
 	${common_env_data.build_unflags}
 build_flags = 
 	-Wl,-Map,output.map
 	${common_env_data.build_flags}
-	-DLOG_LEVEL=5
-	-DCORE_DEBUG_LEVEL=0
-	-DESP32C3
-	-DARDUINO_ESP32C3_DEV
-	#-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port
+	-D COLLECT_PERFDATA	
+	-D LOG_LEVEL=5
 lib_deps = 
 	${common_env_data.lib_deps}
-	${common_env_data.lib_deps32}
-lib_ignore = 
-board = lolin_c3_mini 
+	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 
-board_build.embed_txtfiles =
-	html/calibration.min.htm
-	html/config.min.htm
-	html/firmware.min.htm
-	html/format.min.htm
-	html/about.min.htm
-	html/index.min.htm
-	html/test.min.htm
-
-[env:gravity32c3v1-release]
-framework = ${common_env_data.framework}
-platform = ${common_env_data.platform32}
-upload_speed = ${common_env_data.upload_speed}
-monitor_speed = ${common_env_data.monitor_speed}
-extra_scripts = ${common_env_data.extra_scripts}
-build_unflags = 
-	${common_env_data.build_unflags}
-build_flags = 
-	-Wl,-Map,output.map
-	${common_env_data.build_flags}
-	-DLOG_LEVEL=5
-	-DCORE_DEBUG_LEVEL=0
-	-DESP32C3
-	-DARDUINO_ESP32C3_DEV
-	-DREDUCE_WIFI_POWER # Enable this if v1.0 chip is used
-	#-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port
-lib_deps = 
-	${common_env_data.lib_deps}
-	${common_env_data.lib_deps32}
-lib_ignore = 
-board = lolin_c3_mini 
-build_type = release
-board_build.partitions = part32.csv
-board_build.filesystem = littlefs 
-board_build.embed_txtfiles =
-	html/calibration.min.htm
-	html/config.min.htm
-	html/firmware.min.htm
-	html/format.min.htm
-	html/about.min.htm
-	html/index.min.htm
-	html/test.min.htm
-
-[env:gravity32s2-release]
-framework = ${common_env_data.framework}
-platform = ${common_env_data.platform32}
-upload_speed = ${common_env_data.upload_speed}
-monitor_speed = ${common_env_data.monitor_speed}
-extra_scripts = ${common_env_data.extra_scripts}
-build_unflags = 
-	${common_env_data.build_unflags}
-build_flags = 
-	-Wl,-Map,output.map
-	${common_env_data.build_flags}
-	-DLOG_LEVEL=5
-	-DCORE_DEBUG_LEVEL=0
-	-DESP32S2
-	-DARDUINO_ESP32S2_DEV
-	#-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port
-lib_deps = 
-	${common_env_data.lib_deps}
-lib_ignore = 
-board = lolin_s2_mini 
-build_type = release
-board_build.partitions = part32.csv
-board_build.filesystem = littlefs 
-board_build.embed_txtfiles =
-	html/calibration.min.htm
-	html/config.min.htm
-	html/firmware.min.htm
-	html/format.min.htm
-	html/about.min.htm
-	html/index.min.htm
-	html/test.min.htm
-
-[env:gravity32c3-debug]
-framework = ${common_env_data.framework}
-platform = ${common_env_data.platform32}
-upload_speed = ${common_env_data.upload_speed}
-monitor_speed = ${common_env_data.monitor_speed}
-monitor_filters = time, colorize, log2file, esp32_exception_decoder
-extra_scripts = ${common_env_data.extra_scripts}
-upload_port = COM8
-debug_tool = esp-prog
-debug_init_break = break setup
-build_unflags = 
-	-DCFG_DISABLE_LOGGING 
-	-DGYRO_DISABLE_LOGGING
-	-DCALC_DISABLE_LOGGING
-	-DHELPER_DISABLE_LOGGING
-	-DPUSH_DISABLE_LOGGING
-	-DTSEN_DISABLE_LOGGING
-	-DWIFI_DISABLE_LOGGING
-	-DWEB_DISABLE_LOGGING
-	-DMAIN_DISABLE_LOGGING
-	${common_env_data.build_unflags}
-build_flags = 
-	-Wl,-Map,output.map
-	${common_env_data.build_flags}
-	-DLOG_LEVEL=6
-	-DCORE_DEBUG_LEVEL=5
-	-DJTAG_DEBUG
-	-DESP32C3
-	#-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port
-	-DARDUINO_ESP32C3_DEV
-	-DCOLLECT_PERFDATA	# Collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb 
-lib_deps = 
-	${common_env_data.lib_deps}
-	${common_env_data.lib_deps32}
-lib_ignore = 
-board = esp32-c3-devkitm-1
-build_type = debug
-board_build.partitions = part32.csv
-board_build.filesystem = littlefs 
-board_build.embed_txtfiles =
-	html/calibration.min.htm
-	html/config.min.htm
-	html/firmware.min.htm
-	html/format.min.htm
-	html/about.min.htm
-	html/index.min.htm
-	html/test.min.htm
-
-# This is a version for the floaty hardware. No DSB18 sensor and no battery measurement.
-[env:gravity32lite-release] 
-framework = ${common_env_data.framework}
-platform = ${common_env_data.platform32}
-upload_speed = ${common_env_data.upload_speed}
-monitor_speed = ${common_env_data.monitor_speed}
-extra_scripts = ${common_env_data.extra_scripts}
-build_unflags = 
-	${common_env_data.build_unflags}
-build_flags = 
-	-Wl,-Map,output.map
-	${common_env_data.build_flags}
-	-DLOG_LEVEL=5
-	-DCORE_DEBUG_LEVEL=0
-	-DESP32LITE
-	-DFLOATY
-	#-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port
-lib_deps = 
-	${common_env_data.lib_deps}
-	${common_env_data.lib_deps32}
-lib_ignore = 
-board = lolin32_lite 
-build_type = release
-board_build.partitions = part32.csv
-board_build.filesystem = littlefs 
-board_build.embed_txtfiles =
-	html/calibration.min.htm
-	html/config.min.htm
-	html/firmware.min.htm
-	html/format.min.htm
-	html/about.min.htm
-	html/index.min.htm
-	html/test.min.htm
+monitor_filters = esp32_exception_decoder

requirements.txt

@@ -1 +0,0 @@
-requests

script/copy_firmware.py

@@ -23,6 +23,12 @@ def after_build(source, target, env):
         print( "Copy file : " + source + " -> " + target )
         shutil.copyfile( source, target )
 
+    if name == "gravity-perf" :
+        target = dir + "/bin/firmware-perf.bin"
+        source = dir + "/.pio/build/" + name + "/firmware.bin"
+        print( "Copy file : " + source + " -> " + target )
+        shutil.copyfile( source, target )
+
     if name == "gravity32-release" :
         target = dir + "/bin/firmware32.bin"
         source = dir + "/.pio/build/" + name + "/firmware.bin"
@@ -34,44 +40,18 @@ def after_build(source, target, env):
         print( "Copy file : " + source + " -> " + target )
         shutil.copyfile( source, target )
 
-    if name == "gravity32c3-release" :
-        target = dir + "/bin/firmware32c3.bin"
+    if name == "gravity32-perf" :
+        target = dir + "/bin/firmware32-perf.bin"
         source = dir + "/.pio/build/" + name + "/firmware.bin"
         print( "Copy file : " + source + " -> " + target )
         shutil.copyfile( source, target )
 
-        target = dir + "/bin/partitions32c3.bin"
-        source = dir + "/.pio/build/" + name + "/partitions.bin"
-        print( "Copy file : " + source + " -> " + target )
-        shutil.copyfile( source, target )
-
-    if name == "gravity32c3v1-release" :
-        target = dir + "/bin/firmware32c3v1.bin"
+    if name == "gravity32-release2" :
+        target = dir + "/bin/firmware32_2.bin"
         source = dir + "/.pio/build/" + name + "/firmware.bin"
         print( "Copy file : " + source + " -> " + target )
         shutil.copyfile( source, target )
 
-    if name == "gravity32s2-release" :
-        target = dir + "/bin/firmware32s2.bin"
-        source = dir + "/.pio/build/" + name + "/firmware.bin"
-        print( "Copy file : " + source + " -> " + target )
-        shutil.copyfile( source, target )
-
-        target = dir + "/bin/partitions32s2.bin"
-        source = dir + "/.pio/build/" + name + "/partitions.bin"
-        print( "Copy file : " + source + " -> " + target )
-        shutil.copyfile( source, target )
-
-    if name == "gravity32lite-release" :
-        target = dir + "/bin/firmware32lite.bin"
-        source = dir + "/.pio/build/" + name + "/firmware.bin"
-        print( "Copy file : " + source + " -> " + target )
-        shutil.copyfile( source, target )
-
-        target = dir + "/bin/partitions32lite.bin"
-        source = dir + "/.pio/build/" + name + "/partitions.bin"
-        print( "Copy file : " + source + " -> " + target )
-        shutil.copyfile( source, target )
 
 print( "Adding custom build step (copy firmware): ")
 env.AddPostAction("buildprog", after_build)

script/copy_html.py

@@ -0,0 +1,34 @@
+Import("env")
+import shutil, os
+
+print( "Executing custom step " )
+dir    = env.GetLaunchDir()
+source = dir + "/html/"
+target = dir + "/data/"
+print( "Copy html-files from " + source + " -> " + target )
+
+os.makedirs(os.path.dirname( target ), exist_ok=True)
+file = "about.min.htm"
+#print( "Copy file: " + source + file + "->" + target + file)
+shutil.copyfile( source + file, target + file )
+file = "calibration.min.htm"
+#print( "Copy file: " + source + file + "->" + target + file)
+shutil.copyfile( source + file, target + file )
+file = "config.min.htm"
+#print( "Copy file: " + source + file + "->" + target + file)
+shutil.copyfile( source + file, target + file )
+file = "index.min.htm"
+#print( "Copy file: " + source + file + "->" + target + file)
+shutil.copyfile( source + file, target + file )
+file = "upload.min.htm"
+#print( "Copy file: " + source + file + "->" + target + file)
+shutil.copyfile( source + file, target + file )
+file = "format.min.htm"
+#print( "Copy file: " + source + file + "->" + target + file)
+shutil.copyfile( source + file, target + file )
+file = "test.min.htm"
+#print( "Copy file: " + source + file + "->" + target + file)
+shutil.copyfile( source + file, target + file )
+file = "firmware.min.htm"
+#print( "Copy file: " + source + file + "->" + target + file)
+shutil.copyfile( source + file, target + file )

script/create_versionjson.py

@@ -12,6 +12,42 @@ def after_build(source, target, env):
     dir    = env.GetLaunchDir()
     #name   = env.get( "PIOENV" )
 
+    # Copy file 1
+    source = dir + "/data/index.min.htm"
+    target = dir + "/bin/index.min.htm"
+    print( "Copy file : " + source + " -> " + target )
+    shutil.copyfile( source, target )
+
+    # Copy file 2
+    source = dir + "/data/config.min.htm"
+    target = dir + "/bin/config.min.htm"
+    print( "Copy file : " + source + " -> " + target )
+    shutil.copyfile( source, target )
+
+    # Copy file 3
+    source = dir + "/data/about.min.htm"
+    target = dir + "/bin/about.min.htm"
+    print( "Copy file : " + source + " -> " + target )
+    shutil.copyfile( source, target )
+
+    # Copy file 4
+    source = dir + "/data/calibration.min.htm"
+    target = dir + "/bin/calibration.min.htm"
+    print( "Copy file : " + source + " -> " + target )
+    shutil.copyfile( source, target )
+
+    # Copy file 5
+    source = dir + "/data/format.min.htm"
+    target = dir + "/bin/format.min.htm"
+    print( "Copy file : " + source + " -> " + target )
+    shutil.copyfile( source, target )
+
+    # Copy file 6
+    source = dir + "/data/test.min.htm"
+    target = dir + "/bin/test.min.htm"
+    print( "Copy file : " + source + " -> " + target )
+    shutil.copyfile( source, target )
+
     target = dir + "/bin/version.json"
     ver = get_build_flag_value("CFG_APPVER")
 

src/ble.cpp

@@ -21,7 +21,7 @@ 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.
  */
-#if defined(ESP32) && !defined(ESP32S2)
+#if defined(ESP32)
 
 #include <ble.hpp>
 #include <string>
@@ -41,15 +41,9 @@ BleSender::BleSender(const char* color) {
 
   // boost power to maximum, these might be changed once battery life using BLE
   // has been tested.
-#if defined(ESP32C3) && defined(REDUCE_WIFI_POWER)
-  esp_ble_tx_power_set(ESP_BLE_PWR_TYPE_DEFAULT, ESP_PWR_LVL_P6);
-  esp_ble_tx_power_set(ESP_BLE_PWR_TYPE_ADV, ESP_PWR_LVL_P6);
-  esp_ble_tx_power_set(ESP_BLE_PWR_TYPE_SCAN, ESP_PWR_LVL_P6);
-#else
   esp_ble_tx_power_set(ESP_BLE_PWR_TYPE_DEFAULT, ESP_PWR_LVL_P9);
   esp_ble_tx_power_set(ESP_BLE_PWR_TYPE_ADV, ESP_PWR_LVL_P9);
   esp_ble_tx_power_set(ESP_BLE_PWR_TYPE_SCAN, ESP_PWR_LVL_P9);
-#endif
 
   _advertising = BLEDevice::getAdvertising();
   _color = color;
@@ -105,4 +99,4 @@ void BleSender::sendData(float tempF, float gravSG) {
   delay(100);
 }
 
-#endif  // ESP32 && !ESP32S2
+#endif  // ESP32

src/ble.hpp

@@ -24,12 +24,14 @@ SOFTWARE.
 #ifndef SRC_BLE_HPP_
 #define SRC_BLE_HPP_
 
-#if defined(ESP32) && !defined(ESP32S2)
+#if defined(ESP32)
 
-#include <Arduino.h>
 #include <NimBLEBeacon.h>
 #include <NimBLEDevice.h>
 
+#include <config.hpp>
+#include <main.hpp>
+
 class BleSender {
  private:
   BLEAdvertising* _advertising;
@@ -41,5 +43,5 @@ class BleSender {
   void sendData(float tempF, float gravSG);
 };
 
-#endif  // ESP32 && !ESP32S2
+#endif  // ESP32
 #endif  // SRC_BLE_HPP_

src/calc.cpp

@@ -27,6 +27,9 @@ SOFTWARE.
 #include <calc.hpp>
 #include <main.hpp>
 
+//
+// Use values to derive a formula
+//
 int createFormula(RawFormulaData &fd, char *formulaBuffer,
                   int formulaBufferSize, int order) {
   int noAngles = 0;
@@ -49,7 +52,8 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
 #endif
 
   if (noAngles < 3) {
-    writeErrorLog("CALC: Not enough values for deriving formula");
+    ErrorFileLog errLog;
+    errLog.addEntry(F("CALC: Not enough values for deriving formula"));
     return ERR_FORMULA_NOTENOUGHVALUES;
   } else {
     double coeffs[order + 1];
@@ -94,10 +98,13 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
 
         // If the deviation is more than 2 degress we mark it as failed.
         if (dev * 1000 > myAdvancedConfig.getMaxFormulaCreationDeviation()) {
-          writeErrorLog(
-              "CALC: Validation failed on angle %.2f, deviation too large %.4f "
-              "SG, formula order %d",
-              fd.a[i], dev * 1000, order);
+          char s[120];
+          snprintf(&s[0], sizeof(s),
+                   "CALC: Validation failed on angle %f, deviation too large "
+                   "%.2f SG, formula order %d",
+                   fd.a[i], dev * 1000, order);
+          ErrorFileLog errLog;
+          errLog.addEntry(&s[0]);
           valid = false;
         }
       }
@@ -111,10 +118,15 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
     }
   }
 
-  writeErrorLog("CALC: Internal error finding formula.");
+  ErrorFileLog errLog;
+  errLog.addEntry(F("CALC: Internal error finding formula."));
   return ERR_FORMULA_INTERNAL;
 }
 
+//
+// Calculates gravity according to supplied formula, compatible with
+// iSpindle/Fermentrack formula
+//
 double calculateGravity(double angle, double temp, const char *tempFormula) {
   const char *formula = myConfig.getGravityFormula();
 
@@ -152,14 +164,17 @@ double calculateGravity(double angle, double temp, const char *tempFormula) {
     return g;
   }
 
-  writeErrorLog("CALC: Failed to parse gravity expression %d", err);
+  ErrorFileLog errLog;
+  errLog.addEntry("CALC: Failed to parse gravity expression " + String(err));
   return 0;
 }
 
+//
 // Do a standard gravity temperature correction. This is a simple way to adjust
 // for differnt worth temperatures. This function uses C as temperature.
 //
 // Source: https://homebrewacademy.com/hydrometer-temperature-correction/
+//
 double gravityTemperatureCorrectionC(double gravitySG, double tempC,
                                      double calTempC) {
 #if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
@@ -196,9 +211,10 @@ double gravityTemperatureCorrectionC(double gravitySG, double tempC,
     return g;
   }
 
-  writeErrorLog(
-      "CALC: Failed to parse expression for gravity temperature correction %d",
-      err);
+  ErrorFileLog errLog;
+  errLog.addEntry(
+      "CALC: Failed to parse expression for gravity temperature correction " +
+      String(err));
   return gravitySG;
 }
 

src/config.cpp

@@ -145,7 +145,8 @@ bool Config::saveFile() {
   File configFile = LittleFS.open(CFG_FILENAME, "w");
 
   if (!configFile) {
-    writeErrorLog("CFG : Failed to save configuration.");
+    ErrorFileLog errLog;
+    errLog.addEntry(F("CFG : Failed to save configuration."));
     return false;
   }
 
@@ -153,8 +154,8 @@ bool Config::saveFile() {
   createJson(doc);
 
 #if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
-  serializeJson(doc, EspSerial);
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
 
   serializeJson(doc, configFile);
@@ -175,14 +176,16 @@ bool Config::loadFile() {
 #endif
 
   if (!LittleFS.exists(CFG_FILENAME)) {
-    writeErrorLog("CFG : Configuration file does not exist.");
+    ErrorFileLog errLog;
+    errLog.addEntry(F("CFG : Configuration file does not exist."));
     return false;
   }
 
   File configFile = LittleFS.open(CFG_FILENAME, "r");
 
   if (!configFile) {
-    writeErrorLog("CFG : Failed to load configuration.");
+    ErrorFileLog errLog;
+    errLog.addEntry(F("CFG : Failed to load configuration."));
     return false;
   }
 
@@ -192,13 +195,14 @@ bool Config::loadFile() {
   DynamicJsonDocument doc(3000);
   DeserializationError err = deserializeJson(doc, configFile);
 #if LOG_LEVEL == 6
-  serializeJson(doc, EspSerial);
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
   configFile.close();
 
   if (err) {
-    writeErrorLog("CFG : Failed to parse configuration (json)");
+    ErrorFileLog errLog;
+    errLog.addEntry(F("CFG : Failed to parse configuration (json)"));
     return false;
   }
 
@@ -373,7 +377,8 @@ bool AdvancedConfig::saveFile() {
   File configFile = LittleFS.open(CFG_HW_FILENAME, "w");
 
   if (!configFile) {
-    writeErrorLog("CFG : Failed to write hardware configuration ");
+    ErrorFileLog errLog;
+    errLog.addEntry(F("CFG : Failed to write hardware configuration "));
     return false;
   }
 
@@ -395,8 +400,8 @@ bool AdvancedConfig::saveFile() {
   doc[PARAM_HW_IGNORE_LOW_ANGLES] = this->isIgnoreLowAnges();
 
 #if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
-  serializeJson(doc, EspSerial);
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
 
   serializeJson(doc, configFile);
@@ -424,7 +429,8 @@ bool AdvancedConfig::loadFile() {
   File configFile = LittleFS.open(CFG_HW_FILENAME, "r");
 
   if (!configFile) {
-    writeErrorLog("CFG : Failed to read hardware configuration");
+    ErrorFileLog errLog;
+    errLog.addEntry(F("CFG : Failed to read hardware configuration "));
     return false;
   }
 
@@ -434,13 +440,14 @@ bool AdvancedConfig::loadFile() {
   DynamicJsonDocument doc(512);
   DeserializationError err = deserializeJson(doc, configFile);
 #if LOG_LEVEL == 6
-  serializeJson(doc, EspSerial);
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
   configFile.close();
 
   if (err) {
-    writeErrorLog("CFG : Failed to parse hardware configuration (json)");
+    ErrorFileLog errLog;
+    errLog.addEntry(F("CFG : Failed to parse hardware configuration (json)"));
     return false;
   }
 

src/config.hpp

@@ -143,25 +143,11 @@ class Config {
   String _mDNS = "";
   String _otaURL = "";
   char _tempFormat = 'C';
-#if defined(ESP8266)
   float _voltageFactor = 1.59;
-#elif defined(ESP32C3)
-  float _voltageFactor = 1.3;
-#elif defined(ESP32S2)
-  float _voltageFactor = 0.59;
-#elif defined(ESP32LITE)
-  float _voltageFactor = 1.59;
-#else  // ESP32
-  float _voltageFactor = 1.3;
-#endif
   float _voltageConfig = 4.15;
   float _tempSensorAdjC = 0;
   int _sleepInterval = 900;
-#if defined(FLOATY)
-  bool _gyroTemp = true;
-#else
   bool _gyroTemp = false;
-#endif
   bool _storageSleep = false;
 
   // Wifi Config
@@ -217,12 +203,8 @@ class Config {
 
   const bool isGyroTemp() { return _gyroTemp; }
   void setGyroTemp(bool b) {
-#if defined(FLOATY)
-    // Floaty hardware dont have a temp sensor, uses gyro temperature
-#else
     _gyroTemp = b;
     _saveNeeded = true;
-#endif
   }
 
   const bool isStorageSleep() { return _storageSleep; }

src/gyro.cpp

@@ -30,42 +30,24 @@ MPU6050 accelgyro;
 #define GYRO_USE_INTERRUPT  // Use interrupt to detect when new sample is ready
 #define GYRO_SHOW_MINMAX    // Will calculate the min/max values when doing
                             // calibration
+// #define GYRO_CALIBRATE_STARTUP          // Will  calibrate sensor at startup
 
+//
+// Initialize the sensor chip.
+//
 bool GyroSensor::setup() {
-  int clock = 400000;
-#if defined(FLOATY)
-  pinMode(PIN_VCC, OUTPUT);
-  pinMode(PIN_GND, OUTPUT_OPEN_DRAIN);
-  digitalWrite(PIN_VCC, HIGH);
-  digitalWrite(PIN_GND, LOW);
-  delay(10);  // Wait for the pins to settle or we will fail to connect
-#else
-#endif
-  /* For testing pin config of new boards with led.
-  pinMode(PIN_SDA, OUTPUT);
-  pinMode(PIN_SCL, OUTPUT);
-  for(int i = 0, j = LOW, k = LOW; i < 100; i++) {
-
-    digitalWrite(PIN_SDA, k);
-    digitalWrite(PIN_SCL, j);
-    k = !k;
-    delay(300);
-    digitalWrite(PIN_SDA, k);
-    k = !k;
-    j = !j;
-    delay(300);
-  }*/
-
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Setting up hardware." CR));
 #endif
   Wire.begin(PIN_SDA, PIN_SCL);
-  Wire.setClock(clock);  // 400kHz I2C clock.
+  Wire.setClock(400000);  // 400kHz I2C clock. Comment this line if having
+                          // compilation difficulties
 
   uint8_t id = accelgyro.getDeviceID();
 
-  if (id != 0x34 && id != 0x38) {  // Allow both MPU6050 and MPU6500
-    writeErrorLog("GYRO: Failed to connect to gyro, is it connected?");
+  if (id != 0x34 && id != 0x38) {  // Allow both MPU6050 and MPU6000
+    ErrorFileLog errLog;
+    errLog.addEntry(F("GYRO: Failed to connect to gyro, is it connected?"));
     _sensorConnected = false;
   } else {
 #if !defined(GYRO_DISABLE_LOGGING)
@@ -87,6 +69,11 @@ bool GyroSensor::setup() {
     accelgyro.setIntDataReadyEnabled(true);
 #endif
 
+#if defined(GYRO_CALIBRATE_STARTUP)
+    // Run the calibration at start, useful for testing.
+    calibrateSensor();
+#endif
+
     // Once we have calibration values stored we just apply them from the
     // config.
     _calibrationOffset = myConfig.getGyroCalibration();
@@ -95,17 +82,19 @@ bool GyroSensor::setup() {
   return _sensorConnected;
 }
 
+//
+// Set sensor in sleep mode to conserve battery
+//
 void GyroSensor::enterSleep() {
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Setting up hardware." CR));
 #endif
-#if defined(FLOATY)
-  digitalWrite(PIN_VCC, LOW);
-#else
   accelgyro.setSleepEnabled(true);
-#endif
 }
 
+//
+// Do a number of reads to get a more stable value.
+//
 void GyroSensor::readSensor(RawGyroData &raw, const int noIterations,
                             const int delayTime) {
   RawGyroDataL average = {0, 0, 0, 0, 0, 0};
@@ -117,8 +106,7 @@ void GyroSensor::readSensor(RawGyroData &raw, const int noIterations,
 
   // Set some initial values
 #if defined(GYRO_SHOW_MINMAX)
-  RawGyroData min = {0, 0, 0};
-  RawGyroData max = {0, 0, 0};
+  RawGyroData min, max;
   accelgyro.getAcceleration(&min.ax, &min.ay, &min.az);
   min.temp = accelgyro.getTemperature();
   max = min;
@@ -192,6 +180,9 @@ void GyroSensor::readSensor(RawGyroData &raw, const int noIterations,
 #endif
 }
 
+//
+// Calcuate the angles (tilt)
+//
 float GyroSensor::calculateAngle(RawGyroData &raw) {
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Calculating the angle." CR));
@@ -219,6 +210,9 @@ float GyroSensor::calculateAngle(RawGyroData &raw) {
   return vY;
 }
 
+//
+// Check if the values are high that indicate that the sensor is moving.
+//
 bool GyroSensor::isSensorMoving(RawGyroData &raw) {
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Checking for sensor movement." CR));
@@ -236,6 +230,9 @@ bool GyroSensor::isSensorMoving(RawGyroData &raw) {
   return false;
 }
 
+//
+// Read the tilt angle from the gyro.
+//
 bool GyroSensor::read() {
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Getting new gyro position." CR));
@@ -274,6 +271,9 @@ bool GyroSensor::read() {
   return _validValue;
 }
 
+//
+// Dump the stored calibration values.
+//
 void GyroSensor::dumpCalibration() {
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Accel offset\t%d\t%d\t%d" CR), _calibrationOffset.ax,
@@ -283,6 +283,9 @@ void GyroSensor::dumpCalibration() {
 #endif
 }
 
+//
+// Update the sensor with out calculated offsets.
+//
 void GyroSensor::applyCalibration() {
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Applying calibration offsets to sensor." CR));
@@ -291,8 +294,9 @@ void GyroSensor::applyCalibration() {
   if ((_calibrationOffset.ax + _calibrationOffset.ay + _calibrationOffset.az +
        _calibrationOffset.gx + _calibrationOffset.gy + _calibrationOffset.gz) ==
       0) {
-    writeErrorLog(
-        "GYRO: No valid calibration values, please calibrate the device.");
+    ErrorFileLog errLog;
+    errLog.addEntry(
+        F("GYRO: No valid calibration values, please calibrate the device."));
     return;
   }
 
@@ -304,19 +308,22 @@ void GyroSensor::applyCalibration() {
   accelgyro.setZGyroOffset(_calibrationOffset.gz);
 }
 
+//
+// Calculate the offsets for calibration.
+//
 void GyroSensor::calibrateSensor() {
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Calibrating sensor" CR));
 #endif
   // accelgyro.PrintActiveOffsets();
-  // EspSerial.print( CR );
+  // Serial.print( CR );
 
   accelgyro.setDLPFMode(MPU6050_DLPF_BW_5);
   accelgyro.CalibrateAccel(6);  // 6 = 600 readings
   accelgyro.CalibrateGyro(6);
 
   accelgyro.PrintActiveOffsets();
-  EspSerial.print(CR);
+  Serial.print(CR);
 
   _calibrationOffset.ax = accelgyro.getXAccelOffset();
   _calibrationOffset.ay = accelgyro.getYAccelOffset();
@@ -325,10 +332,14 @@ void GyroSensor::calibrateSensor() {
   _calibrationOffset.gy = accelgyro.getYGyroOffset();
   _calibrationOffset.gz = accelgyro.getZGyroOffset();
 
+  // Save the calibrated values
   myConfig.setGyroCalibration(_calibrationOffset);
   myConfig.saveFile();
 }
 
+//
+// Calibrate the device.
+//
 void GyroSensor::debug() {
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Debug - Clock src   %d." CR),

src/helper.cpp

@@ -36,6 +36,9 @@ SOFTWARE.
 #include <tempsensor.hpp>
 #include <wifi.hpp>
 
+SerialDebug mySerial;
+BatteryVoltage myBatteryVoltage;
+
 // tcp cleanup, to avoid memory crash.
 struct tcp_pcb;
 extern struct tcp_pcb* tcp_tw_pcbs;
@@ -44,127 +47,75 @@ void tcp_cleanup() {
   while (tcp_tw_pcbs) tcp_abort(tcp_tw_pcbs);
 }
 
-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)
-  RESET_REASON r = rtc_get_reset_reason(
-      0);  // We only check cpu0 since we dont use cpu1 on the esp32
-  String rStr;
-
-  switch (r) {
-    case 0:
-      rStr = F("None");
-      break;
-    case 1:
-      rStr = F("vbat power on reset");
-      break;
-    case 3:
-      rStr = F("software reset digital core");
-      break;
-    case 4:
-      rStr = F("legacy watch dog reset digital core");
-      break;
-    case 5:
-      rStr = F("deep Sleep reset digital core");
-      break;
-    case 6:
-      rStr = F("reset by SLC module, reset digital core");
-      break;
-    case 7:
-      rStr = F("timer Group0 Watch dog reset digital core");
-      break;
-    case 8:
-      rStr = F("timer Group1 Watch dog reset digital core");
-      break;
-    case 9:
-      rStr = F("RTC Watch dog Reset digital core");
-      break;
-    case 10:
-      rStr = F("instrusion tested to reset CPU");
-      break;
-    case 11:
-      rStr = F("time Group reset CPU");
-      break;
-    case 12:
-      rStr = F("software reset CPU");
-      break;
-    case 13:
-      rStr = F("RTC Watch dog Reset CPU");
-      break;
-    case 14:
-      rStr = F("for APP CPU, reseted by PRO CPU");
-      break;
-    case 15:
-      rStr = F("reset when the vdd voltage is not stable");
-      break;
-    case 16:
-      rStr = F("RTC Watch dog reset digital core and rtc module");
-      break;
-    default:
-      rStr = F("unknown reset reason");
-      break;
-  }
-
-  Log.notice(F("HELP: Last reset cause '%s' (%d)" CR), rStr.c_str(), r);
-  // Havent found a good way to get exception cause from an 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));
-  }
-}
-
+//
+// Convert sg to plato
+//
 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;
 
@@ -182,6 +133,9 @@ 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];
@@ -190,6 +144,9 @@ void FloatHistoryLog::addEntry(float time) {
   save();
 }
 
+//
+// Save log
+//
 void FloatHistoryLog::save() {
   File runFile = LittleFS.open(_fName, "w");
   if (runFile) {
@@ -200,6 +157,9 @@ void FloatHistoryLog::save() {
   }
 }
 
+//
+// Print the heap information.
+//
 void printHeap(String prefix) {
 #if defined(ESP8266)
   Log.notice(
@@ -215,6 +175,9 @@ 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);
@@ -223,6 +186,9 @@ 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
@@ -235,70 +201,36 @@ void printBuildOptions() {
              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)
-#if defined(USE_SERIAL_PINS) && defined(ESP8266)
-  uint8_t txPin = 3;
-  EspSerial.begin(serialSpeed, SERIAL_8N1, SERIAL_TX_ONLY, txPin);
-#elif defined(ESP8266)
-  EspSerial.begin(serialSpeed);
-#elif defined(USE_SERIAL_PINS) && defined(ESP32C3)
-  EspSerial.begin(115200L, SERIAL_8N1, 20, 21);
-#elif defined(ESP32C3)
-  EspSerial.begin(115200L);
-#elif defined(USE_SERIAL_PINS) && defined(ESP32S2)
-  EspSerial.begin(115200L, SERIAL_8N1, 37, 39);
-#elif defined(ESP32S2)
-  EspSerial.begin(115200L);
-#elif defined(USE_SERIAL_PINS) && defined(ESP32LITE)
-  EspSerial.begin(serialSpeed, SERIAL_8N1, 16, 17);
-#elif defined(USE_SERIAL_PINS) && defined(ESP32)
-  EspSerial.begin(serialSpeed, SERIAL_8N1, 1, 3);
-#elif defined(ESP32)
-  EspSerial.begin(115200L);
-#endif
+  Serial.flush();
+  Serial.begin(serialSpeed);
 
-  EspSerial.println("Serial connection established");
-  EspSerial.setDebugOutput(true);
-  getLog()->begin(LOG_LEVEL, &EspSerial, true);
+  getLog()->begin(LOG_LEVEL, &Serial, true);
   getLog()->setPrefix(printTimestamp);
   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);
 }
 
-bool checkPinConnected() {
-#if defined(ESP8266)
-  pinMode(PIN_CFG1, INPUT);
-#else
-  pinMode(PIN_CFG1, INPUT_PULLDOWN);
-#endif
-  pinMode(PIN_CFG2, OUTPUT);
-  delay(5);
-  digitalWrite(PIN_CFG2, 1);
-  delay(5);
-  int i = digitalRead(PIN_CFG1);
-  digitalWrite(PIN_CFG2, 0);
-  return i == LOW ? false : true;
-}
-
-BatteryVoltage::BatteryVoltage() {
-#if defined(ESP8266)
-  pinMode(PIN_VOLT, INPUT);
-#else
-  pinMode(PIN_VOLT, INPUT_PULLDOWN);
-#endif
-}
-
+//
+// 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)
   float factor = myConfig.getVoltageFactor();  // Default value is 1.63
-  int v = analogRead(PIN_VOLT);
+  int v = analogRead(PIN_A0);
 
   // An ESP8266 has a ADC range of 0-1023 and a maximum voltage of 3.3V
   // An ESP32 has an ADC range of 0-4095 and a maximum voltage of 3.3V
@@ -319,6 +251,9 @@ void BatteryVoltage::read() {
 
 PerfLogging myPerfLogging;
 
+//
+// Clear the current cache
+//
 void PerfLogging::clear() {
   // Clear the measurements
   if (first == 0) return;
@@ -335,11 +270,17 @@ 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);
 
@@ -352,6 +293,9 @@ void PerfLogging::stop(const char* key) {
   }
 }
 
+//
+// Print the collected performance data
+//
 void PerfLogging::print() {
   PerfEntry* pe = first;
 
@@ -361,6 +305,9 @@ void PerfLogging::print() {
   }
 }
 
+//
+// Push collected performance data to influx (use influx configuration)
+//
 void PerfLogging::pushInflux() {
   if (!myConfig.isInfluxDb2Active()) return;
 
@@ -441,7 +388,7 @@ void PerfLogging::pushInflux() {
   // Send HTTP POST request
   String auth = "Token " + String(myConfig.getInfluxDb2PushToken());
   http.addHeader(F("Authorization"), auth.c_str());
-  http.setTimeout(myAdvancedConfig.getPushTimeout() * 1000);
+  http.setTimeout(myAdvancedConfig.getPushTimeout());
   int httpResponseCode = http.POST(body);
 
   if (httpResponseCode == 204) {
@@ -462,19 +409,29 @@ 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);
@@ -518,6 +475,9 @@ unsigned char h2int(char c) {
   return (0);
 }
 
+//
+// urlencode string
+//
 String urldecode(String str) {
   String encodedString;
   encodedString.reserve(str.length());

src/helper.hpp

@@ -28,24 +28,16 @@ SOFTWARE.
 #include <main.hpp>
 
 #define ERR_FILENAME "/error.log"
-#define ERR_FILENAME2 "/error2.log"
-#define ERR_FILEMAXSIZE 4000
+#define ERR_COUNT 15
 
 #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);
 
-// Force config mode
-bool checkPinConnected();
-
 // Show build options
 void printBuildOptions();
 
@@ -75,6 +67,16 @@ 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;
@@ -91,10 +93,9 @@ class FloatHistoryLog {
 
 class BatteryVoltage {
  private:
-  float _batteryLevel = 0;
+  float _batteryLevel;
 
  public:
-  BatteryVoltage();
   void read();
   float getVoltage() { return _batteryLevel; }
 };

src/main.cpp

@@ -22,8 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 #include <ble.hpp>
-#undef LOG_LEVEL_ERROR
-#undef LOG_LEVEL_INFO
 #include <calc.hpp>
 #include <config.hpp>
 #include <gyro.hpp>
@@ -35,14 +33,12 @@ SOFTWARE.
 #include <wifi.hpp>
 
 // #define FORCE_GRAVITY_MODE
-SerialDebug mySerial;
-BatteryVoltage myBatteryVoltage;
 
 // Define constats for this program
 #ifdef DEACTIVATE_SLEEPMODE
 const int interval = 1000;  // ms, time to wait between changes to output
 #else
-int interval = 200;    // ms, time to wait between changes to output
+int interval = 200;      // ms, time to wait between changes to output
 #endif
 bool sleepModeAlwaysSkip =
     false;  // Flag set in web interface to override normal behaviour
@@ -121,9 +117,10 @@ void checkSleepMode(float angle, float volt) {
     Log.notice(
         F("Main: Storage mode entered, going to sleep for maximum time." CR));
 #if defined(ESP8266)
-    ESP.deepSleep(0);  // indefinite sleep
+    ESP.deepSleep(ESP.deepSleepMax());
 #else
-    ESP.deepSleep(0);  // indefinite sleep
+#warning "Check and test the max deep sleep for esp32"
+    deepSleep(70 * 60);  // quick search on internet suggest max time is 70 min
 #endif
   }
 }
@@ -133,6 +130,14 @@ void setup() {
   LOG_PERF_START("main-setup");
   runtimeMillis = millis();
 
+#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),
@@ -152,17 +157,11 @@ void setup() {
 
   LOG_PERF_START("main-config-load");
   myConfig.checkFileSystem();
-  checkResetReason();
   myConfig.loadFile();
   myWifi.init();
   myAdvancedConfig.loadFile();
   LOG_PERF_STOP("main-config-load");
 
-  sleepModeAlwaysSkip = checkPinConnected();
-  if (sleepModeAlwaysSkip) {
-    Log.notice(F("Main: Forcing config mode since D7/D8 are connected." CR));
-  }
-
   // Setup watchdog
 #if defined(ESP8266)
   ESP.wdtDisable();
@@ -193,20 +192,18 @@ void setup() {
       break;
 
     default:
-      if (myGyro.setup()) {
+      if (!myGyro.setup()) {
+        ErrorFileLog errLog;
+        errLog.addEntry(
+            F("MAIN: Failed to initialize the gyro, is it connected?"));
+      } else {
         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();
       checkSleepMode(myGyro.getAngle(), myBatteryVoltage.getVoltage());
-      Log.notice(F("Main: Battery %F V, Gyro=%F, Run-mode=%d." CR),
-                 myBatteryVoltage.getVoltage(), myGyro.getAngle(), runMode);
 
 #if defined(ESP32)
       if (!myConfig.isWifiPushActive() && runMode == RunMode::gravityMode) {
@@ -256,8 +253,11 @@ void setup() {
       millis();  // Dont include time for wifi connection
 }
 
+//
 // Main loop that does gravity readings and push data to targets
+//
 // Return true if gravity reading was successful
+//
 bool loopReadGravity() {
   float angle = 0;
 
@@ -307,13 +307,13 @@ bool loopReadGravity() {
       pushMillis = millis();
       LOG_PERF_START("loop-push");
 
-#if defined(ESP32) && !defined(ESP32S2)
+#if defined(ESP32)
       if (myConfig.isBLEActive()) {
         BleSender ble(myConfig.getColorBLE());
         ble.sendData(convertCtoF(tempC), gravitySG);
         Log.notice(F("MAIN: Broadcast data over bluetooth." CR));
       }
-#endif  // ESP32 && !ESP32S2
+#endif
 
       if (myWifi.isConnected()) {  // no need to try if there is no wifi
                                    // connection.
@@ -331,14 +331,15 @@ bool loopReadGravity() {
     }
     return true;
   } else {
-    // Log.error(F("MAIN: No gyro value found, the device might be moving."
-    // CR));
+    Log.error(F("MAIN: No gyro value found, the device might be moving." CR));
   }
   return false;
 }
 
+//
 // Wrapper for loopGravity that only calls every 200ms so that we dont overload
 // this.
+//
 void loopGravityOnInterval() {
   if (abs((int32_t)(millis() - loopMillis)) > interval) {
     loopReadGravity();
@@ -354,6 +355,9 @@ void loopGravityOnInterval() {
 
 bool skipRunTimeLog = false;
 
+//
+// Main loop that determines if device should go to sleep
+//
 void goToSleep(int sleepInterval) {
   float volt = myBatteryVoltage.getVoltage();
   float runtime = (millis() - runtimeMillis);
@@ -381,10 +385,10 @@ void loop() {
       break;
 
     case RunMode::configurationMode:
-      myWebServerHandler.loop();
+      if (myWifi.isConnected()) myWebServerHandler.loop();
+
       myWifi.loop();
       loopGravityOnInterval();
-      delay(1);
 
       // If we switched mode, dont include this in the log.
       if (runMode != RunMode::configurationMode) skipRunTimeLog = true;

src/main.hpp

@@ -38,104 +38,26 @@ enum RunMode {
 extern RunMode runMode;
 
 #if defined(ESP8266)
-// Hardware config for ESP8266-d1, iSpindel hardware
-// ------------------------------------------------------
 #include <LittleFS.h>
 #define ESP_RESET ESP.reset
 #define PIN_SDA D3
 #define PIN_SCL D4
-#define PIN_CFG1 D8
-#define PIN_CFG2 D7
 #define PIN_DS D6
 #define PIN_LED 2
-#define PIN_VOLT PIN_A0
-#elif defined(ESP32C3)
-// Hardware config for ESP32-c3-mini, iSpindel hardware
-// ------------------------------------------------------
-#include <FS.h>
-#include <LittleFS.h>
-
-#include "esp32c3/rom/rtc.h"
-#define ESPhttpUpdate httpUpdate
-#define ESP_RESET ESP.restart
-#define ESP8266WebServer WebServer
-#if defined(JTAG_DEBUG)
-#define PIN_SDA 8
-#define PIN_SCL 9
-#warning "ESP32C3 JTAG debugging enabled, using GYRO on GPIO 8/9"
-#else
-#define PIN_SDA 7
-#define PIN_SCL 6
-#endif  // JTAG_DEBUG
-#define PIN_CFG1 A5
-#define PIN_CFG2 A4
-#define PIN_DS A3
-#define PIN_VOLT A0
-// This should be the LED_BUILTIN, but that is also connected SDA (Gyro) so we
-// cannot use both. So we point LED to pin 8 which is not used.
-#define PIN_LED 8
-#elif defined(ESP32S2)
-// Hardware config for ESP32-s2-mini, iSpindel hardware
-// ------------------------------------------------------
-#include <FS.h>
-#include <LittleFS.h>
-
-#include "esp32s2/rom/rtc.h"
-#define ESPhttpUpdate httpUpdate
-#define ESP_RESET ESP.restart
-#define ESP8266WebServer WebServer
-#define PIN_SDA A17
-#define PIN_SCL A15
-#define PIN_CFG1 A11
-#define PIN_CFG2 A10
-#define PIN_DS A8
-#define PIN_VOLT A2
-#define PIN_LED LED_BUILTIN
-#elif defined(ESP32LITE)
-// Hardware config for ESP32-lite, Floaty hardware
-// ------------------------------------------------------
-#include <FS.h>
-#include <LittleFS.h>
-
-#include "esp32/rom/rtc.h"
-#define ESPhttpUpdate httpUpdate
-#define ESP_RESET ESP.restart
-#define ESP8266WebServer WebServer
-#define PIN_SDA A17
-#define PIN_SCL A19
-#define PIN_DS A3
-#define PIN_VOLT A7
-#define PIN_CFG1 A14
-#define PIN_CFG2 A13
-#define PIN_VCC A5
-#define PIN_GND A18
-#define PIN_LED LED_BUILTIN
+// #define PIN_A0 A0
 #else  // defined (ESP32)
-// Hardware config for ESP32-d1-min, iSpindel hardware
-// ------------------------------------------------------
 #include <FS.h>
 #include <LittleFS.h>
-
-#include "esp32/rom/rtc.h"
 #define ESPhttpUpdate httpUpdate
 #define ESP_RESET ESP.restart
 #define ESP8266WebServer WebServer
-#define PIN_SDA D3
-#define PIN_SCL D4
-#define PIN_DS D6
-#define PIN_CFG1 D8
-#define PIN_CFG2 D7
-#define PIN_LED LED_BUILTIN
-#define PIN_VOLT PIN_A0
+#define PIN_SDA 17
+#define PIN_SCL 16
+#define PIN_DS 19
+#define PIN_A0 36
+#define PIN_LED 2
 #endif
 
-#if defined(USE_SERIAL_PINS) && (defined(ESP32C3) || defined(ESP32S2))
-// #define EspSerial Serial0 // We cant use Serial on newer boards since this is
-// using USBC port
-#define EspSerial \
-  Serial0  // We cant use Serial on newer boards since this is using USBC port
-#else
-#define EspSerial Serial
-#endif
+#define PIN_LED 2
 
 #endif  // SRC_MAIN_HPP_

src/pushtarget.cpp

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

src/pushtarget.hpp

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

src/resources.cpp

@@ -23,16 +23,23 @@ SOFTWARE.
  */
 #if defined(ESP8266)
 #define INCBIN_OUTPUT_SECTION ".irom.text"
+#endif
 #include <incbin.h>
 
 #include <resources.hpp>
-INCBIN(IndexHtm, "html/index.min.htm");
-INCBIN(ConfigHtm, "html/config.min.htm");
-INCBIN(CalibrationHtm, "html/calibration.min.htm");
-INCBIN(FormatHtm, "html/format.min.htm");
-INCBIN(TestHtm, "html/test.min.htm");
-INCBIN(AboutHtm, "html/about.min.htm");
-INCBIN(FirmwareHtm, "html/firmware.min.htm");
+
+#if defined(EMBED_HTML)
+// Using minify to reduce memory usage. Reducing RAM memory usage with about 7%
+INCBIN(IndexHtm, "data/index.min.htm");
+INCBIN(ConfigHtm, "data/config.min.htm");
+INCBIN(CalibrationHtm, "data/calibration.min.htm");
+INCBIN(FormatHtm, "data/format.min.htm");
+INCBIN(TestHtm, "data/test.min.htm");
+INCBIN(AboutHtm, "data/about.min.htm");
+#else
+// Minium web interface for uploading htm files
+INCBIN(UploadHtm, "data/upload.min.htm");
 #endif
+INCBIN(FirmwareHtm, "data/firmware.min.htm");
 
 // EOF

src/templating.cpp

@@ -80,6 +80,9 @@ const char mqttFormat[] PROGMEM =
     "ispindel/${mdns}/interval:${sleep-interval}|"
     "ispindel/${mdns}/RSSI:${rssi}|";
 
+//
+// Initialize the variables
+//
 void TemplatingEngine::initialize(float angle, float gravitySG,
                                   float corrGravitySG, float tempC,
                                   float runTime) {
@@ -135,46 +138,46 @@ void TemplatingEngine::initialize(float angle, float gravitySG,
 #endif
 }
 
-// the useDefaultTemplate param is there to support unit tests.
-const char* TemplatingEngine::create(TemplatingEngine::Templates idx,
-                                     bool useDefaultTemplate) {
+//
+// Create the data using defined template.
+//
+const String& 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;
   }
 
-  if (!useDefaultTemplate) {
-    File file = LittleFS.open(fname, "r");
-    if (file) {
-      char buf[file.size() + 1];
-      memset(&buf[0], 0, file.size() + 1);
-      file.readBytes(&buf[0], file.size());
-      _baseTemplate = String(&buf[0]);
-      file.close();
-      Log.notice(F("TPL : Template loaded from disk %s." CR), fname.c_str());
-    }
+  // TODO: Add code to load templates from disk if they exist.
+  File file = LittleFS.open(fname, "r");
+  if (file) {
+    char buf[file.size() + 1];
+    memset(&buf[0], 0, file.size() + 1);
+    file.readBytes(&buf[0], file.size());
+    baseTemplate = String(&buf[0]);
+    file.close();
+    Log.notice(F("TPL : Template loaded from disk %s." CR), fname.c_str());
   }
 
 #if LOG_LEVEL == 6
@@ -182,29 +185,13 @@ const char* TemplatingEngine::create(TemplatingEngine::Templates idx,
 #endif
 
   // Insert data into template.
-  transform();
-  _baseTemplate.clear();
+  transform(baseTemplate);
 
 #if LOG_LEVEL == 6
   // Log.verbose(F("TPL : Transformed '%s'." CR), baseTemplate.c_str());
 #endif
 
-  if (_output) return _output;
-
-  return "";
-}
-
-// added to support more unit test scenarios.
-const char* TemplatingEngine::create(const char* formatTemplate) {
-  _baseTemplate = String(formatTemplate);
-
-  // Insert data into template.
-  transform();
-  _baseTemplate.clear();
-
-  if (_output) return _output;
-
-  return "";
+  return baseTemplate;
 }
 
 // EOF

src/templating.hpp

@@ -75,35 +75,34 @@ class TemplatingEngine {
     String val;
   };
 
-  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, ""}};
+  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 *_output = 0;
+  char buffer[20];
+  String baseTemplate;
 
   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;
       }
     }
@@ -111,75 +110,22 @@ class TemplatingEngine {
     Log.warning(F("TPL : Key not found %s." CR), key.c_str());
   }
 
-  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();
-          }
-        }
-      }
+  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);
     }
-
-    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);
-    strncat(_output, format + k, strlen(format + 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++) {
-      EspSerial.print("Key=\'");
-      EspSerial.print(_items[i].key.c_str());
-      EspSerial.print("\', Val=\'");
-      EspSerial.print(_items[i].val.c_str());
-      EspSerial.println("\'");
+      Serial.print("Key=\'");
+      Serial.print(items[i].key.c_str());
+      Serial.print("\', Val=\'");
+      Serial.print(items[i].val.c_str());
+      Serial.println("\'");
     }
   }
 
@@ -192,18 +138,9 @@ class TemplatingEngine {
     TEMPLATE_MQTT = 4
   };
 
-  TemplatingEngine() {}
-  ~TemplatingEngine() { freeMemory(); }
-
-  void freeMemory() {
-    if (_output) free(_output);
-    _output = 0;
-  }
   void initialize(float angle, float gravitySG, float corrGravitySG,
                   float tempC, float runTime);
-  const char *create(TemplatingEngine::Templates idx,
-                     bool useDefaultTemplate = false);
-  const char *create(const char *formatTemplate);
+  const String& create(TemplatingEngine::Templates idx);
 };
 
 #endif  // SRC_TEMPLATING_HPP_

src/tempsensor.cpp

@@ -35,7 +35,15 @@ DallasTemperature mySensors(&myOneWire);
 
 TempSensor myTempSensor;
 
+//
+// Setup DS18B20 temp sensor. Doing setup is not that time consuming.
+//
 void TempSensor::setup() {
+#if defined(SIMULATE_TEMP)
+  hasSensors = true;
+  return;
+#endif
+
 #if LOG_LEVEL == 6 && !defined(TSEN_DISABLE_LOGGING)
   Log.verbose(F("TSEN: Looking for temp sensors." CR));
 #endif
@@ -58,7 +66,14 @@ void TempSensor::setup() {
 #endif
 }
 
+//
+// Retrieving value from sensor, value is in Celcius
+//
 float TempSensor::getValue(bool useGyro) {
+#if defined(SIMULATE_TEMP)
+  return 21;
+#endif
+
   if (useGyro) {
     // When using the gyro temperature only the first read value will be
     // accurate so we will use this for processing.

src/webserver.cpp

@@ -37,6 +37,9 @@ WebServerHandler myWebServerHandler;  // My wrapper class fr webserver functions
 extern bool sleepModeActive;
 extern bool sleepModeAlwaysSkip;
 
+//
+// Callback from webServer when / has been accessed.
+//
 void WebServerHandler::webHandleConfig() {
   LOG_PERF_START("webserver-api-config");
   Log.notice(F("WEB : webServer callback for /api/config(get)." CR));
@@ -87,19 +90,13 @@ void WebServerHandler::webHandleConfig() {
 
 #if defined(ESP8266)
   doc[PARAM_PLATFORM] = "esp8266";
-#elif defined(ESP32C3)
-  doc[PARAM_PLATFORM] = "esp32c3";
-#elif defined(ESP32S2)
-  doc[PARAM_PLATFORM] = "esp32s2";
-#elif defined(ESP32LITE)
-  doc[PARAM_PLATFORM] = "esp32lite";
-#else  // esp32 mini
+#else
   doc[PARAM_PLATFORM] = "esp32";
 #endif
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
-  serializeJson(doc, EspSerial);
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
 
   String out;
@@ -110,64 +107,179 @@ void WebServerHandler::webHandleConfig() {
   LOG_PERF_STOP("webserver-api-config");
 }
 
+//
+// Callback from webServer when / has been accessed.
+//
+void WebServerHandler::webHandleUpload() {
+  LOG_PERF_START("webserver-api-upload");
+  Log.notice(F("WEB : webServer callback for /api/upload(get)." CR));
+  DynamicJsonDocument doc(300);
+
+  doc["index"] = checkHtmlFile(WebServerHandler::HTML_INDEX);
+  doc["config"] = checkHtmlFile(WebServerHandler::HTML_CONFIG);
+  doc["calibration"] = checkHtmlFile(WebServerHandler::HTML_CALIBRATION);
+  doc["format"] = checkHtmlFile(WebServerHandler::HTML_FORMAT);
+  doc["about"] = checkHtmlFile(WebServerHandler::HTML_ABOUT);
+  doc["test"] = checkHtmlFile(WebServerHandler::HTML_TEST);
+
+#if defined(ESP8266)
+  JsonArray files = doc.createNestedArray(PARAM_FILES);
+
+  // Show files in the filessytem at startup
+  FSInfo fs;
+  LittleFS.info(fs);
+  Dir dir = LittleFS.openDir("/");
+  while (dir.next()) {
+    JsonObject obj = files.createNestedObject();
+    obj[PARAM_FILE_NAME] = dir.fileName();
+    obj[PARAM_FILE_SIZE] = dir.fileSize();
+  }
+#else  // defined(ESP32)
+  JsonArray files = doc.createNestedArray(PARAM_FILES);
+
+  File dir = LittleFS.open("/");
+
+  while (true) {
+    File entry = dir.openNextFile();
+    if (!entry) {
+      // no more files
+      break;
+    }
+
+    if (!entry.isDirectory()) {
+      JsonObject obj = files.createNestedObject();
+      obj[PARAM_FILE_NAME] = entry.name();
+      obj[PARAM_FILE_SIZE] = entry.size();
+    }
+    entry.close();
+  }
+  dir.close();
+#endif
+
+#if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
+  serializeJson(doc, Serial);
+  Serial.print(CR);
+#endif
+
+  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));
   HTTPUpload& upload = _server->upload();
   String f = upload.filename;
+  bool validFilename = false;
+  bool firmware = false;
 
-#if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
-  Log.verbose(F("WEB : webServer callback for /api/upload, receiving file %s, "
-                "%d(%d)." CR),
-              f.c_str(), upload.currentSize, upload.totalSize);
-#endif
-
-  // Handle firmware update, hardcode since function return wrong value.
-  // (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
-  uint32_t maxSketchSpace = MAX_SKETCH_SPACE;
-
-  if (upload.status == UPLOAD_FILE_START) {
-    _uploadReturn = 200;
-    Log.notice(F("WEB : Start firmware upload, max sketch size %d kb." CR),
-               maxSketchSpace / 1024);
-
-    if (!Update.begin(maxSketchSpace, U_FLASH, PIN_LED)) {
-      writeErrorLog("WEB : Not enough space to store for this firmware.");
-      _uploadReturn = 500;
-    }
-  } else if (upload.status == UPLOAD_FILE_WRITE) {
-    Log.notice(F("WEB : Writing firmware upload %d (%d)." CR), upload.totalSize,
-               maxSketchSpace);
-
-    if (upload.totalSize > maxSketchSpace) {
-      Log.error(F("WEB : Firmware file is to large." CR));
-      _uploadReturn = 500;
-    } else if (Update.write(upload.buf, upload.currentSize) !=
-               upload.currentSize) {
-      Log.warning(F("WEB : Firmware write was unsuccessful." CR));
-      _uploadReturn = 500;
-    }
-  } else if (upload.status == UPLOAD_FILE_END) {
-    Log.notice(F("WEB : Finish firmware upload." CR));
-    if (Update.end(true)) {
-      _server->send(200);
-      delay(500);
-      ESP_RESET();
-    } else {
-      writeErrorLog("WEB : Failed to finish firmware flashing error=%d",
-                    Update.getError());
-      _uploadReturn = 500;
-    }
-  } else {
-    Update.end();
-    Log.notice(F("WEB : Firmware flashing aborted." CR));
-    _uploadReturn = 500;
+  if (f.equalsIgnoreCase("index.min.htm") ||
+      f.equalsIgnoreCase("calibration.min.htm") ||
+      f.equalsIgnoreCase("config.min.htm") ||
+      f.equalsIgnoreCase("format.min.htm") ||
+      f.equalsIgnoreCase("test.min.htm") ||
+      f.equalsIgnoreCase("about.min.htm")) {
+    validFilename = true;
+  }
+
+  if (f.endsWith(".bin")) {
+    validFilename = true;
+    firmware = true;
+  }
+
+#if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
+  Log.verbose(
+      F("WEB : webServer callback for /api/upload, receiving file %s, %d(%d) "
+        "valid=%s, firmware=%s." CR),
+      f.c_str(), upload.currentSize, upload.totalSize,
+      validFilename ? "yes" : "no", firmware ? "yes" : "no");
+#endif
+
+  if (firmware) {
+    // Handle firmware update, hardcode since function return wrong value.
+    // (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+    uint32_t maxSketchSpace = MAX_SKETCH_SPACE;
+
+    if (upload.status == UPLOAD_FILE_START) {
+      _uploadReturn = 200;
+      Log.notice(F("WEB : Start firmware upload, max sketch size %d kb." CR),
+                 maxSketchSpace / 1024);
+
+      if (!Update.begin(maxSketchSpace, U_FLASH, PIN_LED)) {
+        ErrorFileLog errLog;
+        errLog.addEntry(
+            F("WEB : Not enough space to store for this firmware."));
+        _uploadReturn = 500;
+      }
+    } else if (upload.status == UPLOAD_FILE_WRITE) {
+      Log.notice(F("WEB : Writing firmware upload %d (%d)." CR),
+                 upload.totalSize, maxSketchSpace);
+
+      if (upload.totalSize > maxSketchSpace) {
+        Log.error(F("WEB : Firmware file is to large." CR));
+        _uploadReturn = 500;
+      } else if (Update.write(upload.buf, upload.currentSize) !=
+                 upload.currentSize) {
+        Log.warning(F("WEB : Firmware write was unsuccessful." CR));
+        _uploadReturn = 500;
+      }
+    } else if (upload.status == UPLOAD_FILE_END) {
+      Log.notice(F("WEB : Finish firmware upload." CR));
+      if (Update.end(true)) {
+        _server->send(200);
+        delay(500);
+        ESP_RESET();
+      } else {
+        ErrorFileLog errLog;
+        errLog.addEntry("WEB : Failed to finish firmware flashing error=" +
+                        String(Update.getError()));
+        _uploadReturn = 500;
+      }
+    } else {
+      Update.end();
+      Log.notice(F("WEB : Firmware flashing aborted." CR));
+      _uploadReturn = 500;
+    }
+
+    delay(0);
+
+  } else {
+    // Handle HTML file upload
+    if (upload.status == UPLOAD_FILE_START) {
+      _uploadReturn = 200;
+      Log.notice(F("WEB : Start html upload." CR));
+
+      if (validFilename) _uploadFile = LittleFS.open(f, "w");
+    } else if (upload.status == UPLOAD_FILE_WRITE) {
+      Log.notice(F("WEB : Writing html upload." CR));
+      if (_uploadFile) _uploadFile.write(upload.buf, upload.currentSize);
+    } else if (upload.status == UPLOAD_FILE_END) {
+      Log.notice(F("WEB : Finish html upload." CR));
+      if (_uploadFile) {
+        _uploadFile.close();
+        Log.notice(F("WEB : Html file uploaded %d bytes." CR),
+                   upload.totalSize);
+      }
+      _server->sendHeader("Location", "/");
+      _server->send(303);
+    } else {
+      _server->send(500, "text/plain", "Couldn't upload html file.");
+    }
   }
 
-  delay(0);
   LOG_PERF_STOP("webserver-api-upload-file");
 }
 
+//
+// Callback from webServer when / has been accessed.
+//
 void WebServerHandler::webHandleCalibrate() {
   LOG_PERF_START("webserver-api-calibrate");
   String id = _server->arg(PARAM_ID);
@@ -185,6 +297,9 @@ 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));
@@ -201,7 +316,6 @@ void WebServerHandler::webHandleFactoryDefaults() {
     LittleFS.remove(TPL_FNAME_INFLUXDB);
     LittleFS.remove(TPL_FNAME_MQTT);
     LittleFS.end();
-    Log.notice(F("WEB : Deleted files in filesystem, rebooting." CR));
     delay(500);
     ESP_RESET();
   } else {
@@ -209,27 +323,16 @@ void WebServerHandler::webHandleFactoryDefaults() {
   }
 }
 
-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.");
-  }
-}
-
+//
+// Callback from webServer when / has been accessed.
+//
 void WebServerHandler::webHandleStatus() {
   LOG_PERF_START("webserver-api-status");
   Log.notice(F("WEB : webServer callback for /api/status(get)." CR));
 
   DynamicJsonDocument doc(500);
 
-  double angle = 0;  // Indicate we have no valid gyro value
+  double angle = 0;
 
   if (myGyro.hasValue()) angle = myGyro.getAngle();
 
@@ -237,10 +340,7 @@ void WebServerHandler::webHandleStatus() {
   double gravity = calculateGravity(angle, tempC);
 
   doc[PARAM_ID] = myConfig.getID();
-  doc[PARAM_ANGLE] = myGyro.isConnected()
-                         ? reduceFloatPrecision(angle)
-                         : -1;  // Indicate that we have no connection to gyro
-
+  doc[PARAM_ANGLE] = reduceFloatPrecision(angle);
   if (myConfig.isGravityTempAdj()) {
     gravity = gravityTemperatureCorrectionC(
         gravity, tempC, myAdvancedConfig.getDefaultCalibrationTemp());
@@ -272,19 +372,13 @@ void WebServerHandler::webHandleStatus() {
 
 #if defined(ESP8266)
   doc[PARAM_PLATFORM] = "esp8266";
-#elif defined(ESP32C3)
-  doc[PARAM_PLATFORM] = "esp32c3";
-#elif defined(ESP32S2)
-  doc[PARAM_PLATFORM] = "esp32s2";
-#elif defined(ESP32LITE)
-  doc[PARAM_PLATFORM] = "esp32lite";
-#else  // esp32 mini
+#else
   doc[PARAM_PLATFORM] = "esp32";
 #endif
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
-  serializeJson(doc, EspSerial);
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
 
   String out;
@@ -295,6 +389,9 @@ void WebServerHandler::webHandleStatus() {
   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));
@@ -315,6 +412,9 @@ 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);
@@ -340,6 +440,9 @@ void WebServerHandler::webHandleStatusSleepmode() {
   LOG_PERF_STOP("webserver-api-sleepmode");
 }
 
+//
+// Update device settings.
+//
 void WebServerHandler::webHandleConfigDevice() {
   LOG_PERF_START("webserver-api-config-device");
   String id = _server->arg(PARAM_ID);
@@ -369,6 +472,9 @@ void WebServerHandler::webHandleConfigDevice() {
   LOG_PERF_STOP("webserver-api-config-device");
 }
 
+//
+// Update push settings.
+//
 void WebServerHandler::webHandleConfigPush() {
   LOG_PERF_START("webserver-api-config-push");
   String id = _server->arg(PARAM_ID);
@@ -430,6 +536,9 @@ void WebServerHandler::webHandleConfigPush() {
   LOG_PERF_STOP("webserver-api-config-push");
 }
 
+//
+// Get string with all received arguments. Used for debugging only.
+//
 String WebServerHandler::getRequestArguments() {
   String debug;
 
@@ -446,6 +555,9 @@ String WebServerHandler::getRequestArguments() {
   return debug;
 }
 
+//
+// Update gravity settings.
+//
 void WebServerHandler::webHandleConfigGravity() {
   LOG_PERF_START("webserver-api-config-gravity");
   String id = _server->arg(PARAM_ID);
@@ -480,6 +592,9 @@ void WebServerHandler::webHandleConfigGravity() {
   LOG_PERF_STOP("webserver-api-config-gravity");
 }
 
+//
+// Update hardware settings.
+//
 void WebServerHandler::webHandleConfigHardware() {
   LOG_PERF_START("webserver-api-config-hardware");
   String id = _server->arg(PARAM_ID);
@@ -531,6 +646,9 @@ void WebServerHandler::webHandleConfigHardware() {
   LOG_PERF_STOP("webserver-api-config-hardware");
 }
 
+//
+// Update advanced settings.
+//
 void WebServerHandler::webHandleConfigAdvancedWrite() {
   LOG_PERF_START("webserver-api-config-advanced");
   String id = _server->arg(PARAM_ID);
@@ -606,6 +724,9 @@ void WebServerHandler::webHandleConfigAdvancedWrite() {
   LOG_PERF_STOP("webserver-api-config-advanced");
 }
 
+//
+// Read advanced settings
+//
 void WebServerHandler::webHandleConfigAdvancedRead() {
   LOG_PERF_START("webserver-api-config-advanced");
   Log.notice(F("WEB : webServer callback for /api/config/advanced(get)." CR));
@@ -634,8 +755,8 @@ void WebServerHandler::webHandleConfigAdvancedRead() {
   doc[PARAM_HW_IGNORE_LOW_ANGLES] = myAdvancedConfig.isIgnoreLowAnges();
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
-  serializeJson(doc, EspSerial);
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
 
   String out;
@@ -646,6 +767,9 @@ void WebServerHandler::webHandleConfigAdvancedRead() {
   LOG_PERF_STOP("webserver-api-config-advanced");
 }
 
+//
+// Callback from webServer when / has been accessed.
+//
 void WebServerHandler::webHandleFormulaRead() {
   LOG_PERF_START("webserver-api-formula-read");
   Log.notice(F("WEB : webServer callback for /api/formula(get)." CR));
@@ -717,8 +841,8 @@ void WebServerHandler::webHandleFormulaRead() {
   }
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
-  serializeJson(doc, EspSerial);
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
 
   String out;
@@ -729,6 +853,9 @@ void WebServerHandler::webHandleFormulaRead() {
   LOG_PERF_STOP("webserver-api-formula-read");
 }
 
+//
+// Update format template
+//
 void WebServerHandler::webHandleConfigFormatWrite() {
   LOG_PERF_START("webserver-api-config-format-write");
   String id = _server->arg(PARAM_ID);
@@ -765,13 +892,17 @@ void WebServerHandler::webHandleConfigFormatWrite() {
     _server->sendHeader("Location", "/format.htm", true);
     _server->send(302, "text/plain", "Format updated");
   } else {
-    writeErrorLog("WEB : Unable to store format file");
+    ErrorFileLog errLog;
+    errLog.addEntry(F("WEB : Unable to store format file"));
     _server->send(400, "text/plain", "Unable to store format in file.");
   }
 
   LOG_PERF_STOP("webserver-api-config-format-write");
 }
 
+//
+// Get format with real data
+//
 void WebServerHandler::webHandleTestPush() {
   LOG_PERF_START("webserver-api-test-push");
   String id = _server->arg(PARAM_ID);
@@ -816,11 +947,10 @@ void WebServerHandler::webHandleTestPush() {
     push.sendInfluxDb2(engine, myConfig.isInfluxSSL());
     enabled = true;
   } else if (!type.compareTo(PARAM_FORMAT_MQTT) && myConfig.isMqttActive()) {
-    push.sendMqtt(engine, myConfig.isMqttSSL(), false);
+    push.sendMqtt(engine, myConfig.isMqttSSL());
     enabled = true;
   }
 
-  engine.freeMemory();
   DynamicJsonDocument doc(100);
   doc[PARAM_PUSH_ENABLED] = enabled;
   doc[PARAM_PUSH_SUCCESS] = push.getLastSuccess();
@@ -832,14 +962,18 @@ void WebServerHandler::webHandleTestPush() {
   doc.clear();
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
-  serializeJson(doc, EspSerial);
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
 
   _server->send(200, "application/json", out.c_str());
   LOG_PERF_STOP("webserver-api-test-push");
 }
 
+//
+// Write file to disk, if there is no data then delete the current file (if it
+// exists) = reset to default.
+//
 bool WebServerHandler::writeFile(String fname, String data) {
   if (data.length()) {
     data = urldecode(data);
@@ -865,6 +999,9 @@ bool WebServerHandler::writeFile(String fname, String data) {
   return false;
 }
 
+//
+// Read file from disk
+//
 String WebServerHandler::readFile(String fname) {
   File file = LittleFS.open(fname, "r");
   if (file) {
@@ -878,60 +1015,63 @@ String WebServerHandler::readFile(String fname) {
   return "";
 }
 
+//
+// Get format templates
+//
 void WebServerHandler::webHandleConfigFormatRead() {
   LOG_PERF_START("webserver-api-config-format-read");
   Log.notice(F("WEB : webServer callback for /api/config/formula(get)." CR));
 
-  String out;
-  out.reserve(7000);
-  out += "{\"id\":\"" + String(myConfig.getID()) + "\",";
+  DynamicJsonDocument doc(5000);
+
+  doc[PARAM_ID] = myConfig.getID();
 
   String s = readFile(TPL_FNAME_HTTP1);
-  out += "\"" + String(PARAM_FORMAT_HTTP1) + "\":\"";
   if (s.length())
-    out += urlencode(s);
+    doc[PARAM_FORMAT_HTTP1] = urlencode(s);
   else
-    out += urlencode(String(&iSpindleFormat[0]));
+    doc[PARAM_FORMAT_HTTP1] = urlencode(String(&iSpindleFormat[0]));
 
   s = readFile(TPL_FNAME_HTTP2);
-  out += "\",\"" + String(PARAM_FORMAT_HTTP2) + "\":\"";
   if (s.length())
-    out += urlencode(s);
+    doc[PARAM_FORMAT_HTTP2] = urlencode(s);
   else
-    out += urlencode(String(&iSpindleFormat[0]));
+    doc[PARAM_FORMAT_HTTP2] = urlencode(String(&iSpindleFormat[0]));
 
   s = readFile(TPL_FNAME_HTTP3);
-  out += "\",\"" + String(PARAM_FORMAT_HTTP3) + "\":\"";
   if (s.length())
-    out += urlencode(s);
+    doc[PARAM_FORMAT_HTTP3] = urlencode(s);
   else
-    out += urlencode(String(&iHttpGetFormat[0]));
+    doc[PARAM_FORMAT_HTTP3] = urlencode(String(&iHttpGetFormat[0]));
 
   s = readFile(TPL_FNAME_INFLUXDB);
-  out += "\",\"" + String(PARAM_FORMAT_INFLUXDB) + "\":\"";
   if (s.length())
-    out += urlencode(s);
+    doc[PARAM_FORMAT_INFLUXDB] = urlencode(s);
   else
-    out += urlencode(String(&influxDbFormat[0]));
+    doc[PARAM_FORMAT_INFLUXDB] = urlencode(String(&influxDbFormat[0]));
 
   s = readFile(TPL_FNAME_MQTT);
-  out += "\",\"" + String(PARAM_FORMAT_MQTT) + "\":\"";
   if (s.length())
-    out += urlencode(s);
+    doc[PARAM_FORMAT_MQTT] = urlencode(s);
   else
-    out += urlencode(String(&mqttFormat[0]));
-
-  out += "\"}";
+    doc[PARAM_FORMAT_MQTT] = urlencode(String(&mqttFormat[0]));
 
 #if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
-  EspSerial.print(out.c_str());
-  EspSerial.print(CR);
+  serializeJson(doc, Serial);
+  Serial.print(CR);
 #endif
 
+  String out;
+  out.reserve(3000);
+  serializeJson(doc, out);
+  doc.clear();
   _server->send(200, "application/json", out.c_str());
   LOG_PERF_STOP("webserver-api-config-format-read");
 }
 
+//
+// Update hardware settings.
+//
 void WebServerHandler::webHandleFormulaWrite() {
   LOG_PERF_START("webserver-api-formula-write");
   String id = _server->arg(PARAM_ID);
@@ -1024,14 +1164,62 @@ void WebServerHandler::webHandleFormulaWrite() {
   LOG_PERF_STOP("webserver-api-formula-write");
 }
 
+//
+// Helper function to check if files exist on file system.
+//
+const char* WebServerHandler::getHtmlFileName(HtmlFile item) {
+  Log.notice(F("WEB : Looking up filename for %d." CR), item);
+
+  switch (item) {
+    case HtmlFile::HTML_INDEX:
+      return "index.min.htm";
+    case HtmlFile::HTML_CONFIG:
+      return "config.min.htm";
+    case HtmlFile::HTML_CALIBRATION:
+      return "calibration.min.htm";
+    case HtmlFile::HTML_FORMAT:
+      return "format.min.htm";
+    case HtmlFile::HTML_ABOUT:
+      return "about.min.htm";
+    case HtmlFile::HTML_TEST:
+      return "test.min.htm";
+  }
+
+  return "";
+}
+
+//
+// Helper function to check if files exist on file system.
+//
+bool WebServerHandler::checkHtmlFile(HtmlFile item) {
+  const char* fn = getHtmlFileName(item);
+
+#if LOG_LEVEL == 6 && !defined(WEB_DISABLE_LOGGING)
+  Log.verbose(F("WEB : Checking for file %s." CR), fn);
+#endif
+
+  // TODO: We might need to add more checks here like zero file size etc. But
+  // for now we only check if the file exist.
+
+  return LittleFS.exists(fn);
+}
+
+//
+// Handler for page not found
+//
 void WebServerHandler::webHandlePageNotFound() {
   Log.error(F("WEB : URL not found %s received." CR), _server->uri().c_str());
   _server->send(404, "text/plain", F("URL not found"));
 }
 
+//
+// Setup the Web Server callbacks and start it
+//
 bool WebServerHandler::setupWebServer() {
   Log.notice(F("WEB : Configuring web server." CR));
+
   _server = new ESP8266WebServer();
+
   MDNS.begin(myConfig.getMDNS());
   MDNS.addService("http", "tcp", 80);
 
@@ -1050,7 +1238,7 @@ bool WebServerHandler::setupWebServer() {
       LittleFS.remove(dir.fileName().c_str());
     }
   }
-#else  // ESP32
+#else  // defined( ESP32 )
   File root = LittleFS.open("/");
   File f = root.openNextFile();
   while (f) {
@@ -1067,7 +1255,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",
               std::bind(&WebServerHandler::webReturnIndexHtm, this));
@@ -1081,29 +1269,61 @@ bool WebServerHandler::setupWebServer() {
               std::bind(&WebServerHandler::webReturnAboutHtm, this));
   _server->on("/test.htm",
               std::bind(&WebServerHandler::webReturnTestHtm, this));
+#else
+  // Check if the html files exist, if so serve them, else show the static
+  // upload page.
+  if (checkHtmlFile(HTML_INDEX) && checkHtmlFile(HTML_CONFIG) &&
+      checkHtmlFile(HTML_CALIBRATION) && checkHtmlFile(HTML_FORMAT) &&
+      checkHtmlFile(HTML_ABOUT) && checkHtmlFile(HTML_TEST)) {
+    Log.notice(F("WEB : All html files exist, starting in normal mode." CR));
+
+    _server->serveStatic("/", LittleFS, "/index.min.htm");
+    _server->serveStatic("/index.htm", LittleFS, "/index.min.htm");
+    _server->serveStatic("/config.htm", LittleFS, "/config.min.htm");
+    _server->serveStatic("/about.htm", LittleFS, "/about.min.htm");
+    _server->serveStatic("/test.htm", LittleFS, "/test.min.htm");
+    _server->serveStatic("/calibration.htm", LittleFS, "/calibration.min.htm");
+    _server->serveStatic("/format.htm", LittleFS, "/format.min.htm");
+
+    // Also add the static upload view in case we we have issues that needs to
+    // be fixed.
+    _server->on("/upload.htm",
+                std::bind(&WebServerHandler::webReturnUploadHtm, this));
+  } else {
+    Log.error(F("WEB : Missing html files, starting with upload UI." CR));
+    _server->on("/", std::bind(&WebServerHandler::webReturnUploadHtm, this));
+  }
+#endif
   _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/clearlog", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleLogClear, this));
-  _server->on("/api/config", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleConfig, this));
+  _server->on(
+      "/api/config", HTTP_GET,
+      std::bind(&WebServerHandler::webHandleConfig, this));  // Get config.json
   _server->on("/api/formula", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleFormulaRead, this));
+              std::bind(&WebServerHandler::webHandleFormulaRead,
+                        this));  // Get formula.json (calibration page)
   _server->on("/api/formula", HTTP_POST,
-              std::bind(&WebServerHandler::webHandleFormulaWrite, this));
+              std::bind(&WebServerHandler::webHandleFormulaWrite,
+                        this));  // Get formula.json (calibration page)
   _server->on("/api/calibrate", HTTP_POST,
-              std::bind(&WebServerHandler::webHandleCalibrate, this));
+              std::bind(&WebServerHandler::webHandleCalibrate,
+                        this));  // Run calibration routine (param id)
   _server->on("/api/factory", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleFactoryDefaults, this));
+              std::bind(&WebServerHandler::webHandleFactoryDefaults,
+                        this));  // Reset the device
   _server->on("/api/status", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleStatus, this));
+              std::bind(&WebServerHandler::webHandleStatus,
+                        this));  // Get the status.json
   _server->on("/api/clearwifi", HTTP_GET,
-              std::bind(&WebServerHandler::webHandleClearWIFI, this));
+              std::bind(&WebServerHandler::webHandleClearWIFI,
+                        this));  // Clear wifi settings
+  _server->on(
+      "/api/upload", HTTP_GET,
+      std::bind(&WebServerHandler::webHandleUpload, this));  // Get upload.json
 
   _server->on("/api/upload", HTTP_POST,
               std::bind(&WebServerHandler::webReturnOK, this),
@@ -1147,6 +1367,9 @@ bool WebServerHandler::setupWebServer() {
   return true;
 }
 
+//
+// called from main loop
+//
 void WebServerHandler::loop() {
 #if defined(ESP8266)
   MDNS.update();

src/webserver.hpp

@@ -29,42 +29,26 @@ SOFTWARE.
 #include <ESP8266WiFi.h>
 #include <ESP8266mDNS.h>
 #define MAX_SKETCH_SPACE 1044464
-#else
+#else  // defined (ESP32)
 #include <ESPmDNS.h>
 #include <Update.h>
 #include <WebServer.h>
 #include <WiFi.h>
 #define MAX_SKETCH_SPACE 1835008
 #endif
-
-#if defined(ESP8266)
 #include <incbin.h>
+
+#if defined(EMBED_HTML)
 INCBIN_EXTERN(IndexHtm);
 INCBIN_EXTERN(ConfigHtm);
 INCBIN_EXTERN(CalibrationHtm);
 INCBIN_EXTERN(FormatHtm);
 INCBIN_EXTERN(TestHtm);
 INCBIN_EXTERN(AboutHtm);
-INCBIN_EXTERN(FirmwareHtm);
-#else  // ESP32
-extern const uint8_t indexHtmStart[] asm("_binary_html_index_min_htm_start");
-extern const uint8_t indexHtmEnd[] asm("_binary_html_index_min_htm_end");
-extern const uint8_t configHtmStart[] asm("_binary_html_config_min_htm_start");
-extern const uint8_t configHtmEnd[] asm("_binary_html_config_min_htm_end");
-extern const uint8_t calibrationHtmStart[] asm(
-    "_binary_html_calibration_min_htm_start");
-extern const uint8_t calibrationHtmEnd[] asm(
-    "_binary_html_calibration_min_htm_end");
-extern const uint8_t formatHtmStart[] asm("_binary_html_format_min_htm_start");
-extern const uint8_t formatHtmEnd[] asm("_binary_html_format_min_htm_end");
-extern const uint8_t testHtmStart[] asm("_binary_html_test_min_htm_start");
-extern const uint8_t testHtmEnd[] asm("_binary_html_test_min_htm_end");
-extern const uint8_t aboutHtmStart[] asm("_binary_html_about_min_htm_start");
-extern const uint8_t aboutHtmEnd[] asm("_binary_html_about_min_htm_end");
-extern const uint8_t firmwareHtmStart[] asm(
-    "_binary_html_firmware_min_htm_start");
-extern const uint8_t firmwareHtmEnd[] asm("_binary_html_firmware_min_htm_end");
+#else
+INCBIN_EXTERN(UploadHtm);
 #endif
+INCBIN_EXTERN(FirmwareHtm);
 
 class WebServerHandler {
  private:
@@ -91,7 +75,7 @@ class WebServerHandler {
   void webHandleFactoryDefaults();
   void webHandleCalibrate();
   void webHandleUploadFile();
-  void webHandleLogClear();
+  void webHandleUpload();
   void webHandlePageNotFound();
 
   String readFile(String fname);
@@ -101,7 +85,7 @@ class WebServerHandler {
 
   // Inline functions.
   void webReturnOK() { _server->send(_uploadReturn); }
-#if defined(ESP8266)
+#if defined(EMBED_HTML)
   void webReturnIndexHtm() {
     _server->send_P(200, "text/html", (const char*)gIndexHtmData,
                     gIndexHtmSize);
@@ -125,46 +109,31 @@ class WebServerHandler {
   void webReturnTestHtm() {
     _server->send_P(200, "text/html", (const char*)gTestHtmData, gTestHtmSize);
   }
+#else
+  void webReturnUploadHtm() {
+    _server->send_P(200, "text/html", (const char*)gUploadHtmData,
+                    gUploadHtmSize);
+  }
+#endif
   void webReturnFirmwareHtm() {
     _server->send_P(200, "text/html", (const char*)gFirmwareHtmData,
                     gFirmwareHtmSize);
   }
-#else  // ESP32
-  void webReturnIndexHtm() {
-    _server->send_P(200, "text/html", (const char*)indexHtmStart,
-                    strlen(reinterpret_cast<const char*>(&indexHtmStart[0])));
-  }
-  void webReturnConfigHtm() {
-    _server->send_P(200, "text/html", (const char*)configHtmStart,
-                    strlen(reinterpret_cast<const char*>(&configHtmStart[0])));
-  }
-  void webReturnCalibrationHtm() {
-    _server->send_P(
-        200, "text/html", (const char*)calibrationHtmStart,
-        strlen(reinterpret_cast<const char*>(&calibrationHtmStart[0])));
-  }
-  void webReturnFormatHtm() {
-    _server->send_P(200, "text/html", (const char*)formatHtmStart,
-                    strlen(reinterpret_cast<const char*>(&formatHtmStart[0])));
-  }
-  void webReturnAboutHtm() {
-    _server->send_P(200, "text/html", (const char*)aboutHtmStart,
-                    strlen(reinterpret_cast<const char*>(&aboutHtmStart[0])));
-  }
-  void webReturnTestHtm() {
-    _server->send_P(200, "text/html", (const char*)testHtmStart,
-                    strlen(reinterpret_cast<const char*>(&testHtmStart[0])));
-  }
-  void webReturnFirmwareHtm() {
-    _server->send_P(
-        200, "text/html", (const char*)firmwareHtmStart,
-        strlen(reinterpret_cast<const char*>(&firmwareHtmStart[0])));
-  }
-#endif
 
  public:
+  enum HtmlFile {
+    HTML_INDEX = 0,
+    HTML_CONFIG = 1,
+    HTML_ABOUT = 2,
+    HTML_CALIBRATION = 3,
+    HTML_FORMAT = 4,
+    HTML_TEST = 5
+  };
+
   bool setupWebServer();
   void loop();
+  bool checkHtmlFile(HtmlFile item);
+  const char* getHtmlFileName(HtmlFile item);
 };
 
 // Global instance created

src/wifi.cpp

@@ -30,6 +30,7 @@ SOFTWARE.
 #include <WiFiClient.h>
 #include <WiFiClientSecure.h>
 #endif
+#include <incbin.h>
 
 #include <config.hpp>
 #include <main.hpp>
@@ -58,10 +59,16 @@ WifiConnection myWifi;
 const char *userSSID = USER_SSID;
 const char *userPWD = USER_SSID_PWD;
 
+//
+// Initialize
+//
 void WifiConnection::init() {
   myDRD = new DoubleResetDetector(DRD_TIMEOUT, DRD_ADDRESS);
 }
 
+//
+// Check if we have a valid wifi configuration
+//
 bool WifiConnection::hasConfig() {
   if (strlen(myConfig.getWifiSSID(0))) return true;
   if (strlen(userSSID)) return true;
@@ -69,37 +76,49 @@ bool WifiConnection::hasConfig() {
     // Check if there are stored WIFI Settings we can use.
 #if defined(ESP8266)
   String ssid = WiFi.SSID();
-  String pwd = WiFi.psk();
-#else
-  ESP_WiFiManager wifiMgr;
-  String ssid = wifiMgr.WiFi_SSID();
-  String pwd = wifiMgr.WiFi_Pass();
-#endif
   if (ssid.length()) {
-    Log.notice(F("WIFI: Found stored credentials." CR));
+    Log.notice(F("WIFI: Found credentials in EEPORM." CR));
     myConfig.setWifiSSID(ssid, 0);
 
-    if (pwd.length()) myConfig.setWifiPass(pwd, 0);
+    if (WiFi.psk().length()) myConfig.setWifiPass(WiFi.psk(), 0);
 
     myConfig.saveFile();
     return true;
   }
+#else  // defined( ESP32 )
+#warning "Cant read SSID property on ESP32 until a connection has been made!"
+#endif
 
   return false;
 }
 
+//
+// Check if the wifi is connected
+//
 bool WifiConnection::isConnected() { return WiFi.status() == WL_CONNECTED; }
 
+//
+// Get the IP adress
+//
 String WifiConnection::getIPAddress() { return WiFi.localIP().toString(); }
 
+//
+// Additional method to detect double reset.
+//
 bool WifiConnection::isDoubleResetDetected() {
   if (strlen(userSSID))
     return false;  // Ignore this if we have hardcoded settings.
   return myDRD->detectDoubleReset();
 }
 
+//
+// Stop double reset detection
+//
 void WifiConnection::stopDoubleReset() { myDRD->stop(); }
 
+//
+// Start the wifi manager
+//
 void WifiConnection::startPortal() {
   Log.notice(F("WIFI: Starting Wifi config portal." CR));
 
@@ -118,11 +137,6 @@ void WifiConnection::startPortal() {
   ESP_WMParameter deviceName(mdns.c_str());
   myWifiManager->addParameter(&deviceName);
 
-#if defined(ESP32C3) && defined(REDUCE_WIFI_POWER)
-  Log.notice(F("WIFI: Reducing wifi power for c3 chip." CR));
-  WiFi.setTxPower(WIFI_POWER_8_5dBm);  // Required for ESP32C3 Mini
-#endif
-
   myWifiManager->startConfigPortal(WIFI_DEFAULT_SSID, WIFI_DEFAULT_PWD);
 
   if (myWifiManager->getSSID(0).length()) {
@@ -151,17 +165,17 @@ void WifiConnection::startPortal() {
   ESP_RESET();
 }
 
+//
+// Call the wifi manager in loop
+//
 void WifiConnection::loop() { myDRD->loop(); }
 
+//
+// Connect to last known access point, non blocking mode.
+//
 void WifiConnection::connectAsync(int wifiIndex) {
   WiFi.persistent(true);
   WiFi.mode(WIFI_STA);
-
-#if defined(ESP32C3) && defined(REDUCE_WIFI_POWER)
-  Log.notice(F("WIFI: Reducing wifi power for c3 chip." CR));
-  WiFi.setTxPower(WIFI_POWER_8_5dBm);  // Required for ESP32C3 Mini
-#endif
-
   if (strlen(userSSID)) {
     Log.notice(F("WIFI: Connecting to wifi using hardcoded settings %s." CR),
                userSSID);
@@ -174,31 +188,39 @@ void WifiConnection::connectAsync(int wifiIndex) {
   }
 }
 
+//
+// Blocks until wifi connection has been found
+//
 bool WifiConnection::waitForConnection(int maxTime) {
 #if DEBUG_LEVEL == 6
-  WiFi.printDiag(EspSerial);
+  WiFi.printDiag(Serial);
 #endif
   int i = 0;
   while (WiFi.status() != WL_CONNECTED) {
     delay(100);
 
-    if (i % 10) EspSerial.print(".");
+    if (i % 10) Serial.print(".");
 
     if (i++ >
         (maxTime * 10)) {  // Try for maxTime seconds. Since delay is 100ms.
-      writeErrorLog("WIFI: Failed to connect to wifi %d", WiFi.status());
+      ErrorFileLog errLog;
+      errLog.addEntry("WIFI: Failed to connect to wifi " +
+                      String(WiFi.status()));
       WiFi.disconnect();
-      EspSerial.print(CR);
+      Serial.print(CR);
       return false;  // Return to main that we have failed to connect.
     }
   }
-  EspSerial.print(CR);
+  Serial.print(CR);
   Log.notice(F("WIFI: Connected to wifi %s ip=%s." CR), WiFi.SSID().c_str(),
              getIPAddress().c_str());
   Log.notice(F("WIFI: Using mDNS name %s." CR), myConfig.getMDNS());
   return true;
 }
 
+//
+// Check what network is the strongest.
+//
 int WifiConnection::findStrongestNetwork() {
   if (!myConfig.dualWifiConfigured()) {
     Log.notice(F("WIFI: Only one wifi SSID is configured, skipping scan." CR));
@@ -232,6 +254,9 @@ int WifiConnection::findStrongestNetwork() {
   return 1;  // Second network is the strongest
 }
 
+//
+// Connect to last known access point, blocking mode.
+//
 bool WifiConnection::connect() {
   /*
   // Alternative code for connecting to strongest wifi.
@@ -277,6 +302,10 @@ bool WifiConnection::connect() {
   return true;
 }
 
+//
+// This will erase the stored credentials and forcing the WIFI manager to AP
+// mode.
+//
 bool WifiConnection::disconnect() {
   Log.notice(F("WIFI: Erasing stored WIFI credentials." CR));
   // Erase WIFI credentials
@@ -284,6 +313,10 @@ bool WifiConnection::disconnect() {
 }
 
 #if defined(ACTIVATE_OTA)
+
+//
+//
+//
 bool WifiConnection::updateFirmware() {
   if (!_newFirmware) {
     Log.notice(F("WIFI: No newer version exist, skipping update." CR));
@@ -299,12 +332,6 @@ bool WifiConnection::updateFirmware() {
   String serverPath = myConfig.getOtaURL();
 #if defined(ESP8266)
   serverPath += "firmware.bin";
-#elif defined(ESP32C3)
-  serverPath += "firmware32c3.bin";
-#elif defined(ESP32S2)
-  serverPath += "firmware32s2.bin";
-#elif defined(ESP32LITE)
-  serverPath += "firmware32lite.bin";
 #else  // defined (ESP32)
   serverPath += "firmware32.bin";
 #endif
@@ -319,7 +346,9 @@ bool WifiConnection::updateFirmware() {
 
   switch (ret) {
     case HTTP_UPDATE_FAILED: {
-      writeErrorLog("WIFI: OTA update failed %d", ESPhttpUpdate.getLastError());
+      ErrorFileLog errLog;
+      errLog.addEntry("WIFI: OTA update failed " +
+                      String(ESPhttpUpdate.getLastError()));
     } break;
     case HTTP_UPDATE_NO_UPDATES:
       break;
@@ -334,6 +363,9 @@ bool WifiConnection::updateFirmware() {
   return false;
 }
 
+//
+// Download and save file
+//
 void WifiConnection::downloadFile(HTTPClient &http, String &fname) {
 #if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
   Log.verbose(F("WIFI: Download file %s." CR), fname);
@@ -346,10 +378,15 @@ void WifiConnection::downloadFile(HTTPClient &http, String &fname) {
     f.close();
     Log.notice(F("WIFI: Downloaded file %s." CR), fname.c_str());
   } else {
-    writeErrorLog("WIFI: Failed to download html-file %d", httpResponseCode);
+    ErrorFileLog errLog;
+    errLog.addEntry("WIFI: Failed to download html-file " +
+                    String(httpResponseCode));
   }
 }
 
+//
+// Check what firmware version is available over OTA
+//
 bool WifiConnection::checkFirmwareVersion() {
 #if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
   Log.verbose(F("WIFI: Checking if new version exist." CR));
@@ -382,7 +419,8 @@ bool WifiConnection::checkFirmwareVersion() {
 #endif
     DeserializationError err = deserializeJson(ver, payload);
     if (err) {
-      writeErrorLog("WIFI: Failed to parse version.json");
+      ErrorFileLog errLog;
+      errLog.addEntry(F("WIFI: Failed to parse version.json"));
     } else {
 #if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
       Log.verbose(F("WIFI: Project %s version %s." CR),
@@ -430,8 +468,6 @@ bool WifiConnection::checkFirmwareVersion() {
   }
   http.end();
 
-  if (_newFirmware) Log.notice(F("WIFI: Found new version." CR));
-
 #if LOG_LEVEL == 6
   Log.verbose(F("WIFI: OTA found new version %s." CR),
               _newFirmware ? "true" : "false");
@@ -440,6 +476,9 @@ bool WifiConnection::checkFirmwareVersion() {
   return _newFirmware;
 }
 
+//
+// Parse a version string in the format M.m.p (eg. 1.2.10)
+//
 bool WifiConnection::parseFirmwareVersionString(int (&num)[3],
                                                 const char *version) {
 #if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)

src_docs/source/advanced.rst

@@ -10,14 +10,14 @@ To reduce the need for adding custom endpoints for various services there is an
 
 .. warning::
 
-   If format templates are large this feature can be slow on a small device such as the esp8266. 
+   Since the format templates can be big this function can be quite slow on a small device such as the esp8266. 
 
 .. image:: images/format.png
   :width: 800
   :alt: Format editor
 
 You enter the format data in the text field and the test button will show an example on what the output would look like. If the data cannot be formatted in json it will just be displayed as a long string.
-The save button will save the current formula and reload the data from the device. 
+The save button will save the current formla and reload the data from the device. 
 
 You can also select a template from the list and copy that to the current endpoint. 
 

src_docs/source/api.rst

@@ -8,7 +8,7 @@ All the API's use a key called ``ID`` which is the unique device id (chip id). T
 GET: /api/config
 ================
 
-Retrieve the current configuration of the device via an HTTP GET command. Payload is in JSON format.
+Retrive the current configuation of the device via an HTTP GET command. Payload is in JSON format.
 
 * ``temp-format`` can be either ``C`` or ``F``
 * ``gravity-format`` is always ``G`` (plato is not yet supported)
@@ -65,8 +65,6 @@ 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
    }
@@ -81,12 +79,10 @@ This API has been removed from 0.9 and merged with /api/status
 GET: /api/status
 ================
 
-Retrieve the current device status via an HTTP GET command. Payload is in JSON format.
+Retrive the current device status via an HTTP GET command. Payload is in JSON format.
 
 * ``temp-format`` can be either ``C`` or ``F``
-* ``platform`` can be either ``esp8266``, ``esp32c3``, ``esp32s2``, ``esp32`` or ``esp32lite`` (floaty hardware)
-* ``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
+* ``platform`` can be either ``esp8266`` or ``esp32``
 
 Other parameters are the same as in the configuration guide.
 
@@ -106,7 +102,6 @@ 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",
@@ -117,10 +112,10 @@ Other parameters are the same as in the configuration guide.
 GET: /api/config/formula
 ========================
 
-Retrieve the data used for formula calculation data via an HTTP GET command. Payload is in JSON format.
+Retrive the data used for formula calculation data via an HTTP GET command. Payload is in JSON format.
 
 * ``a1``-``a10`` are the angles/tilt readings (up to 10 are currently supported)
-* ``g1``-``g10`` are the corresponding gravity readings in SG or Plato depending on the device-format.
+* ``g1``-``g10`` are the corresponding gravity reaadings in SG or Plato depending on the device-format.
 
 .. code-block:: json
 
@@ -161,19 +156,18 @@ 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": 3.0,
+      "formula-max-deviation": 1.6,
       "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,
-      "tempsensor-resolution": 9,
-      "ignore-low-angles": false
+      "int-mqtt": 0
    }
 
 POST: /api/config/advanced
@@ -239,7 +233,7 @@ Used to update device settings via an HTTP POST command.
 
 Payload should be in standard format used for posting a form. Such as as: `id=value&mdns=value` etc. Key value pairs are shown below.
 
-* ``temp-format`` can be either ``C`` (Celsius) or ``F`` (Fahrenheit)
+* ``temp-format`` can be either ``C`` (Celcius) or ``F`` (Farenheight)
 
 .. code-block:: 
 
@@ -327,7 +321,7 @@ POST: /api/config/formula
 Used to update formula calculation data via an HTTP POST command. Payload is in JSON format.
 
 * ``a1``-``a10`` are the angles/tilt readings (up to 10 are currently supported)
-* ``g1``-``g10`` are the corresponding gravity readings (in SG)
+* ``g1``-``g10`` are the corresponding gravity reaadings (in SG)
 
 Payload should be in standard format used for posting a form. Such as as: `id=value&mdns=value` etc. Key value pairs are shown below.
 
@@ -360,7 +354,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. You only need to include the parameters you want to change. 
+present or the API call will fail.
 
 The requests package converts the json to standard form post format. 
 
@@ -369,7 +363,7 @@ The requests package converts the json to standard form post format.
    import requests
    import json
 
-   host = "192.168.1.1"           # IP address (or name) of the device to send these settings to
+   host = "192.168.1.1"           # IP adress (or name) of the device to send these settings to
    id = "ee1bfc"                  # Device ID (shown in serial console during startup or in UI)
 
    def set_config( url, json ):
@@ -425,7 +419,7 @@ The requests package converts the json to standard form post format.
             "temp-adjustment": 0,                   # If temp sensor needs to be corrected
             "gyro-temp": "on",                      # Use the temp sensor in the gyro instead (on/off)
             "ble": "red",                           # Enable ble on esp32
-            "ota-url": ""                           # if the device should search for a new update when active
+            "ota-url": ""                           # if the device should seach for a new update when active
          }
    set_config( url, json )
 

src_docs/source/compiling.rst

@@ -29,36 +29,19 @@ In the platformio config there are 3 targets defined
 
 * gravity-debug; Maximum logging for trouble shooting, deep sleep is disabled.
 * gravity-release; Standard release
-* gravity32-release: Version for ESP32 mini.
-* gravity32c3-release: Version for ESP32 C3 mini v2.1+.
-* gravity32c3v1-release: Version for ESP32 C3 mini v1.0.
-* gravity32s2-release: Version for ESP32 S2 mini.
-* gravity32lite-release: Version for ESP32 lite (Floaty hardware).
+* gravity-perf; Standard release but contains code for measuring performance.
+* gravity32-release: Version for ESP32.
+* gravity32-perf: Version for ESP32 but contains code for measuring performance.
+
+.. note::
+  There is an experimental ESP32 target but since platformio only supports SDK 1.0.6 and the WIFI connection is really slow compared to ESP8266, 
+  so the recommendation is to wait for support on 2.0.x branch. With the tested version an wifi connection takes 3-8s on a ESP32 compared 
+  to 0.5s on an ESP8266. There is also a bug in OneWire connected to ESP32 that has not been fixed in the main repository yet.
 
 .. warning::
   The debug target can be unstable and crash the device under certain circumstanses. Excessive logging to the serial port can cause corruption and crashes. 
   So only enable enough debugging to troubleshoot your changes.
 
-Serial debugging on battery
-===========================
-
-.. image:: images/serial.png
-  :width: 600
-  :alt: Serial output
-
-On the ESP32 builds the serial output can be  written to UART0 which is connected to the RX/TX pins on the chip. This way the serial output can be viewed 
-without a connection to the USB port, convinient when running the device on battery power. In order to get this to work you need to compile the sofware 
-with the option **DUSE_SERIAL_PINS** and attach as USB to TTL cable to the correct pins. 
-
-You connect the USB to TTL cable that you connect the TX, RX and GND pins. **Dont connect the power pin** if you are powering the device from USB or Battery.
-
-.. image:: images/usb-ttl.jpg
-  :width: 300
-  :alt: USB to TTL cable
-
-.. image:: images/serial_esp32c3.jpg
-  :width: 300
-  :alt: Serial output ESP32c3
 
 Source structure 
 ================
@@ -108,15 +91,12 @@ This is a list of C++ defines that is used to enable/disable functions in the co
      - Done include verbose logging in the corresponding class. Excessive logging may crash device.
    * - USE_LITTLEFS
      - Use the new filesystem in Ardurino
+   * - EMBED_HTML
+     - Html files are included in code, if not defined they are served from the file system.
    * - USER_SSID
      - If defined the device will always use this SSID
    * - USER_SSID_PWD
      - Password to the SSID
    * - CFG_APPVER
      - Defines the version of the compiled software
-   * - USE_SERIAL_PINS
-     - Will send the serial console to the TX/RX pins on an ESP32 target so that debugging can be done when on battery
-   * - REDUCE_WIFI_POWER
-     - Will reduce wifi power to support the ESP32C3 v1.0 which has a bad antenna
-   * - FLOATY
-     - Build for the ESP32lite FLOATY hardware option (no DS18B20 and no battery monitor)
+

src_docs/source/conf.py

@@ -18,11 +18,11 @@
 # -- Project information -----------------------------------------------------
 
 project = 'GravityMon'
-copyright = '2021-2023, Magnus Persson'
+copyright = '2021-2022, Magnus Persson'
 author = 'Magnus Persson'
 
 # The full version, including alpha/beta/rc tags
-release = '1.2.1'
+release = '1.1.0'
 
 
 # -- General configuration ---------------------------------------------------
@@ -31,7 +31,6 @@ release = '1.2.1'
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-  'sphinx_copybutton'
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -48,8 +47,6 @@ exclude_patterns = []
 # a list of builtin themes.
 #
 html_theme = 'furo'
-html_logo = "images/gravitymon_logo.png"
-html_title = "GravityMon v1.2.0"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

src_docs/source/configuration.rst

@@ -10,7 +10,7 @@ One of the following conditions will place the device in ``configuration mode``:
 - Gyro has not been calibrated
 - Sleep mode has been disabled in the web interface
 - Placed in horizontal mode 85-90 degrees
-- Charger connected >4.15V (or the value that is configured). This does not work on the Floaty variant due to lack of hardware support.
+- Charger connected >4.15V
 
 
 Status 
@@ -23,23 +23,22 @@ URL: (http://gravmon.local)
   :alt: Index page
 
 
-Configuration is accessed by entering the URL for the device, this will be the mDNS name *device.local* or the IP address. The following chapter assumes the device name is *gravmon*.
+Configuration is accessed by entering the URL for the device, this will be the mDNS name *device.local* or the IP adress. The following chapter assumes the device name is *gravmon*.
 
 The main page shows the device readings; gravity, angle, temperature and battery charge. If the checkbox is active then the device will never go into sleep mode. This is useful if 
 you are collecting angle/tilt for calibration. If this is unchecked the device will change mode as explained before.
 
-You can also view the average time a gravity measurement takes. Under optimal setting this should be around 1.5 - 2.0 seconds. If this is higher than 2 seconds this is most likely connected to slow wifi 
+You can also view the average time a gravity measurement takes. Under optimal setting this should be around 1.5 - 2.0 seconds. If this is higher than 2 seconds this is most likley connected to slow wifi 
 connection. It will show 0 if data has not been collected yet.
 
 .. tip::
 
-   If you are connected to the device via a serial console (speed: 115200) you can see the connection sequence and get the Unique ID and IP address from there. 
+   If you are connected to the device via a serial console (speed: 115200) you can see the connection sequence and get the Unique ID and IP adress from there. 
 
 .. tip::
 
-   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 occurred while in `gravity mode`. From v1.1 it will also detect
-   any abnormal restarts or crashes and record these in the logfile (this applies to esp8266 only). 
+   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`.
 
 
 Configuration 
@@ -61,7 +60,7 @@ The limitation is 63 chars but using long names might break endpoints that data
 
 * **Temperature format:** 
 
-Choose between Celsius and Fahrenheit when displaying temperature. 
+Choose between Celsius and Farenheight when displaying temperature. 
 
 * **Interval:** 
 
@@ -94,7 +93,7 @@ Push Settings
 .. note::
 
    When enabling SSL this will not validate the root CA of the remote service, this is a design decision based on two aspects. Enabling CA validation will take 3-4s extra on each connection which means way less 
-   battery life, so the decision is to prioritize battery life over security. The data transmitted is not really that sensitive anyway so I believe this is a good balance.
+   battery life, so the decision is to prioritize battery life over security. The data transmitted is not really that sensitive anyway so I belive this is a good balance.
 
 * **HTTP 1 (POST):**
 
@@ -129,7 +128,7 @@ The token is included in the default format for the HTTP GET url but can be used
    :width: 300
    :alt: HTTP Headers
 
-You can define 2 http headers per push target. This is available via a pop-up window but don't forget
+You can define 2 http headers per push target. This is available via a pop-up window but dont forget
 to press the save buttons on the post section to save the values. One common header is content type which is the 
 default setting for http targets.
 
@@ -165,7 +164,7 @@ Name of organisation in Influx.
 
 * **Influx DB v2 Bucket:**
 
-Token for bucket. Don't use the bucket name.
+Identifier for bucket.
 
 * **Influx DB v2 Token:**
 
@@ -197,14 +196,14 @@ Gravity Settings
 
 * **Gravity format:**
 
-Gravity format can be either `SG` or `Plato`. The device will use SG Internally and convert to Plato when displaying or sending data.
+Gravity format can be eihter `SG` or `Plato`. The device will use SG Internally and convert to Plato when displaying or sending data.
 
 * **Gravity formula:**
 
 Gravity formula is compatible with standard iSpindle formulas so any existing calculation option can be used. You can also use 
 the feature to create the formula by supplying the raw data. See :ref:`create-formula`
 
-The gravity formula accepts to parameters, **tilt** for the angle or **temp** for temperature (temperature inserted into the formula 
+The gravity formula accepts to paramaters, **tilt** for the angle or **temp** for temperature (temperature inserted into the formula 
 will be in celsius). I would recommend to use the formula calculation feature instead since this is much easier.
 
 * **Temperature correct gravity:**
@@ -216,7 +215,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. The calibration temperature can be changed under advanced settings. 
+   Formula used in temperature correction. 
 
 ::
 
@@ -233,13 +232,12 @@ Hardware Settings
 
 * **Voltage factor:**
 
-Factor used to calculate the battery voltage. If you get a too low/high voltage you can adjust this value.
+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 don't what the device to go into configuration mode when charging, set this to 6V. This was added since different batteries have different 
-voltages when fully charged. 
+If you dont what the device to go into configuration mode when charging, set this to 6V. 
 
 * **Temperature correction:**
 
@@ -250,15 +248,14 @@ when the device starts. So changing this will not take affect until the device i
 
 Enable this feature will use the temp sensor i the gyro instead of the DS18B20, the benefit is shorter run time and
 longer battery life (this is an experimental feature). The value used is the first temperature reading from when the 
-device is activated, since the gyro should be cool this is reflecting the surrounding temperature. After it has 
+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 degree 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 encapsulated in a small glass tube. See hardware section for more information, :ref:`hardware`.
+When place on the cap (<5 degres tilt) the device will go into max sleep. In order to wake it up you need to do a reset (or wait for the device 
+to wake up). One option is to attach a magnetic reed switch (default open) to the reset pin and use a magnet to force a reset without opening 
+the tube. The reed switch is typically an electronic component of 14 mm long incapsulated in a small glass tube.
 
 * **Bluetooth: (Only ESP32)**
 
@@ -290,7 +287,7 @@ This option gives you the possibility to install an new version of the firmware
   :alt: Update firmware
 
 
-Advanced Settings
+Advanded Settings
 +++++++++++++++++
 
 .. image:: images/config5.png
@@ -299,31 +296,27 @@ Advanced Settings
 
 .. warning::
 
-   Change these parameters with caution. The wrong values might cause the device to become unresponsive. 
+   Changeing these parameters with caution. The wrong values might cause the device to become unresponsive. 
 
 
 * **Gyro reads:**
 
 This defines how many gyro reads will be done before an angle is calculated. More reads will give better accuracy and also allow detection of 
-movement. Too many reads will take time and affect battery life. 50 takes about 800 ms to execute.
+movement. Too many reads will take time and affecte batterylife. 50 takes about 800 ms to execute.
 
-* **Gyro moving threshold:**
+* **Gyro moving threashold:**
 
 This is the max amount of deviation allowed for a stable reading. 
 
 * **Formula deviation:**
 
-This is the maximum deviation on the formula allowed for it to be accepted. Once the formula has been derived it will be validated against the supplied 
+This is the maximum devation on the formlula allowed for it to be accepted. Once the formula has been derived it will be validated against the supplied 
 data and of the deviation on any point is bigger the formula will be rejected.
 
 * **Ignore angles below water:**
 
 If this option is checked any angles below that of SG 1 will be discarded as invalid and never sent to any server. Default = off.
 
-* **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 
@@ -335,11 +328,11 @@ This is the amount of time allowed for a wifi connect.
    
 * **Wifi portal timeout:**
 
-If the wifi portal is triggered (can be triggered by reset) then this is the amount of time allowed before it exists again.
+If the wifi portal is triggered (can be triggerd by reset) then this is the amount of time allowed before it exists again.
    
 * **Skip Interval (...):**
 
-These options allow the user to have variable push intervals for the different endpoints. 0 means that every wakeup will send data to that endpoint. If you enter another number then that defines how many sleep cycles will be skipped.
+These options allow the user to have variable push intervals for the diffrent endpoints. 0 means that every wakeup will send data to that endpoint. If you enter another number then that defines how many sleep cycles will be skipped.
 
 If the sleep interval is 300s and MQTT is set to 0 and HTTP1 is set to 2 then MQTT will be sent every 300s while HTTP1 would be sent 900s. This is great if you want to send data to a local mqtt server often but brewfather will only 
 accept data every 15 min.

src_docs/source/contributing.rst

@@ -7,11 +7,11 @@ In order to keep the source code in good condition I use `pre-commit <https://pr
 
 .. note::  
 
-  If you are using Windows as a base platform I would suggest that you install pre-commit under wsl (Windows Subsystem for Windows) and run it from there, I have found 
+  If you are using Windows as a base platform I would suggest that you install pre-commit under wsl (Windows Subssytem for Windows) and run it from there, I have found 
   that this approach works fine. 
 
 
-The following command will run pre-commit on all the source files. Assuming you are in the project directory.
+The following command will run pre-commit on all the source files. Assuming you are inte project directory.
 
 .. code-block:: 
 

src_docs/source/data.rst

@@ -134,7 +134,7 @@ version.json
 ============
 
 Contents version.json. The version is used by the device to check if the this version is newer. The html files will also be downloaded if the are present on the server. This way it's easy to 
-upgrade to a version that serve the html files from the file system. If they don't exist nothing will happen, the OTA flashing will still work. If the html files are missing from the file system 
+upgrade to a version that serve the html files from the file system. If they dont exist nothing will happen, the OTA flashing will still work. If the html files are missing from the file system 
 they can be uploaded manually afterwards. 
 
 .. code-block:: json

src_docs/source/formula.rst

@@ -9,7 +9,7 @@ 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 formula with increasing level of complexity. It will start
+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
@@ -21,14 +21,14 @@ Under the Error Log you will also find hints to what problem the formula creator
 
 `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 threshold is 3, it will fail. You 
+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 threshold or remove the angle that has an issue. You can also 
+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

src_docs/source/functionallity.rst

@@ -1,6 +1,6 @@
-.. _functionality:
+.. _functionallity:
 
-Functionality
+Functionallity
 ==============
 
 The main features
@@ -68,7 +68,7 @@ The main features
   Currently the device can handle 10 data points which should be enough to get a accurate formula. At least 3 data points 
   is needed to get an accurate formula.
 
-* **Customize the data format being sent to push targets**
+* **Customize the data format beeing sent to push targets**
 
   In order to make it easier to support more targets there is a built in format editor that can be used to 
   customize the data that is to be sent. This way you can easily adapt the software to new targets without coding. 
@@ -79,7 +79,7 @@ The main features
 * **Automatic temperature adjustment of gravity reading**
 
   If you want to correct gravity based on beer temperature you can do this in the formula but here is a nice 
-  feature that can correct the gravity as a second step making this independent of the formula. 
+  feature that can correct the gravity as a second step making this independant of the formula. 
 
 * **OTA support from webserver**
 
@@ -99,8 +99,8 @@ The main features
 
 * **WIFI connection issues**
 
-  The software will not wait indefinitely for a wifi connection. If it takes longer than 20 seconds to connect then
-  the device will try the secondary wifi configuration, and that also fails it will go into deep sleep for 60 seconds and then 
+  The software will not wait indefiently for a wifi connection. If it takes longer than 20 seconds to connect then
+  the device will try the seconday wifi configuration, and that also failes it will go into deep sleep for 60 seconds and then 
   retry later. This to conserve batter as much as possible.
 
 * **Use gyro temperature sensor**
@@ -119,7 +119,7 @@ The main features
   :width: 800
   :alt: Gyro temp vs DS18B20
 
-* **Celsius or Fahrenheit**
+* **Celsius or Farenheigt**
 
   You can switch between different temperature formats. GravityMon will always use C for it's internal calculations and 
   convert to F when displayed.
@@ -131,20 +131,15 @@ The main features
 
 * **Stable gyro data**
 
-  The device will read the gyro 50 times to get an accurate reading. If the standard deviation is to high it will not 
-  use the data since this is inaccurate and the device is probably moving, probably do to active fermentation or movement of 
+  The device will read the gyro 50 times to get an accurate reading. If the standad deviation is to high it will not 
+  use the data since this is inacurate and the device is probably moving, probably do to active fermentation or movement of 
   fermentation vessel. This sequence takes 900 ms seconds to execute and besides wifi connection this is what consumes the most
   battery. With more testing this might be changes to either speed up or provide more stable readings.
 
-* **Crash detection and Error Logging** 
-
-  There is a build in logging function so that errors that occurs can be detected and logged to a file. On the ESP8266 crashes will also 
-  be logged so that these problems can be detected and fixed. Crash logging is not available on the ESP32 variants.
-
 * **Performance measurements** 
 
   I've also create a small library to measure execution code in some areas of the code that i know is time consuming. This 
-  way I can find a good balance between performance and quality. This is a lot of help trying to figure out where bottlenecks 
+  way I can find a good balance between performace and quality. This is a lot of help trying to figure out where bottlenecks 
   are in the code and where to put optimization efforts. Examples of real measurements:
 
   * Reading the gyro: 885 ms
@@ -157,45 +152,20 @@ The main features
 
   See the :ref:`compiling-the-software` for more information.
 
+* **Power measurements** 
+
+  I've also create a project to measure the power consumption of the device, but more on this later.
+
 
 Battery life
 ------------
 
-For the 1.2 version I have been running some long term battery tests on a few of the boards and also comparing wifi vs Bluetooth. I was using a standard 2200 mA battery 
-that was fully charged at the start of the tests. All devices started with factory settings with only a change in push destination and sleep interval. 
+The long term battery test has now been completed. Using a 2200 mA battery and sending data every 5 minutes to a local server on my network. The battery lasted 47 days which is excellet battery life. 
 
-For the wifi tests, I was pushing data every 30 seconds to a local influxdb2 server to reduce errors connected to slow response on the server side. The devices 
-was placed 2 meters from the wifi AP to ensure a good and stable wifi connection (so ideal conditions). 
+In another test I had a device running with an sleep interval of only 30s with ok wifi connection. The device lasted 12 days which i think is excellent considering the short sleep interval. 
 
-For the Bluetooth tests I was pusing data every 10 seconds to a linux server. 
+From what I have discovered it's the WIFI connection or latency to internet hosted that has the most impact on the battery life. The typical runtime in the tests above was around 2 seconds. 
 
-To make this comparable I measured how many times the device was able to wake up and push data before the battery was dead. I theory the power consumption when in 
-deep sleep is to low it can almost be ignored for the calculations. So the impact on battery is mainly caused by how long the device is awake. In the most optimal case 
-this can be as low as 1.5-2.0 seconds but in reality its probably around 3-4 seconds. Wifi consumes a lot of power so Bluetooth is a better option for long battery life. 
-
-.. list-table:: Battery power
-   :widths: 30 20 20 20 
-   :header-rows: 1
-
-   * - Device
-     - Transmissions
-     - 30s
-     - 300s / 15min
-   * - ESP 8266 (wifi)
-     - 26,000
-     - 9 days
-     - 90 days
-   * - ESP32 c3 (wifi)
-     - 12,000
-     - 4 days
-     - 43 days
-   * - ESP32 d1 (ble)
-     - 56,000
-     - 20 days
-     - 196 days
-
-
-As you can see from the table above there is quite some differences between the boards and connection methods. 
 
 Performance 
 -----------
@@ -203,7 +173,7 @@ Performance
 Since I have the possibility to measure the performance of different function in the code this is what I have been able to gather.
 
 The typical runtime in a measurement cycle is approx 2 seconds and in some cases it can take up to 6-8 seconds but this is mainly related to establishing the WIFI connection. So stable wifi is 
-essential for long battery life. Out of the 2 seconds of run-time the major time is spent on gyro readings (1.3s) and temperature measurements of (0.6s) so using the gyro sensor for measuring 
+essential for long batterylife. Out of the 2 seconds of run-time the major time is spent on gyro readings (1.3s) and temperature measurements of (0.6s) so using the gyro sensor for measureing 
 temperature would reduce the total runtime with 25%. Sending data over http takes less than 100ms (on my local network) so this is not drawing much power. 
 
 The image below shows how the run-time varies over time. The pink line is the wifi connection time and this is why the time varies. The orange is the total runtime for the awake period.

src_docs/source/hardware.rst

@@ -3,138 +3,43 @@
 Hardware
 ########
 
-I'm not a hardware designer so I would recommend the following resources for more in depth information on this topic.
+There are lots of resouces out there on how to build the hardware for an iSpindle so I will not go into details on that part. Here are two of my builds using the iSpindle PCB v4.
 
-* `Cherry Philip Hardware design <https://github.com/cherryphilip74/iSpindel-PCB>`_
-* `OpenSource Distilling <https://www.opensourcedistilling.com/ispindel>`_
-
-iSpindle based on esp8266
-=========================
-
-There are lots of resouces out there on how to build the hardware for an iSpindle so I will not go into details on that part. I typically use one of the 
-excellent pcb boards that, for example the iSpindel PCB v4.0 from Cherry Philip. Here is one of my standard builds using an esp8266.
-
-.. image:: images/ispindel_esp8266.jpg
+.. image:: images/ispindel.jpg
   :width: 500
-  :alt: iSpindle esp8266
+  :alt: Builds of iSpindel
+
+It's possible to use this PCB and mount an ESP32 on top of that. It must be an pin compatible ESP32 and the one I used was called *ESP32 d1 mini*. Since this is the same width as the PCB you need to 
+mount it really close to the PCB in order for it to fit in the PET tube/container. I also had to smooth the edge of the ESP32 in order for it to fit. 
+
+I would suggest that you try how it fits into the PET tube before soldering it to the PCB. Make sure that the battery is attached since this will be a really tight fit.
+
+You also need to desolder (remove) the RED ON LED from the ESP32 or the battery power will be reduced a lot.
+
+Final thing is to add a resistor between A0 (Analog PIN) and ground of 470k. The reason is that the esp8266 has a build in resistor which 
+the esp32 does not have. So in order to get a valid voltage (less than 3.2V) on the A0 pin this is needed. Once the modification is done you might
+need to adjust the voltage factor so the battery reading is correct. 
+
+.. image:: images/esp32.jpg
+  :width: 500
+  :alt: Mounting esp32
 
 Schema for esp8266 build
-++++++++++++++++++++++++
+------------------------
 
 .. image:: images/schema_esp8266.png
   :width: 700
   :alt: Schema esp8266
 
-iSpindle based on esp32
-=======================
-
-Gravitymon supports a number of ESP32 boards that offers bluetooth support. 
-
-.. image:: images/esp32_hardware.jpg
-  :width: 500
-  :alt: iSpindle esp32 hardware options
-
-* esp32d1 mini, this was the first board i tried which is a smaller form factor of the first generetion esp32 with 2 cores. Slow on connecting to wifi is the main downside. 
-* esp32c3 mini, a newer version based on the latest risc v7 architecture, is seen as the replacement for the esp8266 with bluetooth support. Don't buy v1.0 since that has a faulty wifi antenna.
-* esp32s2 mini, similar to the c3 board but without bluetooth support. 
-
-It's possible to use this PCB and mount an ESP32 mini on top of that (c3 or s2 are prefered). The esp32 d1 mini is a larger formfactor and can be hard to fit into the tube.
-
-.. note::
-  You need to add a resistor between A0 (Analog PIN) and ground of 470k. The reason is that the esp8266 has a build in resistor for a voltage divider 
-  which the esp32 does not have. So in order to get a valid voltage (less than 3.2V) on the A0 pin this is needed. Once the modification is done you might
-  need to adjust the voltage factor so the battery reading is correct. 
-
-ESP32c3 mini
-++++++++++++
-
-This is model is fully supported by gravitymon. 
-
-.. image:: images/ispindel_esp32c3.jpg
-  :width: 500
-  :alt: Esp32c3 mini build
-
-Here is an image of where I added the resistor for the voltage divider. 
-
-.. image:: images/esp32_res.jpg
-  :width: 500
-  :alt: Esp32c3 adding resistor as voltage dividier.
-
-ESP32s2 mini
-++++++++++++
-
-This is model is fully supported by gravitymon. Same setup as for ESP32C3 mini.
-
-ESP32 d1 mini
-+++++++++++++
-
-I would suggest that you try how it fits into the PET tube before soldering it to the PCB. Make sure that the battery is attached since this will be a really tight fit.
-
-.. image:: images/ispindel_esp32.jpg
-  :width: 500
-  :alt: Esp32 mini build
-
 Schema for esp32 build
-++++++++++++++++++++++
+----------------------
 
 .. note::  
-  This schema assumes that an ESP32 d1 mini (pin compatible with ESP8266). The ESP32 has two rows of pins but 
-  only the inner row is used. The main difference is the added resistor R3 so we get a voltage divider for measuring battery. 
-  The ESP8266 has a built in resistor thats not visible on the schema and this acts as a voltage divider. 
+  This schema assumes that an ESP32 D1 Mini (pin compatible with ESP8266 D1 Mini is used)
+  The ESP32 has two rows of pins but only the inner row is used. The main difference is the added resistor R3 so we 
+  get a voltage divider for measuring battery. The ESP8266 has a built in resistor thats not visible on the schema. 
+
 
 .. image:: images/schema_esp32.png
   :width: 700
   :alt: Schema esp32
-
-Adding a reed (magnetic) reset 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
-
-
-Floaty Hydrometer DIY based on esp32 lite
-=========================================
-
-Here we have another projects that has build a device similar to the iSpindel but based on an ESP32 instead.
-
-The setup is much simpler and attaches the GYRO to an ESP32 with a build in charger chip. GravityMon works on 
-this hardware platform as well but there are a few limitations:
-
-* Temperature is read from the GYRO and cannot be changed. This works fine when measuring gravity but when in configuration mode the temperature will increase since it shows the chip temperature.
-* No possibility to measure battery level (can be added with additional hardware). 
-
-
-Hardware extensions
-===================
-
-GravityMon has implemented a few additions to the standard iSpindel hardware. It's possible to channel the serial console to the TX/RX pins on the chip (these position also applies to all the 
-ESP32 chips for iSpindel). You need a USB to TTL converter for this to work. This enables you to read the serial console even when on battery (newer chips dont have a diode to remove).
-
-.. note::
-  You need to compile the software using the -DUSE_SERIAL_PINS option to enable this feature. 
-
-Its also possible to force the device into configuration mode by connecting D7/D8 on the board during the startup sequence. This will enable the feature "gravity mode enabled during float".
-
-.. image:: images/8266_pins.jpg
-  :width: 500
-  :alt: iSpindel pins
-
-For the floaty device pins 16/17 are used as TX/RX pins and the 13/15 pins are used to force the device into configuration mode. Pin 35 can also be connected to the battery voltage via an voltage divider to be able to read the battery voltage. 
-
-.. image:: images/32lite_pins.jpg
-  :width: 500
-  :alt: Floaty pins