GitHub Action Build

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

@@ -0,0 +1,53 @@
+name: PlatformIO CI Patch
+
+on: 
+  push:
+    branches: 
+      - patch
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+    
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+    
+      - name: Cache PlatformIO
+        uses: actions/cache@v2
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+          git config --global advice.detachedHead false
+
+      - name: Run PlatformIO
+        #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@v7 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
+        with:
+          add: 'bin'
+          author_name: GitHub Action
+          author_email: mp-se@noreply.github.com
+
+          branch: patch
+
+          default_author: github_actor
+          message: 'GitHub Action Build'
+          pathspec_error_handling: ignore

.github/workflows/pio-build.yaml

@@ -38,6 +38,7 @@ jobs:
       - name: Run PlatformIO
         #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@v7 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
         with:

.pre-commit-config.yaml

@@ -3,6 +3,8 @@ repos:
     rev: 9a5aa38207bf557961110d6a4f7e3a9d352911f9
     hooks:
     -   id: clang-format
+        files: ^src/
     -   id: cpplint
+        files: ^src/
     -   id: cppcheck
-    
+        files: ^src/

README.md

@@ -1,5 +1,32 @@
+
+![download](https://img.shields.io/github/downloads/mp-se/gravitymon/total) 
+![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/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
 
-This software can be used with iSpindle hardware and utilizes the same hardware configuration. No code has been reused from the iSpindle project. 
+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.
 
-The documenation is now moved to https://mp-se.github.io/gravitymon/index.html
+Installation can be made using https://www.brewflasher.com
+
+The main differences:
+---------------------
+
+* Operates in two modes gravity monitoring and configuration mode (simplify calibration)
+* Modern web based UI for configuration (in config mode)
+* REST API
+* Send data to multiple endpoints when pushing data (2xhttp, brewfather, influxdb v2, mqtt supported)
+* Automatic temperature adjustment of gravity reading
+* OTA support from local webserver
+* Built in function to create gravity formulas, no need for additional software, just enter tilt/gravity. 
+* Visual graph showing how formula will be interpreted
+* Using the temperature sensor in gyro instead of DS18B20 (faster)
+* Built in performance measurements (used to optimise code)
+* SSL support in standard HTTP and MQTT connections.
+
+No code has been reused from the iSpindle project. 
+
+The documenation can be found here: https://mp-se.github.io/gravitymon/index.html

bin/device.min.htm

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></a></li><li class="nav-item active"><a class="nav-link" href="/device.htm">Device</a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Current version:</div><div class="col-md-4 themed-grid-col bg-light" id="app-ver">Loading...</div></div><div class="row mb-3" id="h-app-ver-new" hidden><div class="col-md-8 themed-grid-col bg-light">New version:</div><div class="col-md-4 themed-grid-col bg-light" id="app-ver-new">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Host name:</div><div class="col-md-4 themed-grid-col bg-light" id="mdns">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Device ID:</div><div class="col-md-4 themed-grid-col bg-light" id="id">Loading...</div></div><hr class="my-4"></div><script type="text/javascript">function getConfig(){var n="/api/device";$("#spinner").show(),$.getJSON(n,function(n){console.log(n),$("#app-ver").text(n["app-ver"]+" (html 0.6.0)"),$("#mdns").text(n.mdns),$("#id").text(n.id)}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}window.onload=getConfig</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></a></li><li class="nav-item active"><a class="nav-link" href="/device.htm">Device</a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Current version:</div><div class="col-md-4 themed-grid-col bg-light" id="app-ver">Loading...</div></div><div class="row mb-3" id="h-app-ver-new" hidden><div class="col-md-8 themed-grid-col bg-light">New version:</div><div class="col-md-4 themed-grid-col bg-light" id="app-ver-new">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Host name:</div><div class="col-md-4 themed-grid-col bg-light" id="mdns">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Device ID:</div><div class="col-md-4 themed-grid-col bg-light" id="id">Loading...</div></div><hr class="my-4"></div><script type="text/javascript">function getConfig(){var n="/api/device";$("#spinner").show(),$.getJSON(n,function(n){console.log(n),$("#app-ver").text(n["app-ver"]+" (html 0.7.1)"),$("#mdns").text(n.mdns),$("#id").text(n.id)}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}window.onload=getConfig</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>

bin/format.min.htm

@@ -0,0 +1,2 @@
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item"><a class="nav-link" href="/config.htm">Back to configuration</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-2"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$("#alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$("#alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$("#alert").addClass("d-none").removeClass("show")})</script><div class="accordion" id="accordion"><div class="card"><div class="card-header" id="headingOne"><h2 class="mb-0"><button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">Push Format Templates</button></h2></div><div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion"><div class="card-body"><input type="text" name="id" id="id" hidden> <input type="text" name="http-1" id="http-1" hidden> <input type="text" name="http-2" id="http-2" hidden><!--<input type="text" name="brewfather" id="brewfather" hidden>--> <input type="text" name="influxdb" id="influxdb" hidden> <input type="text" name="mqtt" id="mqtt" hidden><div class="form-group row"><label for="push-target" class="col-sm-2 col-form-label">Push target:</label> <select class="custom-select col-sm-4" required name="push-target" id="push-target"><option value="http-1">HTTP option 1</option><option value="http-2">HTTP option 2</option><!--<option value="brewfather">Brewfather</option>--><option value="influxdb">Influx DB</option><option value="mqtt">MQTT</option></select></div><div class="form-group row"><div class="col-sm-12"><textarea rows="5" class="form-control" name="format" id="format">  
+                </textarea></div></div><div class="form-group row"><div class="col-sm-8 offset-sm-2"><button class="btn btn-primary" id="format-btn">Save</button> <button class="btn btn-secondary" id="test-btn">Test</button></div></div><pre class="card-preview" id="preview" name="preview"></pre></div></div></div><hr class="my-4"></div><script type="text/javascript">function setButtonDisabled(l){$("#format-btn").prop("disabled",l),$("#test-btn").prop("disabled",l)}function selectFormat(){var l="#"+$("#push-target").val();console.log(l),l=decodeURIComponent($(l).val()),console.log(l),l=l.replaceAll("|","|\n"),console.log(l),$("#format").val(l),$("#preview").text("")}function getConfig(){setButtonDisabled(!0);var l="/api/config/format";$("#spinner").show(),$.getJSON(l,function(l){console.log(l),$("#id").val(l.id),$("#http-1").val(l["http-1"]),$("#http-2").val(l["http-2"]),$("#influxdb").val(l.influxdb),$("#mqtt").val(l.mqtt),selectFormat()}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1)})}window.onload=getConfig,setButtonDisabled(!0),$(document).ready(function(){null!=location.hash&&""!=location.hash&&($(".collapse").removeClass("in"),$(location.hash+".collapse").collapse("show"))}),$("#push-target").change(function(l){console.log(l),selectFormat()}),$("#format-btn").click(function(l){var e=$("#format").val();e=e.replaceAll("\n","");var t="id="+$("#id").val()+"&"+$("#push-target").val()+"="+encodeURIComponent(e);console.log(t),$.ajax({type:"POST",url:"/api/config/format",data:t,success:function(l){showSuccess("Format stored successfully."),getConfig()},error:function(l){showError("Unable to store format.")}})}),$("#test-btn").click(function(l){var e=$("#format").val();e=e.replaceAll("${mdns}","gravmon2"),e=e.replaceAll("${id}","e4a344"),e=e.replaceAll("${sleep-interval}","300"),e=e.replaceAll("${temp}","21.1"),e=e.replaceAll("${temp-c}","21.1"),e=e.replaceAll("${temp-f}","51.3"),e=e.replaceAll("${temp-unit}","C"),e=e.replaceAll("${battery}","3.86"),e=e.replaceAll("${rssi}","-76"),e=e.replaceAll("${run-time}","4.32"),e=e.replaceAll("${gravity}","1.044"),e=e.replaceAll("${gravity-sg}","1.044"),e=e.replaceAll("${gravity-plato}","9.5"),e=e.replaceAll("${gravity-unit}","G"),e=e.replaceAll("${corr-gravity}","1.044"),e=e.replaceAll("${corr-gravity-sg}","1.044"),e=e.replaceAll("${corr-gravity-plato}","9.5"),e=e.replaceAll("${angle}","54.5"),e=e.replaceAll("${tilt}","54.5");try{var t=JSON.parse(e);e=JSON.stringify(t,null,2)}catch(l){console.log("Not a javascript object!")}$("#preview").text(e)})</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></div></body></html>

bin/index.min.htm

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item active"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></a></li><li class="nav-item"><a class="nav-link" href="/device.htm">Device</a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="" id="id" hidden></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Gravity:</div><div class="col-md-4 themed-grid-col bg-light" id="gravity">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Temperature:</div><div class="col-md-4 themed-grid-col bg-light" id="temp">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Angle/Tilt:</div><div class="col-md-4 themed-grid-col bg-light" id="angle">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Battery:</div><div class="col-md-4 themed-grid-col bg-light" id="battery">Loading...</div></div><div class="row mb-3"><div class="col-md-12 px-md-5 themed-grid-col bg-light custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" name="sleep-mode" id="sleep-mode" disabled> <label class="custom-control-label" for="sleep-mode">Do not enter sleep mode when floating (check this if you are collecting angles/tilt for calibration).</label></div></div><hr class="my-4"></div><script type="text/javascript">function getStatus(){var e="/api/status";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#id").text(e.id),$("#angle").text(e.angle),$("#gravity").text(e.gravity+" SG"),$("#battery").text(e.battery+" V"),"C"==e["temp-format"]?$("#temp").text(e["temp-c"]+" C"):$("#temp").text(e["temp-f"]+" F"),e["sleep-mode"]?$("#sleep-mode").attr("checked",!0):$("#sleep-mode").attr("checked",!1),$("#sleep-mode").removeAttr("disabled")}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}function start(){setInterval(getStatus,3e3)}window.onload=start,$("#sleep-mode").click(function(e){console.log("Blocking sleep mode = "+$("#sleep-mode").is(":checked")),$.ajax({type:"POST",url:"/api/status/sleepmode",data:{id:$("#id").text(),"sleep-mode":$("#sleep-mode").is(":checked")},success:function(e){},error:function(e){showError("Could not update sleep mode for device.")}})})</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item active"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></a></li><li class="nav-item"><a class="nav-link" href="/device.htm">Device</a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="" id="id" hidden></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Gravity:</div><div class="col-md-4 themed-grid-col bg-light" id="gravity">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Temperature:</div><div class="col-md-4 themed-grid-col bg-light" id="temp">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Angle/Tilt:</div><div class="col-md-4 themed-grid-col bg-light" id="angle">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Battery:</div><div class="col-md-4 themed-grid-col bg-light" id="battery">Loading...</div></div><div class="row mb-3"><div class="col-md-12 px-md-5 themed-grid-col bg-light custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" name="sleep-mode" id="sleep-mode" disabled> <label class="custom-control-label" for="sleep-mode">Do not enter sleep mode when floating (check this if you are collecting angles/tilt for calibration).</label></div></div><hr class="my-4"></div><script type="text/javascript">function getStatus(){var e="/api/status";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#id").text(e.id),$("#angle").text(e.angle),"G"==e["gravity-format"]?$("#gravity").text(e.gravity+" SG"):$("#gravity").text(e.gravity+" °P"),$("#battery").text(e.battery+" V"),"C"==e["temp-format"]?$("#temp").text(e["temp-c"]+" C"):$("#temp").text(e["temp-f"]+" F"),e["sleep-mode"]?$("#sleep-mode").attr("checked",!0):$("#sleep-mode").attr("checked",!1),$("#sleep-mode").removeAttr("disabled")}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}function start(){setInterval(getStatus,3e3)}window.onload=start,$("#sleep-mode").click(function(e){console.log("Blocking sleep mode = "+$("#sleep-mode").is(":checked")),$.ajax({type:"POST",url:"/api/status/sleepmode",data:{id:$("#id").text(),"sleep-mode":$("#sleep-mode").is(":checked")},success:function(e){},error:function(e){showError("Could not update sleep mode for device.")}})})</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>

bin/version.json

@@ -1 +1 @@
-{ "project":"gravmon", "version":"0.6.0",  "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "about.min.htm" ] }
+{ "project":"gravmon", "version":"0.7.1",  "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "format.min.htm", "about.min.htm" ] }

html/calibration.htm

@@ -86,19 +86,20 @@
       <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
         <div class="card-body">
           <form action="/api/formula" method="post">
+            <input type="text" name="gravity-format" id="gravity-format" hidden>
             <input type="text" name="id" id="id" hidden>
 
             <div class="row mb-3">
-                Here you can create your gravity formula by entering angles/tilt and the corresponding gravity (SG). These values
+                Here you can create your gravity formula by entering angles/tilt and the corresponding gravity. These values
                 will be saved for future use. Angles with 0 (zero) will be skipped. The values below will be used to check the 
-                formula and if the deviation is more than 1.5 SG then the forumla will be rejected. On the bottom of the page you can 
-                see a graph over the entered values + values calcualated by the formula.
+                formula and if the deviation is more than 1.5SG / 0.38P on any of the provided points then the forumla will be 
+                rejected. On the bottom of the page you can see a graph over the entered values + values calcualated by the formula.
             </div>
 
             <div class="form-group row">
               <label class="col-sm-2 col-form-label">#:</label>
               <label class="col-sm-4 col-form-label">Angle/Tilt:</label>
-              <label class="col-sm-4 col-form-label">Gravity (SG):</label>
+              <label class="col-sm-4 col-form-label" id="gravity-header">Gravity (SG):</label>
             </div>
 
             <div class="form-group row">
@@ -107,7 +108,7 @@
                 <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a1" id="a1">
               </div>
               <div class="col-sm-4">
-                <input type="number"  min="1" max="2" step="0.0001" class="form-control" name="g1" id="g1">
+                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g1" id="g1">
               </div>
             </div>
 
@@ -117,7 +118,7 @@
                 <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a2" id="a2">
               </div>
               <div class="col-sm-4">
-                <input type="number"  min="1" max="2" step="0.0001" class="form-control" name="g2" id="g2">
+                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g2" id="g2">
               </div>
             </div>
 
@@ -127,7 +128,7 @@
                 <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a3" id="a3">
               </div>
               <div class="col-sm-4">
-                <input type="number"  min="1" max="2" step="0.0001" class="form-control" name="g3" id="g3">
+                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g3" id="g3">
               </div>
             </div>
 
@@ -137,7 +138,7 @@
                 <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a4" id="a4">
               </div>
               <div class="col-sm-4">
-                <input type="number"  min="1" max="2" step="0.0001" class="form-control" name="g4" id="g4">
+                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g4" id="g4">
               </div>
             </div>
 
@@ -147,7 +148,7 @@
                 <input type="number"  min="0" max="90" step="0.001" class="form-control" name="a5" id="a5">
               </div>
               <div class="col-sm-4">
-                <input type="number"  min="1" max="2" step="0.0001" class="form-control" name="g5" id="g5">
+                <input type="number"  min="0" max="26" step="0.0001" class="form-control" name="g5" id="g5">
               </div>
             </div>
 
@@ -233,28 +234,40 @@
 </script>
 
 <script type="text/javascript">
-  g1.onchange = setFourNumberDecimal
-  g2.onchange = setFourNumberDecimal
-  g3.onchange = setFourNumberDecimal
-  g4.onchange = setFourNumberDecimal
-  g5.onchange = setFourNumberDecimal
+  g1.onchange = setGravityDecimal
+  g2.onchange = setGravityDecimal
+  g3.onchange = setGravityDecimal
+  g4.onchange = setGravityDecimal
+  g5.onchange = setGravityDecimal
 
-  a1.onchange = setTwoNumberDecimal
-  a2.onchange = setTwoNumberDecimal
-  a3.onchange = setTwoNumberDecimal
-  a4.onchange = setTwoNumberDecimal
-  a5.onchange = setTwoNumberDecimal
+  a1.onchange = setAngleDecimal
+  a2.onchange = setAngleDecimal
+  a3.onchange = setAngleDecimal
+  a4.onchange = setAngleDecimal
+  a5.onchange = setAngleDecimal
 
   window.onload = getConfig;
   setButtonDisabled( true );
 
-  function setTwoNumberDecimal(event) {
+  function convertToPlato(sg) {
+    return 259-(259/sg);
+  }
+
+  function convertToSG(plato) {
+    return 259/(259-plato);
+  }
+
+  function setAngleDecimal(event) {
     this.value = parseFloat(this.value).toFixed(2);
     populateChart();
   } 
 
-  function setFourNumberDecimal(event) {
+  function setGravityDecimal(event) {
+    if(isPlato()) 
+      this.value = parseFloat(this.value).toFixed(1);
+    else
       this.value = parseFloat(this.value).toFixed(4);
+
     populateChart();
   } 
 
@@ -267,6 +280,10 @@
     chartDataCalc.push( { x: parseFloat(a), y: parseFloat(g) });
   }
 
+  function isPlato() {
+    return $("#gravity-format").text() == "P";
+  }
+
   function populateChart() {
 
     chartDataCalc.length = 0
@@ -278,6 +295,10 @@
       formula=formula.replaceAll( "tilt^2", angle+"*"+angle );
       formula=formula.replaceAll( "tilt", angle );
       var g = eval( formula );
+
+      if(isPlato())
+        g = convertToPlato(g);
+
       populateChartCalc( i, g );
     }
 
@@ -314,6 +335,23 @@
       $("#id").val(cfg["id"]);
       $("#angle").text(cfg["angle"]);
       $("#formula").text(cfg["gravity-formula"]);
+      $("#gravity-format").text(cfg["gravity-format"]); // Sets the variable used by isPlato()
+
+      if(isPlato()) {
+        $("#gravity-header").text("Gravity (Plato):");
+        $("#g1").val( parseFloat(cfg["g1"]).toFixed(1) );
+        $("#g2").val( parseFloat(cfg["g2"]).toFixed(1) );
+        $("#g3").val( parseFloat(cfg["g3"]).toFixed(1) );
+        $("#g4").val( parseFloat(cfg["g4"]).toFixed(1) );
+        $("#g5").val( parseFloat(cfg["g5"]).toFixed(1) );
+      } else {
+        $("#gravity-header").text("Gravity (SG):");
+        $("#g1").val( parseFloat(cfg["g1"]).toFixed(4) );
+        $("#g2").val( parseFloat(cfg["g2"]).toFixed(4) );
+        $("#g3").val( parseFloat(cfg["g3"]).toFixed(4) );
+        $("#g4").val( parseFloat(cfg["g4"]).toFixed(4) );
+        $("#g5").val( parseFloat(cfg["g5"]).toFixed(4) );
+      }
 
       $("#a1").val( parseFloat(cfg["a1"]).toFixed(2) );
       $("#a2").val( parseFloat(cfg["a2"]).toFixed(2) );
@@ -321,11 +359,9 @@
       $("#a4").val( parseFloat(cfg["a4"]).toFixed(2) );
       $("#a5").val( parseFloat(cfg["a5"]).toFixed(2) );
 
-      $("#g1").val( parseFloat(cfg["g1"]).toFixed(4) );
-      $("#g2").val( parseFloat(cfg["g2"]).toFixed(4) );
-      $("#g3").val( parseFloat(cfg["g3"]).toFixed(4) );
-      $("#g4").val( parseFloat(cfg["g4"]).toFixed(4) );
-      $("#g5").val( parseFloat(cfg["g5"]).toFixed(4) );
+      if( cfg["error"]!="" ) {
+        showError(cfg["error"]);
+      }
 
       populateChart();
     })

html/config.htm

@@ -173,13 +173,13 @@
             <div class="form-group row">
               <label for="http-push" class="col-sm-2 col-form-label">Http URL 1:</label>
               <div class="col-sm-10">
-                <input type="url" maxlength="100" class="form-control" name="http-push" id="http-push">
+                <input type="url" maxlength="120" class="form-control" name="http-push" id="http-push">
               </div>
             </div>
             <div class="form-group row">
               <label for="http-push2" class="col-sm-2 col-form-label">Http URL 2:</label>
               <div class="col-sm-10">
-                <input type="url" maxlength="100" class="form-control" name="http-push2" id="http-push2">
+                <input type="url" maxlength="120" class="form-control" name="http-push2" id="http-push2">
               </div>
             </div>
 
@@ -230,9 +230,9 @@
               </div>
             </div>
             <div class="form-group row">
-              <label for="mqtt-topic" class="col-sm-2 col-form-label">MQTT Topic:</label>
+              <label for="mqtt-topic" class="col-sm-2 col-form-label">MQTT Port:</label>
               <div class="col-sm-4">
-                <input type="text" maxlength="30" class="form-control" name="mqtt-topic" id="mqtt-topic">
+                <input type="number" min="1" max="65535" class="form-control" name="mqtt-port" id="mqtt-port">
               </div>
             </div>
             <div class="form-group row">
@@ -254,6 +254,13 @@
               </div>
             </div>
           </form>
+
+          <div class="form-group row">
+            <div class="col-sm-8 offset-sm-2">
+              <button class="btn btn-secondary" id="format-btn">Format editor</button>
+            </div>
+          </div>
+
         </div>
       </div>
     </div>
@@ -270,8 +277,25 @@
         <div class="card-body">
           <form action="/api/config/gravity" method="post">
             <input type="text" name="id" id="id3" hidden>
+            <fieldset class="form-group row">
+              <legend class="col-form-label col-sm-2 float-sm-left pt-0">Gravity Format:</legend>
+              <div class="col-sm-4">
+                <div class="form-check">
+                  <input class="form-check-input" type="radio" name="gravity-format" id="gravity-format-g" value="G" checked>
+                  <label class="form-check-label" for="gravity-format-g">
+                    SG
+                  </label>
+                </div>
+                <div class="form-check">
+                  <input class="form-check-input" type="radio" name="gravity-format" id="gravity-format-p" value="P">
+                  <label class="form-check-label" for="gravity-format-p">
+                    Plato
+                  </label>
+                </div>
+              </div>
+            </fieldset>
             <div class="form-group row">
-              <label for="gravity-formula" class="col-sm-2 col-form-label">Formula</label>
+              <label for="gravity-formula" class="col-sm-2 col-form-label">Formula (SG)</label>
               <div class="col-sm-10">
                 <input type="text" maxlength="200" class="form-control" name="gravity-formula" id="gravity-formula">
               </div>
@@ -376,6 +400,11 @@
     } );
   });
 
+  // Open the format editor
+  $("#format-btn").click(function(e){
+    window.location.href = "/format.htm";
+  });
+
   function updateSleepInfo() {
     var i = $("#sleep-interval").val()
     $("#sleep-interval-info").text( Math.floor(i/60) + " m " + (i%60) + " s" )
@@ -400,6 +429,7 @@
     $("#push-btn").prop("disabled", b);
     $("#gravity-btn").prop("disabled", b);
     $("#hardware-btn").prop("disabled", b);
+    $("#format-btn").prop("disabled", b);
   }
 
   // Get the configuration values from the API
@@ -416,10 +446,10 @@
       $("#id3").val(cfg["id"]);
       $("#id4").val(cfg["id"]);
       $("#mdns").val(cfg["mdns"]);
-      if( cfg["temp-format"] == "C" ) 
-        $("#temp-format-c").click();
-      else 
-        $("#temp-format-f").click();
+      if( cfg["temp-format"] == "C" ) $("#temp-format-c").click();
+      else $("#temp-format-f").click();
+      if( cfg["gravity-format"] == "G" ) $("#gravity-format-g").click();
+      else $("#gravity-format-p").click();
       $("#ota-url").val(cfg["ota-url"]);
       $("#http-push").val(cfg["http-push"]);
       $("#http-push2").val(cfg["http-push2"]);
@@ -429,7 +459,7 @@
       $("#influxdb2-bucket").val(cfg["influxdb2-bucket"]);
       $("#influxdb2-auth").val(cfg["influxdb2-auth"]);
       $("#mqtt-push").val(cfg["mqtt-push"]);
-      $("#mqtt-topic").val(cfg["mqtt-topic"]);
+      $("#mqtt-port").val(cfg["mqtt-port"]);
       $("#mqtt-user").val(cfg["mqtt-user"]);
       $("#mqtt-pass").val(cfg["mqtt-pass"]);
       $("#sleep-interval").val(cfg["sleep-interval"]);

html/device.htm

@@ -100,7 +100,7 @@
     $('#spinner').show(); 
     $.getJSON(url, function (cfg) {
         console.log( cfg );
-        $("#app-ver").text(cfg["app-ver"] + " (html 0.6.0)");
+        $("#app-ver").text(cfg["app-ver"] + " (html 0.7.1)");
         $("#mdns").text(cfg["mdns"]);
         $("#id").text(cfg["id"]);
     })

html/device.min.htm

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></a></li><li class="nav-item active"><a class="nav-link" href="/device.htm">Device</a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Current version:</div><div class="col-md-4 themed-grid-col bg-light" id="app-ver">Loading...</div></div><div class="row mb-3" id="h-app-ver-new" hidden><div class="col-md-8 themed-grid-col bg-light">New version:</div><div class="col-md-4 themed-grid-col bg-light" id="app-ver-new">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Host name:</div><div class="col-md-4 themed-grid-col bg-light" id="mdns">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Device ID:</div><div class="col-md-4 themed-grid-col bg-light" id="id">Loading...</div></div><hr class="my-4"></div><script type="text/javascript">function getConfig(){var n="/api/device";$("#spinner").show(),$.getJSON(n,function(n){console.log(n),$("#app-ver").text(n["app-ver"]+" (html 0.6.0)"),$("#mdns").text(n.mdns),$("#id").text(n.id)}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}window.onload=getConfig</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></a></li><li class="nav-item active"><a class="nav-link" href="/device.htm">Device</a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Current version:</div><div class="col-md-4 themed-grid-col bg-light" id="app-ver">Loading...</div></div><div class="row mb-3" id="h-app-ver-new" hidden><div class="col-md-8 themed-grid-col bg-light">New version:</div><div class="col-md-4 themed-grid-col bg-light" id="app-ver-new">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Host name:</div><div class="col-md-4 themed-grid-col bg-light" id="mdns">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Device ID:</div><div class="col-md-4 themed-grid-col bg-light" id="id">Loading...</div></div><hr class="my-4"></div><script type="text/javascript">function getConfig(){var n="/api/device";$("#spinner").show(),$.getJSON(n,function(n){console.log(n),$("#app-ver").text(n["app-ver"]+" (html 0.7.1)"),$("#mdns").text(n.mdns),$("#id").text(n.id)}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}window.onload=getConfig</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>

html/format.htm

@@ -0,0 +1,230 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="description" content="">
+  <title>Beer Gravity Monitor</title>
+  <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
+  <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script>
+</head> 
+<body class="py-4">
+
+<!-- START MENU -->
+
+<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
+
+  <a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a>
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  
+  <div class="collapse navbar-collapse" id="navbar"> 
+    <ul class="navbar-nav mr-auto">
+      <li class="nav-item">
+        <a class="nav-link" href="/config.htm">Back to configuration</a>
+      </li>
+    </ul>
+  </div>
+  <div class="spinner-border text-light" id="spinner" role="status"></div>
+</nav>
+
+<!-- START MAIN INDEX -->
+
+<div class="container">
+
+  <hr class="my-2">
+
+  <div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert">
+    <div id="alert-msg">...</div>
+    <button type="button" id="alert-btn" class="close" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <script type="text/javascript">
+    function showError( msg ) {
+      $('#alert').removeClass('alert-success').addClass('alert-danger').removeClass('d-none').addClass('show');
+      $('#alert-msg').text( msg );
+    }
+
+    function showSuccess( msg ) {
+      $('#alert').addClass('alert-success').removeClass('alert-danger').removeClass('d-none').addClass('show');
+      $('#alert-msg').text( msg );
+    }
+
+    $("#alert-btn").click(function(e){
+      $('#alert').addClass('d-none').removeClass('show');
+    });    
+  </script>
+
+  <div class="accordion" id="accordion">
+
+    <div class="card">
+      <div class="card-header" id="headingOne">
+        <h2 class="mb-0">
+          <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+            Push Format Templates
+          </button>
+        </h2>
+      </div>  
+      <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+        <div class="card-body">
+            <input type="text" name="id" id="id" hidden>
+            <input type="text" name="http-1" id="http-1" hidden>
+            <input type="text" name="http-2" id="http-2" hidden>
+            <!--<input type="text" name="brewfather" id="brewfather" hidden>-->
+            <input type="text" name="influxdb" id="influxdb" hidden>
+            <input type="text" name="mqtt" id="mqtt" hidden>
+
+            <div class="form-group row">
+              <label for="push-target" class="col-sm-2 col-form-label">Push target:</label>
+              <select class="custom-select col-sm-4" required name="push-target" id="push-target">
+                <option value="http-1">HTTP option 1</option>
+                <option value="http-2">HTTP option 2</option>
+                <!--<option value="brewfather">Brewfather</option>-->
+                <option value="influxdb">Influx DB</option>
+                <option value="mqtt">MQTT</option>
+              </select>
+            </div>
+          
+            <div class="form-group row">
+              <div class="col-sm-12">
+                <textarea rows="5" class="form-control" name="format" id="format">  
+                </textarea>
+              </div>
+            </div>
+
+            <div class="form-group row">
+              <div class="col-sm-8 offset-sm-2">
+                <button class="btn btn-primary" id="format-btn">Save</button>
+                <button class="btn btn-secondary" id="test-btn">Test</button>
+              </div>
+            </div>
+
+            <pre class="card-preview" id="preview" name="preview"></pre> 
+      </div>
+    </div>
+  </div>
+
+  <hr class="my-4">
+</div>
+
+<script type="text/javascript">
+  window.onload = getConfig;
+
+  setButtonDisabled( true );
+
+  // Opens the targetet according (if URL has #collapseOne to #collapseFour)
+  $(document).ready(function () {
+    if(location.hash != null && location.hash != ""){
+      $('.collapse').removeClass('in');
+      $(location.hash + '.collapse').collapse('show');
+    }
+  });
+
+  $("#push-target").change(function(e){
+    console.log(e)
+    selectFormat();
+  });
+
+  // Store the format
+  $("#format-btn").click(function(e) {
+    var s = $("#format").val();
+    s = s.replaceAll("\n", "");
+    var obj = 'id=' + $("#id").val() + '&' + $("#push-target").val() + '=' + encodeURIComponent(s);
+    console.log(obj);
+
+    $.ajax( { 
+      type: "POST",  
+      url: "/api/config/format", 
+      data: obj, 
+      success: function(result) { showSuccess('Format stored successfully.'); getConfig(); },
+      error: function(result) { showError('Unable to store format.'); }
+    } );
+  });
+  
+  // Test the calibration
+  $("#test-btn").click(function(e) {
+    var doc = $("#format").val();
+    doc = doc.replaceAll("${mdns}", "gravmon2");
+    doc = doc.replaceAll("${id}", "e4a344");
+    doc = doc.replaceAll("${sleep-interval}", "300");
+    doc = doc.replaceAll("${temp}", "21.1");
+    doc = doc.replaceAll("${temp-c}", "21.1");
+    doc = doc.replaceAll("${temp-f}", "51.3");
+    doc = doc.replaceAll("${temp-unit}", "C");
+    doc = doc.replaceAll("${battery}", "3.86");
+    doc = doc.replaceAll("${rssi}", "-76");
+    doc = doc.replaceAll("${run-time}", "4.32");
+    doc = doc.replaceAll("${gravity}", "1.044");
+    doc = doc.replaceAll("${gravity-sg}", "1.044");
+    doc = doc.replaceAll("${gravity-plato}", "9.5");
+    doc = doc.replaceAll("${gravity-unit}", "G");
+    doc = doc.replaceAll("${corr-gravity}", "1.044");
+    doc = doc.replaceAll("${corr-gravity-sg}", "1.044");
+    doc = doc.replaceAll("${corr-gravity-plato}", "9.5");
+    doc = doc.replaceAll("${angle}", "54.5");
+    doc = doc.replaceAll("${tilt}", "54.5");
+
+    // Format in a readable json string.
+    try {
+      var json = JSON.parse(doc);
+      doc = JSON.stringify(json, null, 2);
+    } catch(e) {
+      console.log("Not a javascript object!")
+    }
+
+    $("#preview").text(doc);
+  });
+
+  function setButtonDisabled( b ) {
+    $("#format-btn").prop("disabled", b);
+    $("#test-btn").prop("disabled", b);
+  }
+
+  function selectFormat() {
+    var s = "#" + $("#push-target").val()
+    console.log(s);
+    s = decodeURIComponent($(s).val());
+    console.log(s);
+    s = s.replaceAll("|", "|\n");
+    console.log(s);
+    $("#format").val(s);
+    $("#preview").text("");
+  }
+
+  // Get the configuration values from the API
+  function getConfig() {
+    setButtonDisabled( true );
+
+    var url = "/api/config/format";
+    //var url = "/test/format.json";
+    $('#spinner').show(); 
+    $.getJSON(url, function (cfg) {
+      console.log( cfg );
+      $("#id").val(cfg["id"]);
+
+      $("#http-1").val(cfg["http-1"]);
+      $("#http-2").val(cfg["http-2"]);
+      //$("#brewfather").val(cfg["brewfather"]);
+      $("#influxdb").val(cfg["influxdb"]);
+      $("#mqtt").val(cfg["mqtt"]);
+      selectFormat();
+    })
+    .fail(function () {
+      showError('Unable to get data from the device.');
+    })
+    .always(function() {
+      $('#spinner').hide(); 
+      setButtonDisabled( false );
+    });
+  }
+</script>
+
+<!-- START FOOTER -->
+
+<div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div>
+</body>
+</html>

html/format.min.htm

@@ -0,0 +1,2 @@
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item"><a class="nav-link" href="/config.htm">Back to configuration</a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-2"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$("#alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$("#alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$("#alert").addClass("d-none").removeClass("show")})</script><div class="accordion" id="accordion"><div class="card"><div class="card-header" id="headingOne"><h2 class="mb-0"><button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">Push Format Templates</button></h2></div><div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion"><div class="card-body"><input type="text" name="id" id="id" hidden> <input type="text" name="http-1" id="http-1" hidden> <input type="text" name="http-2" id="http-2" hidden><!--<input type="text" name="brewfather" id="brewfather" hidden>--> <input type="text" name="influxdb" id="influxdb" hidden> <input type="text" name="mqtt" id="mqtt" hidden><div class="form-group row"><label for="push-target" class="col-sm-2 col-form-label">Push target:</label> <select class="custom-select col-sm-4" required name="push-target" id="push-target"><option value="http-1">HTTP option 1</option><option value="http-2">HTTP option 2</option><!--<option value="brewfather">Brewfather</option>--><option value="influxdb">Influx DB</option><option value="mqtt">MQTT</option></select></div><div class="form-group row"><div class="col-sm-12"><textarea rows="5" class="form-control" name="format" id="format">  
+                </textarea></div></div><div class="form-group row"><div class="col-sm-8 offset-sm-2"><button class="btn btn-primary" id="format-btn">Save</button> <button class="btn btn-secondary" id="test-btn">Test</button></div></div><pre class="card-preview" id="preview" name="preview"></pre></div></div></div><hr class="my-4"></div><script type="text/javascript">function setButtonDisabled(l){$("#format-btn").prop("disabled",l),$("#test-btn").prop("disabled",l)}function selectFormat(){var l="#"+$("#push-target").val();console.log(l),l=decodeURIComponent($(l).val()),console.log(l),l=l.replaceAll("|","|\n"),console.log(l),$("#format").val(l),$("#preview").text("")}function getConfig(){setButtonDisabled(!0);var l="/api/config/format";$("#spinner").show(),$.getJSON(l,function(l){console.log(l),$("#id").val(l.id),$("#http-1").val(l["http-1"]),$("#http-2").val(l["http-2"]),$("#influxdb").val(l.influxdb),$("#mqtt").val(l.mqtt),selectFormat()}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1)})}window.onload=getConfig,setButtonDisabled(!0),$(document).ready(function(){null!=location.hash&&""!=location.hash&&($(".collapse").removeClass("in"),$(location.hash+".collapse").collapse("show"))}),$("#push-target").change(function(l){console.log(l),selectFormat()}),$("#format-btn").click(function(l){var e=$("#format").val();e=e.replaceAll("\n","");var t="id="+$("#id").val()+"&"+$("#push-target").val()+"="+encodeURIComponent(e);console.log(t),$.ajax({type:"POST",url:"/api/config/format",data:t,success:function(l){showSuccess("Format stored successfully."),getConfig()},error:function(l){showError("Unable to store format.")}})}),$("#test-btn").click(function(l){var e=$("#format").val();e=e.replaceAll("${mdns}","gravmon2"),e=e.replaceAll("${id}","e4a344"),e=e.replaceAll("${sleep-interval}","300"),e=e.replaceAll("${temp}","21.1"),e=e.replaceAll("${temp-c}","21.1"),e=e.replaceAll("${temp-f}","51.3"),e=e.replaceAll("${temp-unit}","C"),e=e.replaceAll("${battery}","3.86"),e=e.replaceAll("${rssi}","-76"),e=e.replaceAll("${run-time}","4.32"),e=e.replaceAll("${gravity}","1.044"),e=e.replaceAll("${gravity-sg}","1.044"),e=e.replaceAll("${gravity-plato}","9.5"),e=e.replaceAll("${gravity-unit}","G"),e=e.replaceAll("${corr-gravity}","1.044"),e=e.replaceAll("${corr-gravity-sg}","1.044"),e=e.replaceAll("${corr-gravity-plato}","9.5"),e=e.replaceAll("${angle}","54.5"),e=e.replaceAll("${tilt}","54.5");try{var t=JSON.parse(e);e=JSON.stringify(t,null,2)}catch(l){console.log("Not a javascript object!")}$("#preview").text(e)})</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></div></body></html>

html/index.htm

@@ -123,13 +123,19 @@
       console.log( cfg );
       $("#id").text(cfg["id"]);
       $("#angle").text(cfg["angle"]);
+      
+      if( cfg["gravity-format"] == "G")
         $("#gravity").text(cfg["gravity"] + " SG");
+      else
+        $("#gravity").text(cfg["gravity"] + " °P");
+
       $("#battery").text(cfg["battery"] + " V");
+
       if( cfg["temp-format"] == "C") 
         $("#temp").text(cfg["temp-c"] + " C");
       else 
         $("#temp").text(cfg["temp-f"] + " F");
-      //console.log(cfg["sleep-mode"] );  
+
       if( cfg["sleep-mode"] ) 
         $("#sleep-mode").attr("checked", true );
       else 

html/index.min.htm

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item active"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></a></li><li class="nav-item"><a class="nav-link" href="/device.htm">Device</a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="" id="id" hidden></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Gravity:</div><div class="col-md-4 themed-grid-col bg-light" id="gravity">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Temperature:</div><div class="col-md-4 themed-grid-col bg-light" id="temp">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Angle/Tilt:</div><div class="col-md-4 themed-grid-col bg-light" id="angle">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Battery:</div><div class="col-md-4 themed-grid-col bg-light" id="battery">Loading...</div></div><div class="row mb-3"><div class="col-md-12 px-md-5 themed-grid-col bg-light custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" name="sleep-mode" id="sleep-mode" disabled> <label class="custom-control-label" for="sleep-mode">Do not enter sleep mode when floating (check this if you are collecting angles/tilt for calibration).</label></div></div><hr class="my-4"></div><script type="text/javascript">function getStatus(){var e="/api/status";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#id").text(e.id),$("#angle").text(e.angle),$("#gravity").text(e.gravity+" SG"),$("#battery").text(e.battery+" V"),"C"==e["temp-format"]?$("#temp").text(e["temp-c"]+" C"):$("#temp").text(e["temp-f"]+" F"),e["sleep-mode"]?$("#sleep-mode").attr("checked",!0):$("#sleep-mode").attr("checked",!1),$("#sleep-mode").removeAttr("disabled")}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}function start(){setInterval(getStatus,3e3)}window.onload=start,$("#sleep-mode").click(function(e){console.log("Blocking sleep mode = "+$("#sleep-mode").is(":checked")),$.ajax({type:"POST",url:"/api/status/sleepmode",data:{id:$("#id").text(),"sleep-mode":$("#sleep-mode").is(":checked")},success:function(e){},error:function(e){showError("Could not update sleep mode for device.")}})})</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/index.htm">Beer Gravity Monitor</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><ul class="navbar-nav mr-auto"><li class="nav-item active"><a class="nav-link" href="/index.htm">Home <span class="sr-only">(current)</span></a></li><li class="nav-item"><a class="nav-link" href="/device.htm">Device</a></li><li class="nav-item"><a class="nav-link" href="/config.htm">Configuration</a></li><li class="nav-item"><a class="nav-link" href="/calibration.htm">Calibration</a></li><li class="nav-item"><a class="nav-link" href="/about.htm">About</a></li></ul><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="" id="id" hidden></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Gravity:</div><div class="col-md-4 themed-grid-col bg-light" id="gravity">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Temperature:</div><div class="col-md-4 themed-grid-col bg-light" id="temp">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Angle/Tilt:</div><div class="col-md-4 themed-grid-col bg-light" id="angle">Loading...</div></div><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">Battery:</div><div class="col-md-4 themed-grid-col bg-light" id="battery">Loading...</div></div><div class="row mb-3"><div class="col-md-12 px-md-5 themed-grid-col bg-light custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" name="sleep-mode" id="sleep-mode" disabled> <label class="custom-control-label" for="sleep-mode">Do not enter sleep mode when floating (check this if you are collecting angles/tilt for calibration).</label></div></div><hr class="my-4"></div><script type="text/javascript">function getStatus(){var e="/api/status";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#id").text(e.id),$("#angle").text(e.angle),"G"==e["gravity-format"]?$("#gravity").text(e.gravity+" SG"):$("#gravity").text(e.gravity+" °P"),$("#battery").text(e.battery+" V"),"C"==e["temp-format"]?$("#temp").text(e["temp-c"]+" C"):$("#temp").text(e["temp-f"]+" F"),e["sleep-mode"]?$("#sleep-mode").attr("checked",!0):$("#sleep-mode").attr("checked",!1),$("#sleep-mode").removeAttr("disabled")}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}function start(){setInterval(getStatus,3e3)}window.onload=start,$("#sleep-mode").click(function(e){console.log("Blocking sleep mode = "+$("#sleep-mode").is(":checked")),$.ajax({type:"POST",url:"/api/status/sleepmode",data:{id:$("#id").text(),"sleep-mode":$("#sleep-mode").is(":checked")},success:function(e){},error:function(e){showError("Could not update sleep mode for device.")}})})</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>

html/upload.htm

@@ -78,6 +78,10 @@
     <div class="col-md-2 themed-grid-col bg-light">calibration.min.htm</div>
     <div class="col-md-6 themed-grid-col bg-light" id="calibration">Checking...</div>
   </div>
+  <div class="row mb-3">
+    <div class="col-md-2 themed-grid-col bg-light">format.min.htm</div>
+    <div class="col-md-6 themed-grid-col bg-light" id="format">Checking...</div>
+  </div>
   <div class="row mb-3">
     <div class="col-md-2 themed-grid-col bg-light">about.min.htm</div>
     <div class="col-md-6 themed-grid-col bg-light" id="about">Checking...</div>
@@ -132,6 +136,11 @@ function getUpload() {
       else
         $("#calibration").text("File is missing.");
 
+      if( cfg["format"] )
+        $("#format").text("Completed.");
+      else
+        $("#format").text("File is missing.");
+
       if( cfg["about"] )
         $("#about").text("Completed.");
       else

html/upload.min.htm

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/upload.htm">Beer Gravity Monitor - Missing html files</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">The listed files below needs to be uploaded to the FileSystem in order for the GUI to work. You can also flash the LittleFS filesystem but in that case you will loose your device settings. An OTA upgrade will automatically download the files if they are found in the same location as the firmware.bin. This page is a fallback option.</div><div class="col-md-8 themed-grid-col bg-light"><br><strong>Once all the files are confirmed, please reboot the device for normal operation.</strong></div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">index.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="index">Checking...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">device.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="device">Checking...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">config.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="config">Checking...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">calibration.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="calibration">Checking...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">about.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="about">Checking...</div></div><div class="row mb-3"><form action="/api/upload" method="post" enctype="multipart/form-data"><div class="col-md-8 custom-file"><input type="file" class="custom-file-input" name="name" id="name"> <label class="custom-file-label" for="name">Choose file</label></div><button type="submit" class="btn btn-primary" id="upload-btn" value="upload">Upload</button></form></div><hr class="my-4"></div><script type="text/javascript">function getUpload(){var i="/api/upload";$("#spinner").show(),$.getJSON(i,function(i){console.log(i),i.index?$("#index").text("Completed."):$("#index").text("File is missing."),i.device?$("#device").text("Completed."):$("#device").text("File is missing."),i.config?$("#config").text("Completed."):$("#config").text("File is missing."),i.calibration?$("#calibration").text("Completed."):$("#calibration").text("File is missing."),i.about?$("#about").text("Completed."):$("#about").text("File is missing.")}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}window.onload=getUpload,$(".custom-file-input").on("change",function(){var i=$(this).val().split("\\").pop();$(this).siblings(".custom-file-label").addClass("selected").html(i)})</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="description" content=""><title>Beer Gravity Monitor</title><link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script></head><body class="py-4"><!-- START MENU --><nav class="navbar navbar-expand-sm navbar-dark bg-primary"><a class="navbar-brand" href="/upload.htm">Beer Gravity Monitor - Missing html files</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbar"><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container"><hr class="my-4"><div class="alert alert-success alert-dismissible fade hide show d-none" role="alert" id="alert"><div id="alert-msg">...</div><button type="button" id="alert-btn" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><script type="text/javascript">function showError(s){$(".alert").removeClass("alert-success").addClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}function showSuccess(s){$(".alert").addClass("alert-success").removeClass("alert-danger").removeClass("d-none").addClass("show"),$("#alert-msg").text(s)}$("#alert-btn").click(function(s){$(".alert").addClass("d-none").removeClass("show")})</script><div class="row mb-3"><div class="col-md-8 themed-grid-col bg-light">The listed files below needs to be uploaded to the FileSystem in order for the GUI to work. You can also flash the LittleFS filesystem but in that case you will loose your device settings. An OTA upgrade will automatically download the files if they are found in the same location as the firmware.bin. This page is a fallback option.</div><div class="col-md-8 themed-grid-col bg-light"><br><strong>Once all the files are confirmed, please reboot the device for normal operation.</strong></div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">index.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="index">Checking...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">device.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="device">Checking...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">config.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="config">Checking...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">calibration.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="calibration">Checking...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">format.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="format">Checking...</div></div><div class="row mb-3"><div class="col-md-2 themed-grid-col bg-light">about.min.htm</div><div class="col-md-6 themed-grid-col bg-light" id="about">Checking...</div></div><div class="row mb-3"><form action="/api/upload" method="post" enctype="multipart/form-data"><div class="col-md-8 custom-file"><input type="file" class="custom-file-input" name="name" id="name"> <label class="custom-file-label" for="name">Choose file</label></div><button type="submit" class="btn btn-primary" id="upload-btn" value="upload">Upload</button></form></div><hr class="my-4"></div><script type="text/javascript">function getUpload(){var i="/api/upload";$("#spinner").show(),$.getJSON(i,function(i){console.log(i),i.index?$("#index").text("Completed."):$("#index").text("File is missing."),i.device?$("#device").text("Completed."):$("#device").text("File is missing."),i.config?$("#config").text("Completed."):$("#config").text("File is missing."),i.calibration?$("#calibration").text("Completed."):$("#calibration").text("File is missing."),i.format?$("#format").text("Completed."):$("#format").text("File is missing."),i.about?$("#about").text("Completed."):$("#about").text("File is missing.")}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})}window.onload=getUpload,$(".custom-file-input").on("change",function(){var i=$(this).val().split("\\").pop();$(this).siblings(".custom-file-label").addClass("selected").html(i)})</script><!-- START FOOTER --><div class="container-fluid themed-container bg-primary text-light">(C) Copyright 2021-22 Magnus Persson</div></body></html>

lib/Arduino-Temperature-Control-Library/DallasTemperature.h

@@ -0,0 +1,323 @@
+#ifndef DallasTemperature_h
+#define DallasTemperature_h
+
+#define DALLASTEMPLIBVERSION "3.8.1" // To be deprecated -> TODO remove in 4.0.0
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// set to true to include code for new and delete operators
+#ifndef REQUIRESNEW
+#define REQUIRESNEW false
+#endif
+
+// set to true to include code implementing alarm search functions
+#ifndef REQUIRESALARMS
+#define REQUIRESALARMS true
+#endif
+
+#include <inttypes.h>
+#ifdef __STM32F1__
+#include <OneWireSTM.h>
+#else
+#include <OneWire.h>
+#endif
+
+// Model IDs
+#define DS18S20MODEL 0x10  // also DS1820
+#define DS18B20MODEL 0x28  // also MAX31820
+#define DS1822MODEL  0x22
+#define DS1825MODEL  0x3B
+#define DS28EA00MODEL 0x42
+
+// Error Codes
+#define DEVICE_DISCONNECTED_C -127
+#define DEVICE_DISCONNECTED_F -196.6
+#define DEVICE_DISCONNECTED_RAW -7040
+
+// For readPowerSupply on oneWire bus
+// definition of nullptr for C++ < 11, using official workaround:
+// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf
+#if __cplusplus < 201103L
+const class
+{
+public:
+	template <class T>
+	operator T *() const
+	{
+		return 0;
+	}
+	template <class C, class T>
+	operator T C::*() const
+	{
+		return 0;
+	}
+
+private:
+	void operator&() const;
+} nullptr = {};
+#endif
+
+typedef uint8_t DeviceAddress[8];
+
+class DallasTemperature {
+public:
+
+	DallasTemperature();
+	DallasTemperature(OneWire*);
+	DallasTemperature(OneWire*, uint8_t);
+
+	void setOneWire(OneWire*);
+
+    void setPullupPin(uint8_t);
+
+	// initialise bus
+	void begin(void);
+
+	// returns the number of devices found on the bus
+	uint8_t getDeviceCount(void);
+
+	// returns the number of DS18xxx Family devices on bus
+	uint8_t getDS18Count(void);
+
+	// returns true if address is valid
+	bool validAddress(const uint8_t*);
+
+	// returns true if address is of the family of sensors the lib supports.
+	bool validFamily(const uint8_t* deviceAddress);
+
+	// finds an address at a given index on the bus
+	bool getAddress(uint8_t*, uint8_t);
+
+	// attempt to determine if the device at the given address is connected to the bus
+	bool isConnected(const uint8_t*);
+
+	// attempt to determine if the device at the given address is connected to the bus
+	// also allows for updating the read scratchpad
+	bool isConnected(const uint8_t*, uint8_t*);
+
+	// read device's scratchpad
+	bool readScratchPad(const uint8_t*, uint8_t*);
+
+	// write device's scratchpad
+	void writeScratchPad(const uint8_t*, const uint8_t*);
+
+	// read device's power requirements
+	bool readPowerSupply(const uint8_t* deviceAddress = nullptr);
+
+	// get global resolution
+	uint8_t getResolution();
+
+	// set global resolution to 9, 10, 11, or 12 bits
+	void setResolution(uint8_t);
+
+	// returns the device resolution: 9, 10, 11, or 12 bits
+	uint8_t getResolution(const uint8_t*);
+
+	// set resolution of a device to 9, 10, 11, or 12 bits
+	bool setResolution(const uint8_t*, uint8_t,
+			bool skipGlobalBitResolutionCalculation = false);
+
+	// sets/gets the waitForConversion flag
+	void setWaitForConversion(bool);
+	bool getWaitForConversion(void);
+
+	// sets/gets the checkForConversion flag
+	void setCheckForConversion(bool);
+	bool getCheckForConversion(void);
+
+	// sends command for all devices on the bus to perform a temperature conversion
+	void requestTemperatures(void);
+
+	// sends command for one device to perform a temperature conversion by address
+	bool requestTemperaturesByAddress(const uint8_t*);
+
+	// sends command for one device to perform a temperature conversion by index
+	bool requestTemperaturesByIndex(uint8_t);
+
+	// returns temperature raw value (12 bit integer of 1/128 degrees C)
+	int16_t getTemp(const uint8_t*);
+
+	// returns temperature in degrees C
+	float getTempC(const uint8_t*);
+
+	// returns temperature in degrees F
+	float getTempF(const uint8_t*);
+
+	// Get temperature for device index (slow)
+	float getTempCByIndex(uint8_t);
+
+	// Get temperature for device index (slow)
+	float getTempFByIndex(uint8_t);
+
+	// returns true if the bus requires parasite power
+	bool isParasitePowerMode(void);
+
+	// Is a conversion complete on the wire? Only applies to the first sensor on the wire.
+	bool isConversionComplete(void);
+
+  static uint16_t millisToWaitForConversion(uint8_t);
+  
+  uint16_t millisToWaitForConversion();
+  
+  // Sends command to one device to save values from scratchpad to EEPROM by index
+  // Returns true if no errors were encountered, false indicates failure
+  bool saveScratchPadByIndex(uint8_t);
+  
+  // Sends command to one or more devices to save values from scratchpad to EEPROM
+  // Returns true if no errors were encountered, false indicates failure
+  bool saveScratchPad(const uint8_t* = nullptr);
+  
+  // Sends command to one device to recall values from EEPROM to scratchpad by index
+  // Returns true if no errors were encountered, false indicates failure
+  bool recallScratchPadByIndex(uint8_t);
+  
+  // Sends command to one or more devices to recall values from EEPROM to scratchpad
+  // Returns true if no errors were encountered, false indicates failure
+  bool recallScratchPad(const uint8_t* = nullptr);
+  
+  // Sets the autoSaveScratchPad flag
+  void setAutoSaveScratchPad(bool);
+  
+  // Gets the autoSaveScratchPad flag
+  bool getAutoSaveScratchPad(void);
+
+#if REQUIRESALARMS
+
+	typedef void AlarmHandler(const uint8_t*);
+
+	// sets the high alarm temperature for a device
+	// accepts a int8_t.  valid range is -55C - 125C
+	void setHighAlarmTemp(const uint8_t*, int8_t);
+
+	// sets the low alarm temperature for a device
+	// accepts a int8_t.  valid range is -55C - 125C
+	void setLowAlarmTemp(const uint8_t*, int8_t);
+
+	// returns a int8_t with the current high alarm temperature for a device
+	// in the range -55C - 125C
+	int8_t getHighAlarmTemp(const uint8_t*);
+
+	// returns a int8_t with the current low alarm temperature for a device
+	// in the range -55C - 125C
+	int8_t getLowAlarmTemp(const uint8_t*);
+
+	// resets internal variables used for the alarm search
+	void resetAlarmSearch(void);
+
+	// search the wire for devices with active alarms
+	bool alarmSearch(uint8_t*);
+
+	// returns true if ia specific device has an alarm
+	bool hasAlarm(const uint8_t*);
+
+	// returns true if any device is reporting an alarm on the bus
+	bool hasAlarm(void);
+
+	// runs the alarm handler for all devices returned by alarmSearch()
+	void processAlarms(void);
+
+	// sets the alarm handler
+	void setAlarmHandler(const AlarmHandler *);
+
+	// returns true if an AlarmHandler has been set
+	bool hasAlarmHandler();
+
+#endif
+
+	// if no alarm handler is used the two bytes can be used as user data
+	// example of such usage is an ID.
+	// note if device is not connected it will fail writing the data.
+	// note if address cannot be found no error will be reported.
+	// in short use carefully
+	void setUserData(const uint8_t*, int16_t);
+	void setUserDataByIndex(uint8_t, int16_t);
+	int16_t getUserData(const uint8_t*);
+	int16_t getUserDataByIndex(uint8_t);
+
+	// convert from Celsius to Fahrenheit
+	static float toFahrenheit(float);
+
+	// convert from Fahrenheit to Celsius
+	static float toCelsius(float);
+
+	// convert from raw to Celsius
+	static float rawToCelsius(int16_t);
+
+    // convert from Celsius to raw
+	static int16_t celsiusToRaw(float);
+
+	// convert from raw to Fahrenheit
+	static float rawToFahrenheit(int16_t);
+
+#if REQUIRESNEW
+
+	// initialize memory area
+	void* operator new (unsigned int);
+
+	// delete memory reference
+	void operator delete(void*);
+
+#endif
+
+	void blockTillConversionComplete(uint8_t);
+
+private:
+	typedef uint8_t ScratchPad[9];
+
+	// parasite power on or off
+	bool parasite;
+
+	// external pullup
+	bool useExternalPullup;
+	uint8_t pullupPin;
+
+	// used to determine the delay amount needed to allow for the
+	// temperature conversion to take place
+	uint8_t bitResolution;
+
+	// used to requestTemperature with or without delay
+	bool waitForConversion;
+
+	// used to requestTemperature to dynamically check if a conversion is complete
+	bool checkForConversion;
+
+  // used to determine if values will be saved from scratchpad to EEPROM on every scratchpad write
+  bool autoSaveScratchPad;
+
+	// count of devices on the bus
+	uint8_t devices;
+
+	// count of DS18xxx Family devices on bus
+	uint8_t ds18Count;
+
+	// Take a pointer to one wire instance
+	OneWire* _wire;
+
+	// reads scratchpad and returns the raw temperature
+	int16_t calculateTemperature(const uint8_t*, uint8_t*);
+
+
+	// Returns true if all bytes of scratchPad are '\0'
+	bool isAllZeros(const uint8_t* const scratchPad, const size_t length = 9);
+
+    // External pullup control
+    void activateExternalPullup(void);
+    void deactivateExternalPullup(void);
+
+#if REQUIRESALARMS
+
+	// required for alarmSearch
+	uint8_t alarmSearchAddress[8];
+	int8_t alarmSearchJunction;
+	uint8_t alarmSearchExhausted;
+
+	// the alarm handler function pointer
+	AlarmHandler *_AlarmHandler;
+
+#endif
+
+};
+#endif

lib/OneWire/OneWire.cpp

@@ -0,0 +1,588 @@
+/*
+Copyright (c) 2007, Jim Studt  (original old version - many contributors since)
+
+The latest version of this library may be found at:
+  http://www.pjrc.com/teensy/td_libs_OneWire.html
+
+OneWire has been maintained by Paul Stoffregen (paul@pjrc.com) since
+January 2010.
+
+DO NOT EMAIL for technical support, especially not for ESP chips!
+All project support questions must be posted on public forums
+relevant to the board or chips used.  If using Arduino, post on
+Arduino's forum.  If using ESP, post on the ESP community forums.
+There is ABSOLUTELY NO TECH SUPPORT BY PRIVATE EMAIL!
+
+Github's issue tracker for OneWire should be used only to report
+specific bugs.  DO NOT request project support via Github.  All
+project and tech support questions must be posted on forums, not
+github issues.  If you experience a problem and you are not
+absolutely sure it's an issue with the library, ask on a forum
+first.  Only use github to report issues after experts have
+confirmed the issue is with OneWire rather than your project.
+
+Back in 2010, OneWire was in need of many bug fixes, but had
+been abandoned the original author (Jim Studt).  None of the known
+contributors were interested in maintaining OneWire.  Paul typically
+works on OneWire every 6 to 12 months.  Patches usually wait that
+long.  If anyone is interested in more actively maintaining OneWire,
+please contact Paul (this is pretty much the only reason to use
+private email about OneWire).
+
+OneWire is now very mature code.  No changes other than adding
+definitions for newer hardware support are anticipated.
+
+Version 2.3:
+  Unknown chip fallback mode, Roger Clark
+  Teensy-LC compatibility, Paul Stoffregen
+  Search bug fix, Love Nystrom
+
+Version 2.2:
+  Teensy 3.0 compatibility, Paul Stoffregen, paul@pjrc.com
+  Arduino Due compatibility, http://arduino.cc/forum/index.php?topic=141030
+  Fix DS18B20 example negative temperature
+  Fix DS18B20 example's low res modes, Ken Butcher
+  Improve reset timing, Mark Tillotson
+  Add const qualifiers, Bertrik Sikken
+  Add initial value input to crc16, Bertrik Sikken
+  Add target_search() function, Scott Roberts
+
+Version 2.1:
+  Arduino 1.0 compatibility, Paul Stoffregen
+  Improve temperature example, Paul Stoffregen
+  DS250x_PROM example, Guillermo Lovato
+  PIC32 (chipKit) compatibility, Jason Dangel, dangel.jason AT gmail.com
+  Improvements from Glenn Trewitt:
+  - crc16() now works
+  - check_crc16() does all of calculation/checking work.
+  - Added read_bytes() and write_bytes(), to reduce tedious loops.
+  - Added ds2408 example.
+  Delete very old, out-of-date readme file (info is here)
+
+Version 2.0: Modifications by Paul Stoffregen, January 2010:
+http://www.pjrc.com/teensy/td_libs_OneWire.html
+  Search fix from Robin James
+    http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295/27#27
+  Use direct optimized I/O in all cases
+  Disable interrupts during timing critical sections
+    (this solves many random communication errors)
+  Disable interrupts during read-modify-write I/O
+  Reduce RAM consumption by eliminating unnecessary
+    variables and trimming many to 8 bits
+  Optimize both crc8 - table version moved to flash
+
+Modified to work with larger numbers of devices - avoids loop.
+Tested in Arduino 11 alpha with 12 sensors.
+26 Sept 2008 -- Robin James
+http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295/27#27
+
+Updated to work with arduino-0008 and to include skip() as of
+2007/07/06. --RJL20
+
+Modified to calculate the 8-bit CRC directly, avoiding the need for
+the 256-byte lookup table to be loaded in RAM.  Tested in arduino-0010
+-- Tom Pollard, Jan 23, 2008
+
+Jim Studt's original library was modified by Josh Larios.
+
+Tom Pollard, pollard@alum.mit.edu, contributed around May 20, 2008
+
+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 above 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.
+
+Much of the code was inspired by Derek Yerger's code, though I don't
+think much of that remains.  In any event that was..
+    (copyleft) 2006 by Derek Yerger - Free to distribute freely.
+
+The CRC code was excerpted and inspired by the Dallas Semiconductor
+sample code bearing this copyright.
+//---------------------------------------------------------------------------
+// Copyright (C) 2000 Dallas Semiconductor Corporation, All Rights Reserved.
+//
+// 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 above 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 DALLAS SEMICONDUCTOR 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.
+//
+// Except as contained in this notice, the name of Dallas Semiconductor
+// shall not be used except as stated in the Dallas Semiconductor
+// Branding Policy.
+//--------------------------------------------------------------------------
+*/
+
+#include <Arduino.h>
+#include "OneWire.h"
+#include "util/OneWire_direct_gpio.h"
+
+
+void OneWire::begin(uint8_t pin)
+{
+	pinMode(pin, INPUT);
+	bitmask = PIN_TO_BITMASK(pin);
+	baseReg = PIN_TO_BASEREG(pin);
+#if ONEWIRE_SEARCH
+	reset_search();
+#endif
+}
+
+
+// Perform the onewire reset function.  We will wait up to 250uS for
+// the bus to come high, if it doesn't then it is broken or shorted
+// and we return a 0;
+//
+// Returns 1 if a device asserted a presence pulse, 0 otherwise.
+//
+uint8_t OneWire::reset(void)
+{
+	IO_REG_TYPE mask IO_REG_MASK_ATTR = bitmask;
+	volatile IO_REG_TYPE *reg IO_REG_BASE_ATTR = baseReg;
+	uint8_t r;
+	uint8_t retries = 125;
+
+	noInterrupts();
+	DIRECT_MODE_INPUT(reg, mask);
+	interrupts();
+	// wait until the wire is high... just in case
+	do {
+		if (--retries == 0) return 0;
+		delayMicroseconds(2);
+	} while ( !DIRECT_READ(reg, mask));
+
+	noInterrupts();
+	DIRECT_WRITE_LOW(reg, mask);
+	DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+	interrupts();
+	delayMicroseconds(480);
+	noInterrupts();
+	DIRECT_MODE_INPUT(reg, mask);	// allow it to float
+	delayMicroseconds(70);
+	r = !DIRECT_READ(reg, mask);
+	interrupts();
+	delayMicroseconds(410);
+	return r;
+}
+
+//
+// Write a bit. Port and bit is used to cut lookup time and provide
+// more certain timing.
+//
+#if defined(ARDUINO_ARCH_ESP32)
+void IRAM_ATTR OneWire::write_bit(uint8_t v)
+#else
+void OneWire::write_bit(uint8_t v)
+#endif
+{
+	IO_REG_TYPE mask IO_REG_MASK_ATTR = bitmask;
+	volatile IO_REG_TYPE *reg IO_REG_BASE_ATTR = baseReg;
+
+	if (v & 1) {
+		noInterrupts();
+		DIRECT_WRITE_LOW(reg, mask);
+		DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+		delayMicroseconds(10);
+		DIRECT_WRITE_HIGH(reg, mask);	// drive output high
+		interrupts();
+		delayMicroseconds(55);
+	} else {
+		noInterrupts();
+		DIRECT_WRITE_LOW(reg, mask);
+		DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+		delayMicroseconds(65);
+		DIRECT_WRITE_HIGH(reg, mask);	// drive output high
+		interrupts();
+		delayMicroseconds(5);
+	}
+}
+
+//
+// Read a bit. Port and bit is used to cut lookup time and provide
+// more certain timing.
+//
+#if defined(ARDUINO_ARCH_ESP32)
+uint8_t IRAM_ATTR OneWire::read_bit(void)
+#else
+uint8_t OneWire::read_bit(void)
+#endif
+{
+	IO_REG_TYPE mask IO_REG_MASK_ATTR = bitmask;
+	volatile IO_REG_TYPE *reg IO_REG_BASE_ATTR = baseReg;
+	uint8_t r;
+
+	noInterrupts();
+	DIRECT_MODE_OUTPUT(reg, mask);
+	DIRECT_WRITE_LOW(reg, mask);
+	delayMicroseconds(3);
+	DIRECT_MODE_INPUT(reg, mask);	// let pin float, pull up will raise
+	delayMicroseconds(10);
+	r = DIRECT_READ(reg, mask);
+	interrupts();
+	delayMicroseconds(53);
+	return r;
+}
+
+//
+// Write a byte. The writing code uses the active drivers to raise the
+// pin high, if you need power after the write (e.g. DS18S20 in
+// parasite power mode) then set 'power' to 1, otherwise the pin will
+// go tri-state at the end of the write to avoid heating in a short or
+// other mishap.
+//
+void OneWire::write(uint8_t v, uint8_t power /* = 0 */) {
+    uint8_t bitMask;
+
+    for (bitMask = 0x01; bitMask; bitMask <<= 1) {
+	OneWire::write_bit( (bitMask & v)?1:0);
+    }
+    if ( !power) {
+	noInterrupts();
+	DIRECT_MODE_INPUT(baseReg, bitmask);
+	DIRECT_WRITE_LOW(baseReg, bitmask);
+	interrupts();
+    }
+}
+
+void OneWire::write_bytes(const uint8_t *buf, uint16_t count, bool power /* = 0 */) {
+  for (uint16_t i = 0 ; i < count ; i++)
+    write(buf[i]);
+  if (!power) {
+    noInterrupts();
+    DIRECT_MODE_INPUT(baseReg, bitmask);
+    DIRECT_WRITE_LOW(baseReg, bitmask);
+    interrupts();
+  }
+}
+
+//
+// Read a byte
+//
+uint8_t OneWire::read() {
+    uint8_t bitMask;
+    uint8_t r = 0;
+
+    for (bitMask = 0x01; bitMask; bitMask <<= 1) {
+	if ( OneWire::read_bit()) r |= bitMask;
+    }
+    return r;
+}
+
+void OneWire::read_bytes(uint8_t *buf, uint16_t count) {
+  for (uint16_t i = 0 ; i < count ; i++)
+    buf[i] = read();
+}
+
+//
+// Do a ROM select
+//
+void OneWire::select(const uint8_t rom[8])
+{
+    uint8_t i;
+
+    write(0x55);           // Choose ROM
+
+    for (i = 0; i < 8; i++) write(rom[i]);
+}
+
+//
+// Do a ROM skip
+//
+void OneWire::skip()
+{
+    write(0xCC);           // Skip ROM
+}
+
+void OneWire::depower()
+{
+	noInterrupts();
+	DIRECT_MODE_INPUT(baseReg, bitmask);
+	interrupts();
+}
+
+#if ONEWIRE_SEARCH
+
+//
+// You need to use this function to start a search again from the beginning.
+// You do not need to do it for the first search, though you could.
+//
+void OneWire::reset_search()
+{
+  // reset the search state
+  LastDiscrepancy = 0;
+  LastDeviceFlag = false;
+  LastFamilyDiscrepancy = 0;
+  for(int i = 7; ; i--) {
+    ROM_NO[i] = 0;
+    if ( i == 0) break;
+  }
+}
+
+// Setup the search to find the device type 'family_code' on the next call
+// to search(*newAddr) if it is present.
+//
+void OneWire::target_search(uint8_t family_code)
+{
+   // set the search state to find SearchFamily type devices
+   ROM_NO[0] = family_code;
+   for (uint8_t i = 1; i < 8; i++)
+      ROM_NO[i] = 0;
+   LastDiscrepancy = 64;
+   LastFamilyDiscrepancy = 0;
+   LastDeviceFlag = false;
+}
+
+//
+// Perform a search. If this function returns a '1' then it has
+// enumerated the next device and you may retrieve the ROM from the
+// OneWire::address variable. If there are no devices, no further
+// devices, or something horrible happens in the middle of the
+// enumeration then a 0 is returned.  If a new device is found then
+// its address is copied to newAddr.  Use OneWire::reset_search() to
+// start over.
+//
+// --- Replaced by the one from the Dallas Semiconductor web site ---
+//--------------------------------------------------------------------------
+// Perform the 1-Wire Search Algorithm on the 1-Wire bus using the existing
+// search state.
+// Return TRUE  : device found, ROM number in ROM_NO buffer
+//        FALSE : device not found, end of search
+//
+bool OneWire::search(uint8_t *newAddr, bool search_mode /* = true */)
+{
+   uint8_t id_bit_number;
+   uint8_t last_zero, rom_byte_number;
+   bool    search_result;
+   uint8_t id_bit, cmp_id_bit;
+
+   unsigned char rom_byte_mask, search_direction;
+
+   // initialize for search
+   id_bit_number = 1;
+   last_zero = 0;
+   rom_byte_number = 0;
+   rom_byte_mask = 1;
+   search_result = false;
+
+   // if the last call was not the last one
+   if (!LastDeviceFlag) {
+      // 1-Wire reset
+      if (!reset()) {
+         // reset the search
+         LastDiscrepancy = 0;
+         LastDeviceFlag = false;
+         LastFamilyDiscrepancy = 0;
+         return false;
+      }
+
+      // issue the search command
+      if (search_mode == true) {
+        write(0xF0);   // NORMAL SEARCH
+      } else {
+        write(0xEC);   // CONDITIONAL SEARCH
+      }
+
+      // loop to do the search
+      do
+      {
+         // read a bit and its complement
+         id_bit = read_bit();
+         cmp_id_bit = read_bit();
+
+         // check for no devices on 1-wire
+         if ((id_bit == 1) && (cmp_id_bit == 1)) {
+            break;
+         } else {
+            // all devices coupled have 0 or 1
+            if (id_bit != cmp_id_bit) {
+               search_direction = id_bit;  // bit write value for search
+            } else {
+               // if this discrepancy if before the Last Discrepancy
+               // on a previous next then pick the same as last time
+               if (id_bit_number < LastDiscrepancy) {
+                  search_direction = ((ROM_NO[rom_byte_number] & rom_byte_mask) > 0);
+               } else {
+                  // if equal to last pick 1, if not then pick 0
+                  search_direction = (id_bit_number == LastDiscrepancy);
+               }
+               // if 0 was picked then record its position in LastZero
+               if (search_direction == 0) {
+                  last_zero = id_bit_number;
+
+                  // check for Last discrepancy in family
+                  if (last_zero < 9)
+                     LastFamilyDiscrepancy = last_zero;
+               }
+            }
+
+            // set or clear the bit in the ROM byte rom_byte_number
+            // with mask rom_byte_mask
+            if (search_direction == 1)
+              ROM_NO[rom_byte_number] |= rom_byte_mask;
+            else
+              ROM_NO[rom_byte_number] &= ~rom_byte_mask;
+
+            // serial number search direction write bit
+            write_bit(search_direction);
+
+            // increment the byte counter id_bit_number
+            // and shift the mask rom_byte_mask
+            id_bit_number++;
+            rom_byte_mask <<= 1;
+
+            // if the mask is 0 then go to new SerialNum byte rom_byte_number and reset mask
+            if (rom_byte_mask == 0) {
+                rom_byte_number++;
+                rom_byte_mask = 1;
+            }
+         }
+      }
+      while(rom_byte_number < 8);  // loop until through all ROM bytes 0-7
+
+      // if the search was successful then
+      if (!(id_bit_number < 65)) {
+         // search successful so set LastDiscrepancy,LastDeviceFlag,search_result
+         LastDiscrepancy = last_zero;
+
+         // check for last device
+         if (LastDiscrepancy == 0) {
+            LastDeviceFlag = true;
+         }
+         search_result = true;
+      }
+   }
+
+   // if no device found then reset counters so next 'search' will be like a first
+   if (!search_result || !ROM_NO[0]) {
+      LastDiscrepancy = 0;
+      LastDeviceFlag = false;
+      LastFamilyDiscrepancy = 0;
+      search_result = false;
+   } else {
+      for (int i = 0; i < 8; i++) newAddr[i] = ROM_NO[i];
+   }
+   return search_result;
+  }
+
+#endif
+
+#if ONEWIRE_CRC
+// The 1-Wire CRC scheme is described in Maxim Application Note 27:
+// "Understanding and Using Cyclic Redundancy Checks with Maxim iButton Products"
+//
+
+#if ONEWIRE_CRC8_TABLE
+// Dow-CRC using polynomial X^8 + X^5 + X^4 + X^0
+// Tiny 2x16 entry CRC table created by Arjen Lentz
+// See http://lentz.com.au/blog/calculating-crc-with-a-tiny-32-entry-lookup-table
+static const uint8_t PROGMEM dscrc2x16_table[] = {
+	0x00, 0x5E, 0xBC, 0xE2, 0x61, 0x3F, 0xDD, 0x83,
+	0xC2, 0x9C, 0x7E, 0x20, 0xA3, 0xFD, 0x1F, 0x41,
+	0x00, 0x9D, 0x23, 0xBE, 0x46, 0xDB, 0x65, 0xF8,
+	0x8C, 0x11, 0xAF, 0x32, 0xCA, 0x57, 0xE9, 0x74
+};
+
+// Compute a Dallas Semiconductor 8 bit CRC. These show up in the ROM
+// and the registers.  (Use tiny 2x16 entry CRC table)
+uint8_t OneWire::crc8(const uint8_t *addr, uint8_t len)
+{
+	uint8_t crc = 0;
+
+	while (len--) {
+		crc = *addr++ ^ crc;  // just re-using crc as intermediate
+		crc = pgm_read_byte(dscrc2x16_table + (crc & 0x0f)) ^
+		pgm_read_byte(dscrc2x16_table + 16 + ((crc >> 4) & 0x0f));
+	}
+
+	return crc;
+}
+#else
+//
+// Compute a Dallas Semiconductor 8 bit CRC directly.
+// this is much slower, but a little smaller, than the lookup table.
+//
+uint8_t OneWire::crc8(const uint8_t *addr, uint8_t len)
+{
+	uint8_t crc = 0;
+
+	while (len--) {
+#if defined(__AVR__)
+		crc = _crc_ibutton_update(crc, *addr++);
+#else
+		uint8_t inbyte = *addr++;
+		for (uint8_t i = 8; i; i--) {
+			uint8_t mix = (crc ^ inbyte) & 0x01;
+			crc >>= 1;
+			if (mix) crc ^= 0x8C;
+			inbyte >>= 1;
+		}
+#endif
+	}
+	return crc;
+}
+#endif
+
+#if ONEWIRE_CRC16
+bool OneWire::check_crc16(const uint8_t* input, uint16_t len, const uint8_t* inverted_crc, uint16_t crc)
+{
+    crc = ~crc16(input, len, crc);
+    return (crc & 0xFF) == inverted_crc[0] && (crc >> 8) == inverted_crc[1];
+}
+
+uint16_t OneWire::crc16(const uint8_t* input, uint16_t len, uint16_t crc)
+{
+#if defined(__AVR__)
+    for (uint16_t i = 0 ; i < len ; i++) {
+        crc = _crc16_update(crc, input[i]);
+    }
+#else
+    static const uint8_t oddparity[16] =
+        { 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0 };
+
+    for (uint16_t i = 0 ; i < len ; i++) {
+      // Even though we're just copying a byte from the input,
+      // we'll be doing 16-bit computation with it.
+      uint16_t cdata = input[i];
+      cdata = (cdata ^ crc) & 0xff;
+      crc >>= 8;
+
+      if (oddparity[cdata & 0x0F] ^ oddparity[cdata >> 4])
+          crc ^= 0xC001;
+
+      cdata <<= 6;
+      crc ^= cdata;
+      cdata <<= 1;
+      crc ^= cdata;
+    }
+#endif
+    return crc;
+}
+#endif
+
+#endif

lib/OneWire/OneWire.h

@@ -0,0 +1,190 @@
+#ifndef OneWire_h
+#define OneWire_h
+
+#ifdef __cplusplus
+
+#include <stdint.h>
+
+#if defined(__AVR__)
+#include <util/crc16.h>
+#endif
+
+#if ARDUINO >= 100
+#include <Arduino.h>       // for delayMicroseconds, digitalPinToBitMask, etc
+#else
+#include "WProgram.h"      // for delayMicroseconds
+#include "pins_arduino.h"  // for digitalPinToBitMask, etc
+#endif
+
+// You can exclude certain features from OneWire.  In theory, this
+// might save some space.  In practice, the compiler automatically
+// removes unused code (technically, the linker, using -fdata-sections
+// and -ffunction-sections when compiling, and Wl,--gc-sections
+// when linking), so most of these will not result in any code size
+// reduction.  Well, unless you try to use the missing features
+// and redesign your program to not need them!  ONEWIRE_CRC8_TABLE
+// is the exception, because it selects a fast but large algorithm
+// or a small but slow algorithm.
+
+// you can exclude onewire_search by defining that to 0
+#ifndef ONEWIRE_SEARCH
+#define ONEWIRE_SEARCH 1
+#endif
+
+// You can exclude CRC checks altogether by defining this to 0
+#ifndef ONEWIRE_CRC
+#define ONEWIRE_CRC 1
+#endif
+
+// Select the table-lookup method of computing the 8-bit CRC
+// by setting this to 1.  The lookup table enlarges code size by
+// about 250 bytes.  It does NOT consume RAM (but did in very
+// old versions of OneWire).  If you disable this, a slower
+// but very compact algorithm is used.
+#ifndef ONEWIRE_CRC8_TABLE
+#define ONEWIRE_CRC8_TABLE 1
+#endif
+
+// You can allow 16-bit CRC checks by defining this to 1
+// (Note that ONEWIRE_CRC must also be 1.)
+#ifndef ONEWIRE_CRC16
+#define ONEWIRE_CRC16 1
+#endif
+
+// Board-specific macros for direct GPIO
+#include "util/OneWire_direct_regtype.h"
+
+class OneWire
+{
+  private:
+    IO_REG_TYPE bitmask;
+    volatile IO_REG_TYPE *baseReg;
+
+#if ONEWIRE_SEARCH
+    // global search state
+    unsigned char ROM_NO[8];
+    uint8_t LastDiscrepancy;
+    uint8_t LastFamilyDiscrepancy;
+    bool LastDeviceFlag;
+#endif
+
+  public:
+    OneWire() { }
+    OneWire(uint8_t pin) { begin(pin); }
+    void begin(uint8_t pin);
+
+    // Perform a 1-Wire reset cycle. Returns 1 if a device responds
+    // with a presence pulse.  Returns 0 if there is no device or the
+    // bus is shorted or otherwise held low for more than 250uS
+    uint8_t reset(void);
+
+    // Issue a 1-Wire rom select command, you do the reset first.
+    void select(const uint8_t rom[8]);
+
+    // Issue a 1-Wire rom skip command, to address all on bus.
+    void skip(void);
+
+    // Write a byte. If 'power' is one then the wire is held high at
+    // the end for parasitically powered devices. You are responsible
+    // for eventually depowering it by calling depower() or doing
+    // another read or write.
+    void write(uint8_t v, uint8_t power = 0);
+
+    void write_bytes(const uint8_t *buf, uint16_t count, bool power = 0);
+
+    // Read a byte.
+    uint8_t read(void);
+
+    void read_bytes(uint8_t *buf, uint16_t count);
+
+    // Write a bit. The bus is always left powered at the end, see
+    // note in write() about that.
+    #if defined (ARDUINO_ARCH_ESP32)
+    void IRAM_ATTR write_bit(uint8_t v);
+    #else
+    void write_bit(uint8_t v);
+    #endif
+
+    // Read a bit.
+    #if defined (ARDUINO_ARCH_ESP32)
+    uint8_t IRAM_ATTR read_bit(void);
+    #else
+    uint8_t read_bit(void);
+    #endif
+
+    // Stop forcing power onto the bus. You only need to do this if
+    // you used the 'power' flag to write() or used a write_bit() call
+    // and aren't about to do another read or write. You would rather
+    // not leave this powered if you don't have to, just in case
+    // someone shorts your bus.
+    void depower(void);
+
+#if ONEWIRE_SEARCH
+    // Clear the search state so that if will start from the beginning again.
+    void reset_search();
+
+    // Setup the search to find the device type 'family_code' on the next call
+    // to search(*newAddr) if it is present.
+    void target_search(uint8_t family_code);
+
+    // Look for the next device. Returns 1 if a new address has been
+    // returned. A zero might mean that the bus is shorted, there are
+    // no devices, or you have already retrieved all of them.  It
+    // might be a good idea to check the CRC to make sure you didn't
+    // get garbage.  The order is deterministic. You will always get
+    // the same devices in the same order.
+    bool search(uint8_t *newAddr, bool search_mode = true);
+#endif
+
+#if ONEWIRE_CRC
+    // Compute a Dallas Semiconductor 8 bit CRC, these are used in the
+    // ROM and scratchpad registers.
+    static uint8_t crc8(const uint8_t *addr, uint8_t len);
+
+#if ONEWIRE_CRC16
+    // Compute the 1-Wire CRC16 and compare it against the received CRC.
+    // Example usage (reading a DS2408):
+    //    // Put everything in a buffer so we can compute the CRC easily.
+    //    uint8_t buf[13];
+    //    buf[0] = 0xF0;    // Read PIO Registers
+    //    buf[1] = 0x88;    // LSB address
+    //    buf[2] = 0x00;    // MSB address
+    //    WriteBytes(net, buf, 3);    // Write 3 cmd bytes
+    //    ReadBytes(net, buf+3, 10);  // Read 6 data bytes, 2 0xFF, 2 CRC16
+    //    if (!CheckCRC16(buf, 11, &buf[11])) {
+    //        // Handle error.
+    //    }     
+    //          
+    // @param input - Array of bytes to checksum.
+    // @param len - How many bytes to use.
+    // @param inverted_crc - The two CRC16 bytes in the received data.
+    //                       This should just point into the received data,
+    //                       *not* at a 16-bit integer.
+    // @param crc - The crc starting value (optional)
+    // @return True, iff the CRC matches.
+    static bool check_crc16(const uint8_t* input, uint16_t len, const uint8_t* inverted_crc, uint16_t crc = 0);
+
+    // Compute a Dallas Semiconductor 16 bit CRC.  This is required to check
+    // the integrity of data received from many 1-Wire devices.  Note that the
+    // CRC computed here is *not* what you'll get from the 1-Wire network,
+    // for two reasons:
+    //   1) The CRC is transmitted bitwise inverted.
+    //   2) Depending on the endian-ness of your processor, the binary
+    //      representation of the two-byte return value may have a different
+    //      byte order than the two bytes you get from 1-Wire.
+    // @param input - Array of bytes to checksum.
+    // @param len - How many bytes to use.
+    // @param crc - The crc starting value (optional)
+    // @return The CRC16, as defined by Dallas Semiconductor.
+    static uint16_t crc16(const uint8_t* input, uint16_t len, uint16_t crc = 0);
+#endif
+#endif
+};
+
+// Prevent this name from leaking into Arduino sketches
+#ifdef IO_REG_TYPE
+#undef IO_REG_TYPE
+#endif
+
+#endif // __cplusplus
+#endif // OneWire_h

lib/OneWire/util/OneWire_direct_gpio.h

@@ -0,0 +1,463 @@
+#ifndef OneWire_Direct_GPIO_h
+#define OneWire_Direct_GPIO_h
+
+// This header should ONLY be included by OneWire.cpp.  These defines are
+// meant to be private, used within OneWire.cpp, but not exposed to Arduino
+// sketches or other libraries which may include OneWire.h.
+
+#include <stdint.h>
+
+// Platform specific I/O definitions
+
+#if defined(__AVR__)
+#define PIN_TO_BASEREG(pin)             (portInputRegister(digitalPinToPort(pin)))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint8_t
+#define IO_REG_BASE_ATTR asm("r30")
+#define IO_REG_MASK_ATTR
+#if defined(__AVR_ATmega4809__)
+#define DIRECT_READ(base, mask)         (((*(base)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)-8)) &= ~(mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)-8)) |= (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)-4)) &= ~(mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)-4)) |= (mask))
+#else
+#define DIRECT_READ(base, mask)         (((*(base)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+1)) &= ~(mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+1)) |= (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+2)) &= ~(mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+2)) |= (mask))
+#endif
+
+#elif defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__) || defined(__MK64FX512__)
+#define PIN_TO_BASEREG(pin)             (portOutputRegister(pin))
+#define PIN_TO_BITMASK(pin)             (1)
+#define IO_REG_TYPE uint8_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR __attribute__ ((unused))
+#define DIRECT_READ(base, mask)         (*((base)+512))
+#define DIRECT_MODE_INPUT(base, mask)   (*((base)+640) = 0)
+#define DIRECT_MODE_OUTPUT(base, mask)  (*((base)+640) = 1)
+#define DIRECT_WRITE_LOW(base, mask)    (*((base)+256) = 1)
+#define DIRECT_WRITE_HIGH(base, mask)   (*((base)+128) = 1)
+
+#elif defined(__MKL26Z64__)
+#define PIN_TO_BASEREG(pin)             (portOutputRegister(pin))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint8_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, mask)         ((*((base)+16) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   (*((base)+20) &= ~(mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  (*((base)+20) |= (mask))
+#define DIRECT_WRITE_LOW(base, mask)    (*((base)+8) = (mask))
+#define DIRECT_WRITE_HIGH(base, mask)   (*((base)+4) = (mask))
+
+#elif defined(__IMXRT1052__) || defined(__IMXRT1062__)
+#define PIN_TO_BASEREG(pin)             (portOutputRegister(pin))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, mask)         ((*((base)+2) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   (*((base)+1) &= ~(mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  (*((base)+1) |= (mask))
+#define DIRECT_WRITE_LOW(base, mask)    (*((base)+34) = (mask))
+#define DIRECT_WRITE_HIGH(base, mask)   (*((base)+33) = (mask))
+
+#elif defined(__SAM3X8E__) || defined(__SAM3A8C__) || defined(__SAM3A4C__)
+// Arduino 1.5.1 may have a bug in delayMicroseconds() on Arduino Due.
+// http://arduino.cc/forum/index.php/topic,141030.msg1076268.html#msg1076268
+// If you have trouble with OneWire on Arduino Due, please check the
+// status of delayMicroseconds() before reporting a bug in OneWire!
+#define PIN_TO_BASEREG(pin)             (&(digitalPinToPort(pin)->PIO_PER))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, mask)         (((*((base)+15)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+5)) = (mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+4)) = (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+13)) = (mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+12)) = (mask))
+#ifndef PROGMEM
+#define PROGMEM
+#endif
+#ifndef pgm_read_byte
+#define pgm_read_byte(addr) (*(const uint8_t *)(addr))
+#endif
+
+#elif defined(__PIC32MX__)
+#define PIN_TO_BASEREG(pin)             (portModeRegister(digitalPinToPort(pin)))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, mask)         (((*(base+4)) & (mask)) ? 1 : 0)  //PORTX + 0x10
+#define DIRECT_MODE_INPUT(base, mask)   ((*(base+2)) = (mask))            //TRISXSET + 0x08
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*(base+1)) = (mask))            //TRISXCLR + 0x04
+#define DIRECT_WRITE_LOW(base, mask)    ((*(base+8+1)) = (mask))          //LATXCLR  + 0x24
+#define DIRECT_WRITE_HIGH(base, mask)   ((*(base+8+2)) = (mask))          //LATXSET + 0x28
+
+#elif defined(ARDUINO_ARCH_ESP8266)
+// Special note: I depend on the ESP community to maintain these definitions and
+// submit good pull requests.  I can not answer any ESP questions or help you
+// resolve any problems related to ESP chips.  Please do not contact me and please
+// DO NOT CREATE GITHUB ISSUES for ESP support.  All ESP questions must be asked
+// on ESP community forums.
+#define PIN_TO_BASEREG(pin)             ((volatile uint32_t*) GPO)
+#define PIN_TO_BITMASK(pin)             (1 << pin)
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, mask)         ((GPI & (mask)) ? 1 : 0)    //GPIO_IN_ADDRESS
+#define DIRECT_MODE_INPUT(base, mask)   (GPE &= ~(mask))            //GPIO_ENABLE_W1TC_ADDRESS
+#define DIRECT_MODE_OUTPUT(base, mask)  (GPE |= (mask))             //GPIO_ENABLE_W1TS_ADDRESS
+#define DIRECT_WRITE_LOW(base, mask)    (GPOC = (mask))             //GPIO_OUT_W1TC_ADDRESS
+#define DIRECT_WRITE_HIGH(base, mask)   (GPOS = (mask))             //GPIO_OUT_W1TS_ADDRESS
+
+#elif defined(ARDUINO_ARCH_ESP32)
+#include <driver/rtc_io.h>
+#define PIN_TO_BASEREG(pin)             (0)
+#define PIN_TO_BITMASK(pin)             (pin)
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+
+static inline __attribute__((always_inline))
+IO_REG_TYPE directRead(IO_REG_TYPE pin)
+{
+    if ( pin < 32 )
+        return (GPIO.in >> pin) & 0x1;
+    else if ( pin < 40 )
+        return (GPIO.in1.val >> (pin - 32)) & 0x1;
+
+    return 0;
+}
+
+static inline __attribute__((always_inline))
+void directWriteLow(IO_REG_TYPE pin)
+{
+    if ( pin < 32 )
+        GPIO.out_w1tc = ((uint32_t)1 << pin);
+    else if ( pin < 34 )
+        GPIO.out1_w1tc.val = ((uint32_t)1 << (pin - 32));
+}
+
+static inline __attribute__((always_inline))
+void directWriteHigh(IO_REG_TYPE pin)
+{
+    if ( pin < 32 )
+        GPIO.out_w1ts = ((uint32_t)1 << pin);
+    else if ( pin < 34 )
+        GPIO.out1_w1ts.val = ((uint32_t)1 << (pin - 32));
+}
+
+static inline __attribute__((always_inline))
+void directModeInput(IO_REG_TYPE pin)
+{
+    if ( digitalPinIsValid(pin) )
+    {
+        #if defined(ESP_ARDUINO_VERSION)
+        #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0)
+        int pin_io = rtc_io_number_get((gpio_num_t)pin);
+        uint32_t rtc_reg(rtc_io_desc[pin_io].reg);
+
+        if ( rtc_reg ) // RTC pins PULL settings
+        {
+            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin_io].mux);
+            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin_io].pullup | rtc_io_desc[pin_io].pulldown);
+        }
+        #endif
+        #else
+        uint32_t rtc_reg(rtc_gpio_desc[pin].reg);
+
+        if ( rtc_reg ) // RTC pins PULL settings
+        {
+            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].mux);
+            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].pullup | rtc_gpio_desc[pin].pulldown);
+        }
+        #endif
+
+        if ( pin < 32 )
+            GPIO.enable_w1tc = ((uint32_t)1 << pin);
+        else
+            GPIO.enable1_w1tc.val = ((uint32_t)1 << (pin - 32));
+
+        uint32_t pinFunction((uint32_t)2 << FUN_DRV_S); // what are the drivers?
+        pinFunction |= FUN_IE; // input enable but required for output as well?
+        pinFunction |= ((uint32_t)2 << MCU_SEL_S);
+
+        ESP_REG(DR_REG_IO_MUX_BASE + esp32_gpioMux[pin].reg) = pinFunction;
+
+        GPIO.pin[pin].val = 0;
+    }
+}
+
+static inline __attribute__((always_inline))
+void directModeOutput(IO_REG_TYPE pin)
+{
+    if ( digitalPinIsValid(pin) && pin <= 33 ) // pins above 33 can be only inputs
+    {
+        #if defined(ESP_ARDUINO_VERSION)
+        #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0)
+        int pin_io = rtc_io_number_get((gpio_num_t)pin);
+        uint32_t rtc_reg(rtc_io_desc[pin_io].reg);
+
+        if ( rtc_reg ) // RTC pins PULL settings
+        {
+            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin_io].mux);
+            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_io_desc[pin_io].pullup | rtc_io_desc[pin_io].pulldown);
+        }
+        #endif
+        #else
+        uint32_t rtc_reg(rtc_gpio_desc[pin].reg);
+
+        if ( rtc_reg ) // RTC pins PULL settings
+        {
+            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].mux);
+            ESP_REG(rtc_reg) = ESP_REG(rtc_reg) & ~(rtc_gpio_desc[pin].pullup | rtc_gpio_desc[pin].pulldown);
+        }
+        #endif
+
+        if ( pin < 32 )
+            GPIO.enable_w1ts = ((uint32_t)1 << pin);
+        else // already validated to pins <= 33
+            GPIO.enable1_w1ts.val = ((uint32_t)1 << (pin - 32));
+
+        uint32_t pinFunction((uint32_t)2 << FUN_DRV_S); // what are the drivers?
+        pinFunction |= FUN_IE; // input enable but required for output as well?
+        pinFunction |= ((uint32_t)2 << MCU_SEL_S);
+
+        ESP_REG(DR_REG_IO_MUX_BASE + esp32_gpioMux[pin].reg) = pinFunction;
+
+        GPIO.pin[pin].val = 0;
+    }
+}
+
+#define DIRECT_READ(base, pin)          directRead(pin)
+#define DIRECT_WRITE_LOW(base, pin)     directWriteLow(pin)
+#define DIRECT_WRITE_HIGH(base, pin)    directWriteHigh(pin)
+#define DIRECT_MODE_INPUT(base, pin)    directModeInput(pin)
+#define DIRECT_MODE_OUTPUT(base, pin)   directModeOutput(pin)
+// https://github.com/PaulStoffregen/OneWire/pull/47
+// https://github.com/stickbreaker/OneWire/commit/6eb7fc1c11a15b6ac8c60e5671cf36eb6829f82c
+#ifdef  interrupts
+#undef  interrupts
+#endif
+#ifdef  noInterrupts
+#undef  noInterrupts
+#endif
+#define noInterrupts() {portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED;portENTER_CRITICAL(&mux)
+#define interrupts() portEXIT_CRITICAL(&mux);}
+//#warning "ESP32 OneWire testing"
+
+#elif defined(ARDUINO_ARCH_STM32)
+#define PIN_TO_BASEREG(pin)             (0)
+#define PIN_TO_BITMASK(pin)             ((uint32_t)digitalPinToPinName(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, pin)          digitalReadFast((PinName)pin)
+#define DIRECT_WRITE_LOW(base, pin)     digitalWriteFast((PinName)pin, LOW)
+#define DIRECT_WRITE_HIGH(base, pin)    digitalWriteFast((PinName)pin, HIGH)
+#define DIRECT_MODE_INPUT(base, pin)    pin_function((PinName)pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0))
+#define DIRECT_MODE_OUTPUT(base, pin)   pin_function((PinName)pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0))
+
+#elif defined(__SAMD21G18A__)
+#define PIN_TO_BASEREG(pin)             portModeRegister(digitalPinToPort(pin))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, mask)         (((*((base)+8)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+1)) = (mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+2)) = (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+5)) = (mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+6)) = (mask))
+
+#elif defined(__ASR6501__)
+#define PIN_IN_PORT(pin)    (pin % PIN_NUMBER_IN_PORT)
+#define PORT_FROM_PIN(pin)  (pin / PIN_NUMBER_IN_PORT)
+#define PORT_OFFSET(port)   (PORT_REG_SHFIT * port)
+#define PORT_ADDRESS(pin)   (CYDEV_GPIO_BASE + PORT_OFFSET(PORT_FROM_PIN(pin)))
+
+#define PIN_TO_BASEREG(pin)             (0)
+#define PIN_TO_BITMASK(pin)             (pin)
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, pin)          CY_SYS_PINS_READ_PIN(PORT_ADDRESS(pin)+4, PIN_IN_PORT(pin))
+#define DIRECT_WRITE_LOW(base, pin)     CY_SYS_PINS_CLEAR_PIN(PORT_ADDRESS(pin), PIN_IN_PORT(pin))
+#define DIRECT_WRITE_HIGH(base, pin)    CY_SYS_PINS_SET_PIN(PORT_ADDRESS(pin), PIN_IN_PORT(pin))
+#define DIRECT_MODE_INPUT(base, pin)    CY_SYS_PINS_SET_DRIVE_MODE(PORT_ADDRESS(pin)+8, PIN_IN_PORT(pin), CY_SYS_PINS_DM_DIG_HIZ)
+#define DIRECT_MODE_OUTPUT(base, pin)   CY_SYS_PINS_SET_DRIVE_MODE(PORT_ADDRESS(pin)+8, PIN_IN_PORT(pin), CY_SYS_PINS_DM_STRONG)
+
+#elif defined(RBL_NRF51822)
+#define PIN_TO_BASEREG(pin)             (0)
+#define PIN_TO_BITMASK(pin)             (pin)
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, pin)          nrf_gpio_pin_read(pin)
+#define DIRECT_WRITE_LOW(base, pin)     nrf_gpio_pin_clear(pin)
+#define DIRECT_WRITE_HIGH(base, pin)    nrf_gpio_pin_set(pin)
+#define DIRECT_MODE_INPUT(base, pin)    nrf_gpio_cfg_input(pin, NRF_GPIO_PIN_NOPULL)
+#define DIRECT_MODE_OUTPUT(base, pin)   nrf_gpio_cfg_output(pin)
+
+#elif defined(__arc__) /* Arduino101/Genuino101 specifics */
+
+#include "scss_registers.h"
+#include "portable.h"
+#include "avr/pgmspace.h"
+
+#define GPIO_ID(pin)			(g_APinDescription[pin].ulGPIOId)
+#define GPIO_TYPE(pin)			(g_APinDescription[pin].ulGPIOType)
+#define GPIO_BASE(pin)			(g_APinDescription[pin].ulGPIOBase)
+#define DIR_OFFSET_SS			0x01
+#define DIR_OFFSET_SOC			0x04
+#define EXT_PORT_OFFSET_SS		0x0A
+#define EXT_PORT_OFFSET_SOC		0x50
+
+/* GPIO registers base address */
+#define PIN_TO_BASEREG(pin)		((volatile uint32_t *)g_APinDescription[pin].ulGPIOBase)
+#define PIN_TO_BITMASK(pin)		pin
+#define IO_REG_TYPE			uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+
+static inline __attribute__((always_inline))
+IO_REG_TYPE directRead(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    IO_REG_TYPE ret;
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        ret = READ_ARC_REG(((IO_REG_TYPE)base + EXT_PORT_OFFSET_SS));
+    } else {
+        ret = MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, EXT_PORT_OFFSET_SOC);
+    }
+    return ((ret >> GPIO_ID(pin)) & 0x01);
+}
+
+static inline __attribute__((always_inline))
+void directModeInput(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        WRITE_ARC_REG(READ_ARC_REG((((IO_REG_TYPE)base) + DIR_OFFSET_SS)) & ~(0x01 << GPIO_ID(pin)),
+			((IO_REG_TYPE)(base) + DIR_OFFSET_SS));
+    } else {
+        MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, DIR_OFFSET_SOC) &= ~(0x01 << GPIO_ID(pin));
+    }
+}
+
+static inline __attribute__((always_inline))
+void directModeOutput(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        WRITE_ARC_REG(READ_ARC_REG(((IO_REG_TYPE)(base) + DIR_OFFSET_SS)) | (0x01 << GPIO_ID(pin)),
+			((IO_REG_TYPE)(base) + DIR_OFFSET_SS));
+    } else {
+        MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, DIR_OFFSET_SOC) |= (0x01 << GPIO_ID(pin));
+    }
+}
+
+static inline __attribute__((always_inline))
+void directWriteLow(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        WRITE_ARC_REG(READ_ARC_REG(base) & ~(0x01 << GPIO_ID(pin)), base);
+    } else {
+        MMIO_REG_VAL(base) &= ~(0x01 << GPIO_ID(pin));
+    }
+}
+
+static inline __attribute__((always_inline))
+void directWriteHigh(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        WRITE_ARC_REG(READ_ARC_REG(base) | (0x01 << GPIO_ID(pin)), base);
+    } else {
+        MMIO_REG_VAL(base) |= (0x01 << GPIO_ID(pin));
+    }
+}
+
+#define DIRECT_READ(base, pin)		directRead(base, pin)
+#define DIRECT_MODE_INPUT(base, pin)	directModeInput(base, pin)
+#define DIRECT_MODE_OUTPUT(base, pin)	directModeOutput(base, pin)
+#define DIRECT_WRITE_LOW(base, pin)	directWriteLow(base, pin)
+#define DIRECT_WRITE_HIGH(base, pin)	directWriteHigh(base, pin)
+
+#elif defined(__riscv)
+
+/*
+ * Tested on highfive1
+ *
+ * Stable results are achieved operating in the
+ * two high speed modes of the highfive1.  It
+ * seems to be less reliable in slow mode.
+ */
+#define PIN_TO_BASEREG(pin)             (0)
+#define PIN_TO_BITMASK(pin)             digitalPinToBitMask(pin)
+#define IO_REG_TYPE uint32_t
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+
+static inline __attribute__((always_inline))
+IO_REG_TYPE directRead(IO_REG_TYPE mask)
+{
+    return ((GPIO_REG(GPIO_INPUT_VAL) & mask) != 0) ? 1 : 0;
+}
+
+static inline __attribute__((always_inline))
+void directModeInput(IO_REG_TYPE mask)
+{
+    GPIO_REG(GPIO_OUTPUT_XOR)  &= ~mask;
+    GPIO_REG(GPIO_IOF_EN)      &= ~mask;
+
+    GPIO_REG(GPIO_INPUT_EN)  |=  mask;
+    GPIO_REG(GPIO_OUTPUT_EN) &= ~mask;
+}
+
+static inline __attribute__((always_inline))
+void directModeOutput(IO_REG_TYPE mask)
+{
+    GPIO_REG(GPIO_OUTPUT_XOR)  &= ~mask;
+    GPIO_REG(GPIO_IOF_EN)      &= ~mask;
+
+    GPIO_REG(GPIO_INPUT_EN)  &= ~mask;
+    GPIO_REG(GPIO_OUTPUT_EN) |=  mask;
+}
+
+static inline __attribute__((always_inline))
+void directWriteLow(IO_REG_TYPE mask)
+{
+    GPIO_REG(GPIO_OUTPUT_VAL) &= ~mask;
+}
+
+static inline __attribute__((always_inline))
+void directWriteHigh(IO_REG_TYPE mask)
+{
+    GPIO_REG(GPIO_OUTPUT_VAL) |= mask;
+}
+
+#define DIRECT_READ(base, mask)          directRead(mask)
+#define DIRECT_WRITE_LOW(base, mask)     directWriteLow(mask)
+#define DIRECT_WRITE_HIGH(base, mask)    directWriteHigh(mask)
+#define DIRECT_MODE_INPUT(base, mask)    directModeInput(mask)
+#define DIRECT_MODE_OUTPUT(base, mask)   directModeOutput(mask)
+
+#else
+#define PIN_TO_BASEREG(pin)             (0)
+#define PIN_TO_BITMASK(pin)             (pin)
+#define IO_REG_TYPE unsigned int
+#define IO_REG_BASE_ATTR
+#define IO_REG_MASK_ATTR
+#define DIRECT_READ(base, pin)          digitalRead(pin)
+#define DIRECT_WRITE_LOW(base, pin)     digitalWrite(pin, LOW)
+#define DIRECT_WRITE_HIGH(base, pin)    digitalWrite(pin, HIGH)
+#define DIRECT_MODE_INPUT(base, pin)    pinMode(pin,INPUT)
+#define DIRECT_MODE_OUTPUT(base, pin)   pinMode(pin,OUTPUT)
+#warning "OneWire. Fallback mode. Using API calls for pinMode,digitalRead and digitalWrite. Operation of this library is not guaranteed on this architecture."
+
+#endif
+
+#endif

lib/OneWire/util/OneWire_direct_regtype.h

@@ -0,0 +1,55 @@
+#ifndef OneWire_Direct_RegType_h
+#define OneWire_Direct_RegType_h
+
+#include <stdint.h>
+
+// Platform specific I/O register type
+
+#if defined(__AVR__)
+#define IO_REG_TYPE uint8_t
+
+#elif defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__) || defined(__MK64FX512__)
+#define IO_REG_TYPE uint8_t
+
+#elif defined(__IMXRT1052__) || defined(__IMXRT1062__)
+#define IO_REG_TYPE uint32_t
+
+#elif defined(__MKL26Z64__)
+#define IO_REG_TYPE uint8_t
+
+#elif defined(__SAM3X8E__) || defined(__SAM3A8C__) || defined(__SAM3A4C__)
+#define IO_REG_TYPE uint32_t
+
+#elif defined(__PIC32MX__)
+#define IO_REG_TYPE uint32_t
+
+#elif defined(ARDUINO_ARCH_ESP8266)
+#define IO_REG_TYPE uint32_t
+
+#elif defined(ARDUINO_ARCH_ESP32)
+#define IO_REG_TYPE uint32_t
+#define IO_REG_MASK_ATTR
+
+#elif defined(ARDUINO_ARCH_STM32)
+#define IO_REG_TYPE uint32_t
+
+#elif defined(__SAMD21G18A__)
+#define IO_REG_TYPE uint32_t
+
+#elif defined(__ASR6501__)
+#define IO_REG_TYPE uint32_t
+
+#elif defined(RBL_NRF51822)
+#define IO_REG_TYPE uint32_t
+
+#elif defined(__arc__) /* Arduino101/Genuino101 specifics */
+#define IO_REG_TYPE uint32_t
+
+#elif defined(__riscv)
+#define IO_REG_TYPE uint32_t
+
+#else
+#define IO_REG_TYPE unsigned int
+
+#endif
+#endif

platformio.ini

@@ -27,30 +27,25 @@ build_flags =
 	#-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 CFG_DISABLE_LOGGING				# Turn off verbose logging for some of the parts (too much will cause a crash) but also add space
-  -D GYRO_DISABLE_LOGGING
-  -D PUSH_DISABLE_LOGGING
-  -D TSEN_DISABLE_LOGGING
-  -D WEB_DISABLE_LOGGING
-	-D MAIN_DISABLE_LOGGING
 	-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="\"0.6.0\""
+	-D CFG_APPVER="\"0.7.1\""
 lib_deps = # Switched to forks for better version control.
-	# Using local copy of this library
+	# Using local copy of these libraries
   #https://github.com/jrowberg/i2cdevlib.git#<document> 		
 	#https://github.com/khoih-prog/ESP_WiFiManager#<document>
 	#https://github.com/khoih-prog/ESP_DoubleResetDetector#<document>
+	#https://github.com/PaulStoffregen/OneWire
+	#https://github.com/milesburton/Arduino-Temperature-Control-Library
 	https://github.com/mp-se/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/OneWire#v2.3.6  												   		# https://github.com/PaulStoffregen/OneWire
-	https://github.com/mp-se/Arduino-Temperature-Control-Library#3.9.1  	# https://github.com/milesburton/Arduino-Temperature-Control-Library
 	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
 
@@ -65,20 +60,26 @@ extra_scripts =
 	script/create_versionjson.py
 build_unflags = 
 	${common_env_data.build_unflags}
-#	-D MAIN_DISABLE_LOGGING
-  -D WEB_DISABLE_LOGGING
-  -D PUSH_DISABLE_LOGGING
 build_flags = 
   ${common_env_data.build_flags}
-	-D PIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS
+	#-D PIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS
 	#-D SKIP_SLEEPMODE
-	-D DOUBLERESETDETECTOR_DEBUG=true
+	#-D DOUBLERESETDETECTOR_DEBUG=true
 	-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		# Using debug type crashes my devkit...
+#build_type = debug
 build_type = release
 board_build.filesystem = littlefs
 monitor_filters = esp8266_exception_decoder
@@ -114,10 +115,37 @@ extra_scripts =
 build_unflags = ${common_env_data.build_unflags}
 build_flags = 
     ${common_env_data.build_flags}
-	-D COLLECT_PERFDATA				# This option will collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb 
+	-D COLLECT_PERFDATA	
 	-D LOG_LEVEL=5
 lib_deps = 
 	${common_env_data.lib_deps}
 board = ${common_env_data.board}
 build_type = release
 board_build.filesystem = littlefs
+
+[env:gravity32-perf]
+framework = arduino
+# platformio only supports v1.0.6 of the esp32 libs.
+platform = espressif32
+# tasmota port of v2.0.2 
+#platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.1/platform-tasmota-espressif32-2.0.2.1.zip
+upload_speed = ${common_env_data.upload_speed}
+monitor_speed = ${common_env_data.monitor_speed}
+extra_scripts =  
+	script/copy_html.py
+	script/copy_firmware.py
+	script/create_versionjson.py
+build_unflags = 
+	${common_env_data.build_unflags}
+build_flags = 
+    ${common_env_data.build_flags}
+	-D COLLECT_PERFDATA	
+	-D LOG_LEVEL=5
+lib_deps = 
+	${common_env_data.lib_deps}
+board = nodemcu-32s
+build_type = release
+#build_type = debug
+#board_build.filesystem = littlefs 
+board_build.filesystem = spiffs 
+monitor_filters = esp32_exception_decoder

script/copy_firmware.py

@@ -18,6 +18,8 @@ def after_build(source, target, env):
         target = dir + "/bin/firmware.bin"
     if name == "gravity-perf" :
         target = dir + "/bin/firmware-perf.bin"
+    if name == "gravity32-perf" :
+        target = dir + "/bin/firmware32-perf.bin"
     print( "Copy file : " + source + " -> " + target )
     shutil.copyfile( source, target )
 

script/copy_html.py

@@ -26,3 +26,6 @@ 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 )

script/create_versionjson.py

@@ -42,13 +42,19 @@ def after_build(source, target, env):
     print( "Copy file : " + source + " -> " + target )
     shutil.copyfile( source, target )
 
+    # Copy file 6
+    source = dir + "/data/format.min.htm"
+    target = dir + "/bin/format.min.htm"
+    print( "Copy file : " + source + " -> " + target )
+    shutil.copyfile( source, target )
+
     target = dir + "/bin/version.json"
     ver = get_build_flag_value("CFG_APPVER")
 
     print( "Creating version.json" )
     f = open( target, "w" )
     f.write( "{ \"project\":\"gravmon\", \"version\":" + ver + ", " ) 
-    f.write( " \"html\": [ \"index.min.htm\", \"device.min.htm\", \"config.min.htm\", \"calibration.min.htm\", \"about.min.htm\" ] }" )
+    f.write( " \"html\": [ \"index.min.htm\", \"device.min.htm\", \"config.min.htm\", \"calibration.min.htm\", \"format.min.htm\", \"about.min.htm\" ] }" )
     f.close()
 
 

src/calc.cpp

@@ -25,11 +25,7 @@ SOFTWARE.
 #include <tinyexpr.h>
 
 #include <calc.hpp>
-#include <config.hpp>
-#include <helper.hpp>
-#include <tempsensor.hpp>
-
-#define FORMULA_MAX_DEVIATION 1.5
+#include <main.hpp>
 
 //
 // Use values to derive a formula
@@ -46,7 +42,7 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
   else if (fd.a[0] > 0 && fd.a[1] > 0 && fd.a[2] > 0)
     noAngles = 3;
 
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
   Log.verbose(
       F("CALC: Trying to create formula using order = %d, found %d angles" CR),
       order, noAngles);
@@ -62,7 +58,7 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
 
     // Returned value is 0 if no error
     if (ret == 0) {
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
       Log.verbose(F("CALC: Finshied processing data points." CR));
 #endif
 
@@ -83,7 +79,7 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
                  coeffs[1]);
       }
 
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
       Log.verbose(F("CALC: Formula: %s" CR), formulaBuffer);
 #endif
 
@@ -96,7 +92,14 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
         double dev = (g - fd.g[i]) < 0 ? (fd.g[i] - g) : (g - fd.g[i]);
 
         // If the deviation is more than 2 degress we mark it as failed.
-        if (dev * 1000 > FORMULA_MAX_DEVIATION) valid = false;
+        if (dev * 1000 > myHardwareConfig.getMaxFormulaCreationDeviation()) {
+#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
+          char s[20];
+          snprintf(&s[0], sizeof(s), "%.8f", dev);
+          Log.verbose(F("CALC: Deviation is: %s" CR), &s[0]);
+#endif
+          valid = false;
+        }
       }
 
       if (!valid) {
@@ -121,13 +124,13 @@ double calculateGravity(double angle, double temp, const char *tempFormula) {
   const char *formula = myConfig.getGravityFormula();
 
   if (tempFormula != 0) {
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
     Log.verbose(F("CALC: Using temporary formula." CR));
 #endif
     formula = tempFormula;
   }
 
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
   Log.verbose(F("CALC: Calculating gravity for angle %F, temp %F." CR), angle,
               temp);
   Log.verbose(F("CALC: Formula %s." CR), formula);
@@ -146,8 +149,10 @@ double calculateGravity(double angle, double temp, const char *tempFormula) {
     double g = te_eval(expr);
     te_free(expr);
 
-#if LOG_LEVEL == 6
-    Log.verbose(F("CALC: Calculated gravity is %F." CR), g);
+#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
+    char s[20];
+    snprintf(&s[0], sizeof(s), "%.8f", g);
+    Log.verbose(F("CALC: Calculated gravity is %s." CR), &s[0]);
 #endif
     return g;
   }
@@ -158,18 +163,20 @@ double calculateGravity(double angle, double temp, const char *tempFormula) {
 
 //
 // Do a standard gravity temperature correction. This is a simple way to adjust
-// for differnt worth temperatures
+// for differnt worth temperatures. This function uses C as temperature.
 //
-double gravityTemperatureCorrection(double gravity, double temp,
-                                    char tempFormat, double calTemp) {
-#if LOG_LEVEL == 6
+// Source: https://homebrewacademy.com/hydrometer-temperature-correction/
+//
+double gravityTemperatureCorrectionC(double gravity, double tempC,
+                                     double calTempC) {
+#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
   Log.verbose(F("CALC: Adjusting gravity based on temperature, gravity %F, "
                 "temp %F, calTemp %F." CR),
-              gravity, temp, calTemp);
+              gravity, tempC, calTempC);
 #endif
+  // float tempF = convertCtoF(tempC);
+  // float calTempF = convertCtoF(calTempC);
 
-  if (tempFormat == 'C') temp = convertCtoF(temp);
-  double calTempF = convertCtoF(calTemp);  // calTemp is in C
   const char *formula =
       "gravity*((1.00130346-0.000134722124*temp+0.00000204052596*temp^2-0."
       "00000000232820948*temp^3)/"
@@ -178,7 +185,7 @@ double gravityTemperatureCorrection(double gravity, double temp,
 
   // Store variable names and pointers.
   te_variable vars[] = {
-      {"gravity", &gravity}, {"temp", &temp}, {"cal", &calTempF}};
+      {"gravity", &gravity}, {"temp", &tempC}, {"cal", &calTempC}};
 
   int err;
   // Compile the expression with variables.
@@ -188,8 +195,10 @@ double gravityTemperatureCorrection(double gravity, double temp,
     double g = te_eval(expr);
     te_free(expr);
 
-#if LOG_LEVEL == 6
-    Log.verbose(F("CALC: Corrected gravity is %F." CR), g);
+#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
+    char s[10];
+    snprintf(&s[0], sizeof(s), "%.8f", g);
+    Log.verbose(F("CALC: Corrected gravity is %s." CR), &s[0]);
 #endif
     return g;
   }

src/calc.hpp

@@ -24,18 +24,17 @@ SOFTWARE.
 #ifndef SRC_CALC_HPP_
 #define SRC_CALC_HPP_
 
-// Includes
 #include <config.hpp>
-#include <helper.hpp>
 
 #define ERR_FORMULA_NOTENOUGHVALUES -1
 #define ERR_FORMULA_INTERNAL -2
 #define ERR_FORMULA_UNABLETOFFIND -3
 
-// Functions
-double calculateGravity(double angle, double temp, const char *tempFormula = 0);
-double gravityTemperatureCorrection(double gravity, double temp,
-                                    char tempFormat, double calTemp = 20);
+double calculateGravity(double angle, double tempC,
+                        const char *tempFormula = 0);
+double gravityTemperatureCorrectionC(
+    double gravity, double tempC,
+    double calTempC = myHardwareConfig.getDefaultCalibrationTemp());
 int createFormula(RawFormulaData &fd, char *formulaBuffer,
                   int formulaBufferSize, int order);
 

src/config.cpp

@@ -21,12 +21,12 @@ 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.
  */
-#include <LittleFS.h>
-
 #include <config.hpp>
-#include <helper.hpp>
+#include <main.hpp>
+#include <wifi.hpp>
 
 Config myConfig;
+HardwareConfig myHardwareConfig;
 
 //
 // Create the config class with default settings.
@@ -34,26 +34,39 @@ Config myConfig;
 Config::Config() {
   // Assiging default values
   char buf[30];
+#if defined (ESP8266)
   snprintf(&buf[0], sizeof(buf), "%6x", (unsigned int)ESP.getChipId());
-  id = String(&buf[0]);
+#else // defined (ESP32)
+  uint32_t chipId = 0;
+  for (int i = 0; i < 17; i = i+8) {
+    chipId |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
+  }
+  snprintf(&buf[0], sizeof(buf), "%6x", chipId);
+#endif
+  _id = String(&buf[0]);
   snprintf(&buf[0], sizeof(buf), "" WIFI_MDNS "%s", getID());
-  mDNS = String(&buf[0]);
+  _mDNS = String(&buf[0]);
 
-#if LOG_LEVEL == 6 && !defined(CFG_DISABLE_LOGGING)
-  Log.verbose(F("CFG : Created config for %s (%s)." CR), id.c_str(),
-              mDNS.c_str());
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
+  Log.verbose(F("CFG : Created config for %s (%s)." CR), _id.c_str(),
+              _mDNS.c_str());
 #endif
 
   setTempFormat('C');
   setGravityFormat('G');
   setSleepInterval(900);   // 15 minutes
-  setVoltageFactor(1.59);  // Conversion factor for battery
-  setTempSensorAdj(0.0);
+#if defined (ESP8266)
+  setVoltageFactor(1.59);  // Conversion factor for battery on ESP8266
+#else // defined (ESP32)
+  setVoltageFactor(1.43);  // Conversion factor for battery on ESP32
+#endif
+  setTempSensorAdjC(0.0);
   setGravityTempAdj(false);
-  gyroCalibration = {0, 0, 0, 0, 0, 0};
-  formulaData = {{0, 0, 0, 0, 0}, {1, 1, 1, 1, 1}};
-  gyroTemp = false;
-  saveNeeded = false;
+  _gyroCalibration = {0, 0, 0, 0, 0, 0};
+  _formulaData = {{0, 0, 0, 0, 0}, {1, 1, 1, 1, 1}};
+  _gyroTemp = false;
+  _saveNeeded = false;
+  _mqttPort = 1883;
 }
 
 //
@@ -61,65 +74,65 @@ Config::Config() {
 // web and saving to file)
 //
 void Config::createJson(DynamicJsonDocument& doc) {
-  doc[CFG_PARAM_MDNS] = getMDNS();
-  doc[CFG_PARAM_ID] = getID();
-  doc[CFG_PARAM_OTA] = getOtaURL();
-  doc[CFG_PARAM_SSID] = getWifiSSID();
-  doc[CFG_PARAM_PASS] = getWifiPass();
-  doc[CFG_PARAM_TEMPFORMAT] = String(getTempFormat());
-  doc[CFG_PARAM_PUSH_BREWFATHER] = getBrewfatherPushUrl();
-  doc[CFG_PARAM_PUSH_HTTP] = getHttpPushUrl();
-  doc[CFG_PARAM_PUSH_HTTP2] = getHttpPushUrl2();
-  doc[CFG_PARAM_PUSH_INFLUXDB2] = getInfluxDb2PushUrl();
-  doc[CFG_PARAM_PUSH_INFLUXDB2_ORG] = getInfluxDb2PushOrg();
-  doc[CFG_PARAM_PUSH_INFLUXDB2_BUCKET] = getInfluxDb2PushBucket();
-  doc[CFG_PARAM_PUSH_INFLUXDB2_AUTH] = getInfluxDb2PushToken();
-  doc[CFG_PARAM_PUSH_MQTT] = getMqttUrl();
-  doc[CFG_PARAM_PUSH_MQTT_TOPIC] = getMqttTopic();
-  doc[CFG_PARAM_PUSH_MQTT_USER] = getMqttUser();
-  doc[CFG_PARAM_PUSH_MQTT_PASS] = getMqttPass();
-  doc[CFG_PARAM_SLEEP_INTERVAL] = getSleepInterval();
-  doc[CFG_PARAM_VOLTAGEFACTOR] = getVoltageFactor();
-  doc[CFG_PARAM_GRAVITY_FORMULA] = getGravityFormula();
-  doc[CFG_PARAM_GRAVITY_FORMAT] = String(getGravityFormat());
-  doc[CFG_PARAM_TEMP_ADJ] = getTempSensorAdj();
-  doc[CFG_PARAM_GRAVITY_TEMP_ADJ] = isGravityTempAdj();
-  doc[CFG_PARAM_GYRO_TEMP] = isGyroTemp();
+  doc[PARAM_MDNS] = getMDNS();
+  doc[PARAM_ID] = getID();
+  doc[PARAM_OTA] = getOtaURL();
+  doc[PARAM_SSID] = getWifiSSID();
+  doc[PARAM_PASS] = getWifiPass();
+  doc[PARAM_TEMPFORMAT] = String(getTempFormat());
+  doc[PARAM_PUSH_BREWFATHER] = getBrewfatherPushUrl();
+  doc[PARAM_PUSH_HTTP] = getHttpPushUrl();
+  doc[PARAM_PUSH_HTTP2] = getHttpPushUrl2();
+  doc[PARAM_PUSH_INFLUXDB2] = getInfluxDb2PushUrl();
+  doc[PARAM_PUSH_INFLUXDB2_ORG] = getInfluxDb2PushOrg();
+  doc[PARAM_PUSH_INFLUXDB2_BUCKET] = getInfluxDb2PushBucket();
+  doc[PARAM_PUSH_INFLUXDB2_AUTH] = getInfluxDb2PushToken();
+  doc[PARAM_PUSH_MQTT] = getMqttUrl();
+  doc[PARAM_PUSH_MQTT_PORT] = getMqttPort();
+  doc[PARAM_PUSH_MQTT_USER] = getMqttUser();
+  doc[PARAM_PUSH_MQTT_PASS] = getMqttPass();
+  doc[PARAM_SLEEP_INTERVAL] = getSleepInterval();
+  doc[PARAM_VOLTAGEFACTOR] = getVoltageFactor();
+  doc[PARAM_GRAVITY_FORMULA] = getGravityFormula();
+  doc[PARAM_GRAVITY_FORMAT] = String(getGravityFormat());
+  doc[PARAM_TEMP_ADJ] = getTempSensorAdjC();
+  doc[PARAM_GRAVITY_TEMP_ADJ] = isGravityTempAdj();
+  doc[PARAM_GYRO_TEMP] = isGyroTemp();
 
-  JsonObject cal = doc.createNestedObject(CFG_PARAM_GYRO_CALIBRATION);
-  cal["ax"] = gyroCalibration.ax;
-  cal["ay"] = gyroCalibration.ay;
-  cal["az"] = gyroCalibration.az;
-  cal["gx"] = gyroCalibration.gx;
-  cal["gy"] = gyroCalibration.gy;
-  cal["gz"] = gyroCalibration.gz;
+  JsonObject cal = doc.createNestedObject(PARAM_GYRO_CALIBRATION);
+  cal["ax"] = _gyroCalibration.ax;
+  cal["ay"] = _gyroCalibration.ay;
+  cal["az"] = _gyroCalibration.az;
+  cal["gx"] = _gyroCalibration.gx;
+  cal["gy"] = _gyroCalibration.gy;
+  cal["gz"] = _gyroCalibration.gz;
 
-  JsonObject cal2 = doc.createNestedObject(CFG_PARAM_FORMULA_DATA);
-  cal2["a1"] = reduceFloatPrecision(formulaData.a[0], 2);
-  cal2["a2"] = reduceFloatPrecision(formulaData.a[1], 2);
-  cal2["a3"] = reduceFloatPrecision(formulaData.a[2], 2);
-  cal2["a4"] = reduceFloatPrecision(formulaData.a[3], 2);
-  cal2["a5"] = reduceFloatPrecision(formulaData.a[4], 2);
+  JsonObject cal2 = doc.createNestedObject(PARAM_FORMULA_DATA);
+  cal2["a1"] = reduceFloatPrecision(_formulaData.a[0], 2);
+  cal2["a2"] = reduceFloatPrecision(_formulaData.a[1], 2);
+  cal2["a3"] = reduceFloatPrecision(_formulaData.a[2], 2);
+  cal2["a4"] = reduceFloatPrecision(_formulaData.a[3], 2);
+  cal2["a5"] = reduceFloatPrecision(_formulaData.a[4], 2);
 
-  cal2["g1"] = reduceFloatPrecision(formulaData.g[0], 4);
-  cal2["g2"] = reduceFloatPrecision(formulaData.g[1], 4);
-  cal2["g3"] = reduceFloatPrecision(formulaData.g[2], 4);
-  cal2["g4"] = reduceFloatPrecision(formulaData.g[3], 4);
-  cal2["g5"] = reduceFloatPrecision(formulaData.g[4], 4);
+  cal2["g1"] = reduceFloatPrecision(_formulaData.g[0], 4);
+  cal2["g2"] = reduceFloatPrecision(_formulaData.g[1], 4);
+  cal2["g3"] = reduceFloatPrecision(_formulaData.g[2], 4);
+  cal2["g4"] = reduceFloatPrecision(_formulaData.g[3], 4);
+  cal2["g5"] = reduceFloatPrecision(_formulaData.g[4], 4);
 }
 
 //
 // Save json document to file
 //
 bool Config::saveFile() {
-  if (!saveNeeded) {
-#if LOG_LEVEL == 6 && !defined(CFG_DISABLE_LOGGING)
+  if (!_saveNeeded) {
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
     Log.verbose(F("CFG : Skipping save, not needed." CR));
 #endif
     return true;
   }
 
-#if LOG_LEVEL == 6 && !defined(CFG_DISABLE_LOGGING)
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
   Log.verbose(F("CFG : Saving configuration to file." CR));
 #endif
 
@@ -133,7 +146,7 @@ bool Config::saveFile() {
   DynamicJsonDocument doc(CFG_JSON_BUFSIZE);
   createJson(doc);
 
-#if LOG_LEVEL == 6 && !defined(CFG_DISABLE_LOGGING)
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
   serializeJson(doc, Serial);
   Serial.print(CR);
 #endif
@@ -142,7 +155,7 @@ bool Config::saveFile() {
   configFile.flush();
   configFile.close();
 
-  saveNeeded = false;
+  _saveNeeded = false;
   myConfig.debug();
   Log.notice(F("CFG : Configuration saved to " CFG_FILENAME "." CR));
   return true;
@@ -152,7 +165,7 @@ bool Config::saveFile() {
 // Load config file from disk
 //
 bool Config::loadFile() {
-#if LOG_LEVEL == 6 && !defined(CFG_DISABLE_LOGGING)
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
   Log.verbose(F("CFG : Loading configuration from file." CR));
 #endif
 
@@ -189,95 +202,93 @@ bool Config::loadFile() {
 #if LOG_LEVEL == 6
   Log.verbose(F("CFG : Parsed configuration file." CR));
 #endif
-  if (!doc[CFG_PARAM_OTA].isNull()) setOtaURL(doc[CFG_PARAM_OTA]);
-  if (!doc[CFG_PARAM_MDNS].isNull()) setMDNS(doc[CFG_PARAM_MDNS]);
-  if (!doc[CFG_PARAM_SSID].isNull()) setWifiSSID(doc[CFG_PARAM_SSID]);
-  if (!doc[CFG_PARAM_PASS].isNull()) setWifiPass(doc[CFG_PARAM_PASS]);
+  if (!doc[PARAM_OTA].isNull()) setOtaURL(doc[PARAM_OTA]);
+  if (!doc[PARAM_MDNS].isNull()) setMDNS(doc[PARAM_MDNS]);
+  if (!doc[PARAM_SSID].isNull()) setWifiSSID(doc[PARAM_SSID]);
+  if (!doc[PARAM_PASS].isNull()) setWifiPass(doc[PARAM_PASS]);
 
-  if (!doc[CFG_PARAM_TEMPFORMAT].isNull()) {
-    String s = doc[CFG_PARAM_TEMPFORMAT];
+  if (!doc[PARAM_TEMPFORMAT].isNull()) {
+    String s = doc[PARAM_TEMPFORMAT];
     setTempFormat(s.charAt(0));
   }
 
-  if (!doc[CFG_PARAM_PUSH_BREWFATHER].isNull())
-    setBrewfatherPushUrl(doc[CFG_PARAM_PUSH_BREWFATHER]);
+  if (!doc[PARAM_PUSH_BREWFATHER].isNull())
+    setBrewfatherPushUrl(doc[PARAM_PUSH_BREWFATHER]);
 
-  if (!doc[CFG_PARAM_PUSH_HTTP].isNull())
-    setHttpPushUrl(doc[CFG_PARAM_PUSH_HTTP]);
-  if (!doc[CFG_PARAM_PUSH_HTTP2].isNull())
-    setHttpPushUrl2(doc[CFG_PARAM_PUSH_HTTP2]);
+  if (!doc[PARAM_PUSH_HTTP].isNull()) setHttpPushUrl(doc[PARAM_PUSH_HTTP]);
+  if (!doc[PARAM_PUSH_HTTP2].isNull()) setHttpPushUrl2(doc[PARAM_PUSH_HTTP2]);
 
-  if (!doc[CFG_PARAM_PUSH_INFLUXDB2].isNull())
-    setInfluxDb2PushUrl(doc[CFG_PARAM_PUSH_INFLUXDB2]);
-  if (!doc[CFG_PARAM_PUSH_INFLUXDB2_ORG].isNull())
-    setInfluxDb2PushOrg(doc[CFG_PARAM_PUSH_INFLUXDB2_ORG]);
-  if (!doc[CFG_PARAM_PUSH_INFLUXDB2_BUCKET].isNull())
-    setInfluxDb2PushBucket(doc[CFG_PARAM_PUSH_INFLUXDB2_BUCKET]);
-  if (!doc[CFG_PARAM_PUSH_INFLUXDB2_AUTH].isNull())
-    setInfluxDb2PushToken(doc[CFG_PARAM_PUSH_INFLUXDB2_AUTH]);
+  if (!doc[PARAM_PUSH_INFLUXDB2].isNull())
+    setInfluxDb2PushUrl(doc[PARAM_PUSH_INFLUXDB2]);
+  if (!doc[PARAM_PUSH_INFLUXDB2_ORG].isNull())
+    setInfluxDb2PushOrg(doc[PARAM_PUSH_INFLUXDB2_ORG]);
+  if (!doc[PARAM_PUSH_INFLUXDB2_BUCKET].isNull())
+    setInfluxDb2PushBucket(doc[PARAM_PUSH_INFLUXDB2_BUCKET]);
+  if (!doc[PARAM_PUSH_INFLUXDB2_AUTH].isNull())
+    setInfluxDb2PushToken(doc[PARAM_PUSH_INFLUXDB2_AUTH]);
 
-  if (!doc[CFG_PARAM_PUSH_MQTT].isNull()) setMqttUrl(doc[CFG_PARAM_PUSH_MQTT]);
-  if (!doc[CFG_PARAM_PUSH_MQTT_TOPIC].isNull())
-    setMqttTopic(doc[CFG_PARAM_PUSH_MQTT_TOPIC]);
-  if (!doc[CFG_PARAM_PUSH_MQTT_USER].isNull())
-    setMqttUser(doc[CFG_PARAM_PUSH_MQTT_USER]);
-  if (!doc[CFG_PARAM_PUSH_MQTT_PASS].isNull())
-    setMqttPass(doc[CFG_PARAM_PUSH_MQTT_PASS]);
+  if (!doc[PARAM_PUSH_MQTT].isNull()) setMqttUrl(doc[PARAM_PUSH_MQTT]);
+  if (!doc[PARAM_PUSH_MQTT_PORT].isNull())
+    setMqttPort(doc[PARAM_PUSH_MQTT_PORT].as<int>());
+  if (!doc[PARAM_PUSH_MQTT_USER].isNull())
+    setMqttUser(doc[PARAM_PUSH_MQTT_USER]);
+  if (!doc[PARAM_PUSH_MQTT_PASS].isNull())
+    setMqttPass(doc[PARAM_PUSH_MQTT_PASS]);
 
-  if (!doc[CFG_PARAM_SLEEP_INTERVAL].isNull())
-    setSleepInterval(doc[CFG_PARAM_SLEEP_INTERVAL].as<int>());
-  if (!doc[CFG_PARAM_VOLTAGEFACTOR].isNull())
-    setVoltageFactor(doc[CFG_PARAM_VOLTAGEFACTOR].as<float>());
-  if (!doc[CFG_PARAM_GRAVITY_FORMULA].isNull())
-    setGravityFormula(doc[CFG_PARAM_GRAVITY_FORMULA]);
-  if (!doc[CFG_PARAM_GRAVITY_TEMP_ADJ].isNull())
-    setGravityTempAdj(doc[CFG_PARAM_GRAVITY_TEMP_ADJ].as<bool>());
-  if (!doc[CFG_PARAM_GYRO_TEMP].isNull())
-    setGyroTemp(doc[CFG_PARAM_GYRO_TEMP].as<bool>());
-  if (!doc[CFG_PARAM_GRAVITY_FORMAT].isNull()) {
-    String s = doc[CFG_PARAM_GRAVITY_FORMAT];
+  if (!doc[PARAM_SLEEP_INTERVAL].isNull())
+    setSleepInterval(doc[PARAM_SLEEP_INTERVAL].as<int>());
+  if (!doc[PARAM_VOLTAGEFACTOR].isNull())
+    setVoltageFactor(doc[PARAM_VOLTAGEFACTOR].as<float>());
+  if (!doc[PARAM_GRAVITY_FORMULA].isNull())
+    setGravityFormula(doc[PARAM_GRAVITY_FORMULA]);
+  if (!doc[PARAM_GRAVITY_TEMP_ADJ].isNull())
+    setGravityTempAdj(doc[PARAM_GRAVITY_TEMP_ADJ].as<bool>());
+  if (!doc[PARAM_GYRO_TEMP].isNull())
+    setGyroTemp(doc[PARAM_GYRO_TEMP].as<bool>());
+  if (!doc[PARAM_GRAVITY_FORMAT].isNull()) {
+    String s = doc[PARAM_GRAVITY_FORMAT];
     setGravityFormat(s.charAt(0));
   }
-  if (!doc[CFG_PARAM_TEMP_ADJ].isNull())
-    setTempSensorAdj(doc[CFG_PARAM_TEMP_ADJ].as<float>());
+  if (!doc[PARAM_TEMP_ADJ].isNull())
+    setTempSensorAdjC(doc[PARAM_TEMP_ADJ].as<float>());
 
-  if (!doc[CFG_PARAM_GYRO_CALIBRATION]["ax"].isNull())
-    gyroCalibration.ax = doc[CFG_PARAM_GYRO_CALIBRATION]["ax"];
-  if (!doc[CFG_PARAM_GYRO_CALIBRATION]["ay"].isNull())
-    gyroCalibration.ay = doc[CFG_PARAM_GYRO_CALIBRATION]["ay"];
-  if (!doc[CFG_PARAM_GYRO_CALIBRATION]["az"].isNull())
-    gyroCalibration.az = doc[CFG_PARAM_GYRO_CALIBRATION]["az"];
-  if (!doc[CFG_PARAM_GYRO_CALIBRATION]["gx"].isNull())
-    gyroCalibration.gx = doc[CFG_PARAM_GYRO_CALIBRATION]["gx"];
-  if (!doc[CFG_PARAM_GYRO_CALIBRATION]["gy"].isNull())
-    gyroCalibration.gy = doc[CFG_PARAM_GYRO_CALIBRATION]["gy"];
-  if (!doc[CFG_PARAM_GYRO_CALIBRATION]["gz"].isNull())
-    gyroCalibration.gz = doc[CFG_PARAM_GYRO_CALIBRATION]["gz"];
+  if (!doc[PARAM_GYRO_CALIBRATION]["ax"].isNull())
+    _gyroCalibration.ax = doc[PARAM_GYRO_CALIBRATION]["ax"];
+  if (!doc[PARAM_GYRO_CALIBRATION]["ay"].isNull())
+    _gyroCalibration.ay = doc[PARAM_GYRO_CALIBRATION]["ay"];
+  if (!doc[PARAM_GYRO_CALIBRATION]["az"].isNull())
+    _gyroCalibration.az = doc[PARAM_GYRO_CALIBRATION]["az"];
+  if (!doc[PARAM_GYRO_CALIBRATION]["gx"].isNull())
+    _gyroCalibration.gx = doc[PARAM_GYRO_CALIBRATION]["gx"];
+  if (!doc[PARAM_GYRO_CALIBRATION]["gy"].isNull())
+    _gyroCalibration.gy = doc[PARAM_GYRO_CALIBRATION]["gy"];
+  if (!doc[PARAM_GYRO_CALIBRATION]["gz"].isNull())
+    _gyroCalibration.gz = doc[PARAM_GYRO_CALIBRATION]["gz"];
 
-  if (!doc[CFG_PARAM_FORMULA_DATA]["a1"].isNull())
-    formulaData.a[0] = doc[CFG_PARAM_FORMULA_DATA]["a1"].as<double>();
-  if (!doc[CFG_PARAM_FORMULA_DATA]["a2"].isNull())
-    formulaData.a[1] = doc[CFG_PARAM_FORMULA_DATA]["a2"].as<double>();
-  if (!doc[CFG_PARAM_FORMULA_DATA]["a3"].isNull())
-    formulaData.a[2] = doc[CFG_PARAM_FORMULA_DATA]["a3"].as<double>();
-  if (!doc[CFG_PARAM_FORMULA_DATA]["a4"].isNull())
-    formulaData.a[3] = doc[CFG_PARAM_FORMULA_DATA]["a4"].as<double>();
-  if (!doc[CFG_PARAM_FORMULA_DATA]["a5"].isNull())
-    formulaData.a[4] = doc[CFG_PARAM_FORMULA_DATA]["a5"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a1"].isNull())
+    _formulaData.a[0] = doc[PARAM_FORMULA_DATA]["a1"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a2"].isNull())
+    _formulaData.a[1] = doc[PARAM_FORMULA_DATA]["a2"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a3"].isNull())
+    _formulaData.a[2] = doc[PARAM_FORMULA_DATA]["a3"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a4"].isNull())
+    _formulaData.a[3] = doc[PARAM_FORMULA_DATA]["a4"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["a5"].isNull())
+    _formulaData.a[4] = doc[PARAM_FORMULA_DATA]["a5"].as<double>();
 
-  if (!doc[CFG_PARAM_FORMULA_DATA]["g1"].isNull())
-    formulaData.g[0] = doc[CFG_PARAM_FORMULA_DATA]["g1"].as<double>();
-  if (!doc[CFG_PARAM_FORMULA_DATA]["g2"].isNull())
-    formulaData.g[1] = doc[CFG_PARAM_FORMULA_DATA]["g2"].as<double>();
-  if (!doc[CFG_PARAM_FORMULA_DATA]["g3"].isNull())
-    formulaData.g[2] = doc[CFG_PARAM_FORMULA_DATA]["g3"].as<double>();
-  if (!doc[CFG_PARAM_FORMULA_DATA]["g4"].isNull())
-    formulaData.g[3] = doc[CFG_PARAM_FORMULA_DATA]["g4"].as<double>();
-  if (!doc[CFG_PARAM_FORMULA_DATA]["g5"].isNull())
-    formulaData.g[4] = doc[CFG_PARAM_FORMULA_DATA]["g5"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g1"].isNull())
+    _formulaData.g[0] = doc[PARAM_FORMULA_DATA]["g1"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g2"].isNull())
+    _formulaData.g[1] = doc[PARAM_FORMULA_DATA]["g2"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g3"].isNull())
+    _formulaData.g[2] = doc[PARAM_FORMULA_DATA]["g3"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g4"].isNull())
+    _formulaData.g[3] = doc[PARAM_FORMULA_DATA]["g4"].as<double>();
+  if (!doc[PARAM_FORMULA_DATA]["g5"].isNull())
+    _formulaData.g[4] = doc[PARAM_FORMULA_DATA]["g5"].as<double>();
 
   myConfig.debug();
-  saveNeeded = false;  // Reset save flag
+  _saveNeeded = false;  // Reset save flag
   Log.notice(F("CFG : Configuration file " CFG_FILENAME " loaded." CR));
   return true;
 }
@@ -294,7 +305,7 @@ void Config::formatFileSystem() {
 // Check if file system can be mounted, if not we format it.
 //
 void Config::checkFileSystem() {
-#if LOG_LEVEL == 6 && !defined(CFG_DISABLE_LOGGING)
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
   Log.verbose(F("CFG : Checking if filesystem is valid." CR));
 #endif
 
@@ -310,7 +321,7 @@ void Config::checkFileSystem() {
 // Dump the configuration to the serial port
 //
 void Config::debug() {
-#if LOG_LEVEL == 6 && !defined(CFG_DISABLE_LOGGING)
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
   Log.verbose(F("CFG : Dumping configration " CFG_FILENAME "." CR));
   Log.verbose(F("CFG : ID; '%s'." CR), getID());
   Log.verbose(F("CFG : WIFI; '%s', '%s'." CR), getWifiSSID(), getWifiPass());
@@ -318,7 +329,7 @@ void Config::debug() {
   Log.verbose(F("CFG : Sleep interval; %d." CR), getSleepInterval());
   Log.verbose(F("CFG : OTA; '%s'." CR), getOtaURL());
   Log.verbose(F("CFG : Temp Format; %c." CR), getTempFormat());
-  Log.verbose(F("CFG : Temp Adj; %F." CR), getTempSensorAdj());
+  Log.verbose(F("CFG : Temp Adj; %F." CR), getTempSensorAdjC());
   Log.verbose(F("CFG : VoltageFactor; %F." CR), getVoltageFactor());
   Log.verbose(F("CFG : Gravity formula; '%s'." CR), getGravityFormula());
   Log.verbose(F("CFG : Gravity format; '%c'." CR), getGravityFormat());
@@ -334,4 +345,104 @@ void Config::debug() {
 #endif
 }
 
+//
+// Save json document to file
+//
+bool HardwareConfig::saveFile() {
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
+  Log.verbose(F("CFG : Saving hardware configuration to file." CR));
+#endif
+
+  File configFile = LittleFS.open(CFG_HW_FILENAME, "w");
+
+  if (!configFile) {
+    Log.error(F("CFG : Failed to open file " CFG_HW_FILENAME " for save." CR));
+    return false;
+  }
+
+  DynamicJsonDocument doc(512);
+
+  doc[PARAM_HW_GYRO_READ_COUNT] = this->getGyroReadCount();
+  doc[PARAM_HW_GYRO_READ_DELAY] = this->getGyroReadDelay();
+  doc[PARAM_HW_GYRO_MOVING_THREASHOLD] = this->getGyroSensorMovingThreashold();
+  doc[PARAM_HW_FORMULA_DEVIATION] = this->getMaxFormulaCreationDeviation();
+  doc[PARAM_HW_WIFI_PORTALTIMEOUT] = this->getWifiPortalTimeout();
+  doc[PARAM_HW_FORMULA_CALIBRATION_TEMP] = this->getDefaultCalibrationTemp();
+
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
+  serializeJson(doc, Serial);
+  Serial.print(CR);
+#endif
+
+  serializeJson(doc, configFile);
+  configFile.flush();
+  configFile.close();
+
+  Log.notice(F("CFG : Configuration saved to " CFG_HW_FILENAME "." CR));
+  return true;
+}
+
+//
+// Load config file from disk
+//
+bool HardwareConfig::loadFile() {
+#if LOG_LEVEL == 6 && !defined(DISABLE_LOGGING)
+  Log.verbose(F("CFG : Loading hardware configuration from file." CR));
+#endif
+
+  if (!LittleFS.exists(CFG_HW_FILENAME)) {
+    Log.warning(
+        F("CFG : Configuration file does not exist " CFG_HW_FILENAME "." CR));
+    return false;
+  }
+
+  File configFile = LittleFS.open(CFG_HW_FILENAME, "r");
+
+  if (!configFile) {
+    Log.error(F("CFG : Failed to open " CFG_HW_FILENAME "." CR));
+    return false;
+  }
+
+  Log.notice(F("CFG : Size of configuration file=%d bytes." CR),
+             configFile.size());
+
+  DynamicJsonDocument doc(512);
+  DeserializationError err = deserializeJson(doc, configFile);
+#if LOG_LEVEL == 6
+  serializeJson(doc, Serial);
+  Serial.print(CR);
+#endif
+  configFile.close();
+
+  if (err) {
+    Log.error(
+        F("CFG : Failed to parse " CFG_HW_FILENAME " file, Err: %s, %d." CR),
+        err.c_str(), doc.capacity());
+    return false;
+  }
+
+#if LOG_LEVEL == 6
+  Log.verbose(F("CFG : Parsed hardware configuration file." CR));
+#endif
+
+  if (!doc[PARAM_HW_GYRO_READ_COUNT].isNull())
+    this->setGyroReadCount(doc[PARAM_HW_GYRO_READ_COUNT].as<int>());
+  if (!doc[PARAM_HW_GYRO_READ_DELAY].isNull())
+    this->setGyroReadDelay(doc[PARAM_HW_GYRO_READ_DELAY].as<int>());
+  if (!doc[PARAM_HW_GYRO_MOVING_THREASHOLD].isNull())
+    this->setGyroSensorMovingThreashold(
+        doc[PARAM_HW_GYRO_MOVING_THREASHOLD].as<int>());
+  if (!doc[PARAM_HW_FORMULA_DEVIATION].isNull())
+    this->setMaxFormulaCreationDeviation(
+        doc[PARAM_HW_FORMULA_DEVIATION].as<float>());
+  if (!doc[PARAM_HW_FORMULA_CALIBRATION_TEMP].isNull())
+    this->SetDefaultCalibrationTemp(
+        doc[PARAM_HW_FORMULA_CALIBRATION_TEMP].as<float>());
+  if (!doc[PARAM_HW_WIFI_PORTALTIMEOUT].isNull())
+    this->setWifiPortalTimeout(doc[PARAM_HW_WIFI_PORTALTIMEOUT].as<int>());
+
+  Log.notice(F("CFG : Configuration file " CFG_HW_FILENAME " loaded." CR));
+  return true;
+}
+
 // EOF

src/config.hpp

@@ -24,71 +24,14 @@ SOFTWARE.
 #ifndef SRC_CONFIG_HPP_
 #define SRC_CONFIG_HPP_
 
-// Includes
-#include <Arduino.h>
-#include <ArduinoJson.h>
-#include <stdlib.h>
-
 #include <helper.hpp>
+#include <resources.hpp>
 
-// defintions
 #define CFG_JSON_BUFSIZE 3192
 
 #define CFG_APPNAME "GravityMon "         // Name of firmware
 #define CFG_FILENAME "/gravitymon.json"   // Name of config file
-
-#define WIFI_DEFAULT_SSID "GravityMon"  // Name of created SSID
-#define WIFI_DEFAULT_PWD "password"     // Password for created SSID
-#define WIFI_MDNS "gravitymon"          // Prefix for MDNS name
-#define WIFI_PORTAL_TIMEOUT \
-  120  // Number of seconds until the config portal is closed
-
-// These are used in API + Savefile
-#define CFG_PARAM_ID "id"
-#define CFG_PARAM_MDNS "mdns"  // Device name
-#define CFG_PARAM_OTA "ota-url"
-#define CFG_PARAM_SSID "wifi-ssid"
-#define CFG_PARAM_PASS "wifi-pass"
-
-#define CFG_PARAM_PUSH_BREWFATHER "brewfather-push"
-#define CFG_PARAM_PUSH_HTTP "http-push"
-#define CFG_PARAM_PUSH_HTTP2 "http-push2"
-#define CFG_PARAM_PUSH_INFLUXDB2 "influxdb2-push"
-#define CFG_PARAM_PUSH_INFLUXDB2_ORG "influxdb2-org"
-#define CFG_PARAM_PUSH_INFLUXDB2_BUCKET "influxdb2-bucket"
-#define CFG_PARAM_PUSH_INFLUXDB2_AUTH "influxdb2-auth"
-#define CFG_PARAM_PUSH_MQTT "mqtt-push"
-#define CFG_PARAM_PUSH_MQTT_USER "mqtt-user"
-#define CFG_PARAM_PUSH_MQTT_PASS "mqtt-pass"
-#define CFG_PARAM_PUSH_MQTT_TOPIC "mqtt-topic"
-#define CFG_PARAM_SLEEP_INTERVAL "sleep-interval"  // Sleep interval
-#define CFG_PARAM_TEMPFORMAT "temp-format"         // C or F
-#define CFG_PARAM_VOLTAGEFACTOR \
-  "voltage-factor"  // Factor to calculate the battery voltage
-#define CFG_PARAM_GRAVITY_FORMULA \
-  "gravity-formula"  // Formula for calculating gravity
-#define CFG_PARAM_GRAVITY_FORMAT "gravity-format"  // Gravity format G or P
-#define CFG_PARAM_GRAVITY_TEMP_ADJ \
-  "gravity-temp-adjustment"  // True/False. Adjust gravity for temperature
-#define CFG_PARAM_TEMP_ADJ \
-  "temp-adjustment-value"  // Correction value for temp sensor
-#define CFG_PARAM_GYRO_CALIBRATION "gyro-calibration-data"  // READ ONLY
-#define CFG_PARAM_GYRO_TEMP \
-  "gyro-temp"  // True/False. Use temp sensor in gyro (only in gravity mode)
-
-#define CFG_PARAM_FORMULA_DATA \
-  "formula-calculation-data"  // Raw data for the formula calculation
-
-// These are used in API's
-#define CFG_PARAM_APP_NAME "app-name"
-#define CFG_PARAM_APP_VER "app-ver"
-#define CFG_PARAM_ANGLE "angle"
-#define CFG_PARAM_GRAVITY "gravity"
-#define CFG_PARAM_TEMP_C "temp-c"
-#define CFG_PARAM_TEMP_F "temp-f"
-#define CFG_PARAM_BATTERY "battery"
-#define CFG_PARAM_SLEEP_MODE "sleep-mode"
-#define CFG_PARAM_RSSI "rssi"
+#define CFG_HW_FILENAME "/hardware.json"  // Name of config file for hw
 
 // Used for holding sensordata or sensoroffsets
 struct RawGyroData {
@@ -109,226 +52,267 @@ struct RawFormulaData {
   double g[5];
 };
 
-// Main configuration class
+class HardwareConfig {
+ private:
+  int _wifiPortalTimeout = 120;
+  float _maxFormulaCreationDeviation = 1.6;
+  float _defaultCalibrationTemp = 20.0;
+  int _gyroSensorMovingThreashold = 500;
+  int _gyroReadCount = 50;
+  int _gyroReadDelay = 3150;  // us, empirical, to hold sampling to 200 Hz
+
+ public:
+  int getWifiPortalTimeout() { return _wifiPortalTimeout; }
+  void setWifiPortalTimeout(int t) { _wifiPortalTimeout = t; }
+  float getMaxFormulaCreationDeviation() {
+    return _maxFormulaCreationDeviation;
+  }
+  void setMaxFormulaCreationDeviation(float f) {
+    _maxFormulaCreationDeviation = f;
+  }
+  float getDefaultCalibrationTemp() { return _defaultCalibrationTemp; }
+  void SetDefaultCalibrationTemp(float t) { _defaultCalibrationTemp = t; }
+  int getGyroSensorMovingThreashold() { return _gyroSensorMovingThreashold; }
+  void setGyroSensorMovingThreashold(int t) { _gyroSensorMovingThreashold = t; }
+  int getGyroReadCount() { return _gyroReadCount; }
+  void setGyroReadCount(int c) { _gyroReadCount = c; }
+  int getGyroReadDelay() { return _gyroReadDelay; }
+  void setGyroReadDelay(int d) { _gyroReadDelay = d; }
+
+  bool saveFile();
+  bool loadFile();
+};
+
 class Config {
  private:
-  bool saveNeeded;
+  bool _saveNeeded;
 
   // Device configuration
-  String id;
-  String mDNS;
-  String otaURL;
-  char tempFormat;  // C, F
-  float voltageFactor;
-  float tempSensorAdj;  // This value will be added to the read sensor value
-  int sleepInterval;
-  bool gyroTemp;  // Experimental feature
+  String _id;
+  String _mDNS;
+  String _otaURL;
+  char _tempFormat;
+  float _voltageFactor;
+  float _tempSensorAdjC;
+  int _sleepInterval;
+  bool _gyroTemp;
 
   // Wifi Config
-  String wifiSSID;
-  String wifiPASS;
+  String _wifiSSID;
+  String _wifiPASS;
 
   // Push target settings
-  String brewfatherPushUrl;  // URL For brewfather
+  String _brewfatherPushUrl;
 
-  String httpPushUrl;   // URL 1 for standard http
-  String httpPushUrl2;  // URL 2 for standard http
+  String _httpPushUrl;
+  String _httpPushUrl2;
 
-  String influxDb2Url;     // URL for InfluxDB v2
-  String influxDb2Org;     // Organisation for InfluxDB v2
-  String influxDb2Bucket;  // Bucket for InfluxDB v2
-  String influxDb2Token;   // Auth Token for InfluxDB v2
+  String _influxDb2Url;
+  String _influxDb2Org;
+  String _influxDb2Bucket;
+  String _influxDb2Token;
 
-  String mqttUrl;  // Server name
-  String mqttTopic;
-  String mqttUser;
-  String mqttPass;
+  String _mqttUrl;
+  int _mqttPort;
+  String _mqttUser;
+  String _mqttPass;
 
   // Gravity and temperature calculations
-  String gravityFormula;
-  bool gravityTempAdj;  // true, false
-  char gravityFormat;   // G, P
+  String _gravityFormula;
+  bool _gravityTempAdj;
+  char _gravityFormat;
 
-  // Gyro calibration data
-  RawGyroData
-      gyroCalibration;  // Holds the gyro calibration constants (6 * int16_t)
-  RawFormulaData formulaData;  // Used for creating formula
+  // Gyro calibration and formula calculation data
+  RawGyroData _gyroCalibration;
+  RawFormulaData _formulaData;
 
   void debug();
   void formatFileSystem();
 
  public:
   Config();
-  const char* getID() { return id.c_str(); }
+  const char* getID() { return _id.c_str(); }
 
-  const char* getMDNS() { return mDNS.c_str(); }
+  const char* getMDNS() { return _mDNS.c_str(); }
   void setMDNS(String s) {
-    mDNS = s;
-    saveNeeded = true;
+    _mDNS = s;
+    _saveNeeded = true;
   }
 
-  const bool isGyroTemp() { return gyroTemp; }
+  const bool isGyroTemp() { return _gyroTemp; }
   void setGyroTemp(bool b) {
-    gyroTemp = b;
-    saveNeeded = true;
+    _gyroTemp = b;
+    _saveNeeded = true;
   }
 
-  const char* getOtaURL() { return otaURL.c_str(); }
+  const char* getOtaURL() { return _otaURL.c_str(); }
   void setOtaURL(String s) {
-    otaURL = s;
-    saveNeeded = true;
+    _otaURL = s;
+    _saveNeeded = true;
   }
-  bool isOtaActive() { return otaURL.length() ? true : false; }
+  bool isOtaActive() { return _otaURL.length() ? true : false; }
 
-  const char* getWifiSSID() { return wifiSSID.c_str(); }
+  const char* getWifiSSID() { return _wifiSSID.c_str(); }
   void setWifiSSID(String s) {
-    wifiSSID = s;
-    saveNeeded = true;
+    _wifiSSID = s;
+    _saveNeeded = true;
   }
-  const char* getWifiPass() { return wifiPASS.c_str(); }
+  const char* getWifiPass() { return _wifiPASS.c_str(); }
   void setWifiPass(String s) {
-    wifiPASS = s;
-    saveNeeded = true;
+    _wifiPASS = s;
+    _saveNeeded = true;
   }
 
   // Brewfather
-  const char* getBrewfatherPushUrl() { return brewfatherPushUrl.c_str(); }
+  const char* getBrewfatherPushUrl() { return _brewfatherPushUrl.c_str(); }
   void setBrewfatherPushUrl(String s) {
-    brewfatherPushUrl = s;
-    saveNeeded = true;
+    _brewfatherPushUrl = s;
+    _saveNeeded = true;
   }
   bool isBrewfatherActive() {
-    return brewfatherPushUrl.length() ? true : false;
+    return _brewfatherPushUrl.length() ? true : false;
   }
 
   // Standard HTTP
-  const char* getHttpPushUrl() { return httpPushUrl.c_str(); }
+  const char* getHttpPushUrl() { return _httpPushUrl.c_str(); }
   void setHttpPushUrl(String s) {
-    httpPushUrl = s;
-    saveNeeded = true;
+    _httpPushUrl = s;
+    _saveNeeded = true;
   }
-  bool isHttpActive() { return httpPushUrl.length() ? true : false; }
-  const char* getHttpPushUrl2() { return httpPushUrl2.c_str(); }
+  bool isHttpActive() { return _httpPushUrl.length() ? true : false; }
+  const char* getHttpPushUrl2() { return _httpPushUrl2.c_str(); }
   void setHttpPushUrl2(String s) {
-    httpPushUrl2 = s;
-    saveNeeded = true;
+    _httpPushUrl2 = s;
+    _saveNeeded = true;
   }
-  bool isHttpActive2() { return httpPushUrl2.length() ? true : false; }
+  bool isHttpActive2() { return _httpPushUrl2.length() ? true : false; }
 
   // InfluxDB2
-  const char* getInfluxDb2PushUrl() { return influxDb2Url.c_str(); }
+  const char* getInfluxDb2PushUrl() { return _influxDb2Url.c_str(); }
   void setInfluxDb2PushUrl(String s) {
-    influxDb2Url = s;
-    saveNeeded = true;
+    _influxDb2Url = s;
+    _saveNeeded = true;
   }
-  bool isInfluxDb2Active() { return influxDb2Url.length() ? true : false; }
-  const char* getInfluxDb2PushOrg() { return influxDb2Org.c_str(); }
+  bool isInfluxDb2Active() { return _influxDb2Url.length() ? true : false; }
+  const char* getInfluxDb2PushOrg() { return _influxDb2Org.c_str(); }
   void setInfluxDb2PushOrg(String s) {
-    influxDb2Org = s;
-    saveNeeded = true;
+    _influxDb2Org = s;
+    _saveNeeded = true;
   }
-  const char* getInfluxDb2PushBucket() { return influxDb2Bucket.c_str(); }
+  const char* getInfluxDb2PushBucket() { return _influxDb2Bucket.c_str(); }
   void setInfluxDb2PushBucket(String s) {
-    influxDb2Bucket = s;
-    saveNeeded = true;
+    _influxDb2Bucket = s;
+    _saveNeeded = true;
   }
-  const char* getInfluxDb2PushToken() { return influxDb2Token.c_str(); }
+  const char* getInfluxDb2PushToken() { return _influxDb2Token.c_str(); }
   void setInfluxDb2PushToken(String s) {
-    influxDb2Token = s;
-    saveNeeded = true;
+    _influxDb2Token = s;
+    _saveNeeded = true;
   }
 
   // MQTT
-  bool isMqttActive() { return mqttUrl.length() ? true : false; }
-  const char* getMqttUrl() { return mqttUrl.c_str(); }
+  bool isMqttActive() { return _mqttUrl.length() ? true : false; }
+  const char* getMqttUrl() { return _mqttUrl.c_str(); }
   void setMqttUrl(String s) {
-    mqttUrl = s;
-    saveNeeded = true;
+    _mqttUrl = s;
+    _saveNeeded = true;
   }
-  const char* getMqttTopic() { return mqttTopic.c_str(); }
-  void setMqttTopic(String s) {
-    mqttTopic = s;
-    saveNeeded = true;
+  int getMqttPort() { return _mqttPort; }
+  void setMqttPort(String s) {
+    _mqttPort = s.toInt();
+    _saveNeeded = true;
   }
-  const char* getMqttUser() { return mqttUser.c_str(); }
+  void setMqttPort(int i) {
+    _mqttPort = i;
+    _saveNeeded = true;
+  }
+  const char* getMqttUser() { return _mqttUser.c_str(); }
   void setMqttUser(String s) {
-    mqttUser = s;
-    saveNeeded = true;
+    _mqttUser = s;
+    _saveNeeded = true;
   }
-  const char* getMqttPass() { return mqttPass.c_str(); }
+  const char* getMqttPass() { return _mqttPass.c_str(); }
   void setMqttPass(String s) {
-    mqttPass = s;
-    saveNeeded = true;
+    _mqttPass = s;
+    _saveNeeded = true;
   }
 
-  int getSleepInterval() { return sleepInterval; }
+  int getSleepInterval() { return _sleepInterval; }
   void setSleepInterval(int v) {
-    sleepInterval = v;
-    saveNeeded = true;
+    _sleepInterval = v;
+    _saveNeeded = true;
   }
   void setSleepInterval(String s) {
-    sleepInterval = s.toInt();
-    saveNeeded = true;
+    _sleepInterval = s.toInt();
+    _saveNeeded = true;
   }
 
-  char getTempFormat() { return tempFormat; }
+  char getTempFormat() { return _tempFormat; }
   void setTempFormat(char c) {
-    tempFormat = c;
-    saveNeeded = true;
+    if (c == 'C' || c == 'F') {
+      _tempFormat = c;
+      _saveNeeded = true;
     }
-  bool isTempC() { return tempFormat == 'C' ? false : true; }
-  bool isTempF() { return tempFormat == 'F' ? false : true; }
+  }
+  bool isTempC() { return _tempFormat == 'C'; }
+  bool isTempF() { return _tempFormat == 'F'; }
 
-  float getVoltageFactor() { return voltageFactor; }
+  float getVoltageFactor() { return _voltageFactor; }
   void setVoltageFactor(float f) {
-    voltageFactor = f;
-    saveNeeded = true;
+    _voltageFactor = f;
+    _saveNeeded = true;
   }
   void setVoltageFactor(String s) {
-    voltageFactor = s.toFloat();
-    saveNeeded = true;
+    _voltageFactor = s.toFloat();
+    _saveNeeded = true;
   }
 
-  float getTempSensorAdj() { return tempSensorAdj; }
-  void setTempSensorAdj(float f) {
-    tempSensorAdj = f;
-    saveNeeded = true;
+  float getTempSensorAdjC() { return _tempSensorAdjC; }
+  void setTempSensorAdjC(float f) {
+    _tempSensorAdjC = f;
+    _saveNeeded = true;
   }
-  void setTempSensorAdj(String s) {
-    tempSensorAdj = s.toFloat();
-    saveNeeded = true;
+  void setTempSensorAdjC(String s) {
+    _tempSensorAdjC = s.toFloat();
+    _saveNeeded = true;
+  }
+  void setTempSensorAdjF(String s) {
+    _tempSensorAdjC = convertFtoC(s.toFloat());
+    _saveNeeded = true;
   }
 
-  const char* getGravityFormula() { return gravityFormula.c_str(); }
+  const char* getGravityFormula() { return _gravityFormula.c_str(); }
   void setGravityFormula(String s) {
-    gravityFormula = s;
-    saveNeeded = true;
+    _gravityFormula = s;
+    _saveNeeded = true;
   }
 
-  bool isGravityTempAdj() { return gravityTempAdj; }
+  bool isGravityTempAdj() { return _gravityTempAdj; }
   void setGravityTempAdj(bool b) {
-    gravityTempAdj = b;
-    saveNeeded = true;
+    _gravityTempAdj = b;
+    _saveNeeded = true;
   }
 
-  char getGravityFormat() { return gravityFormat; }
+  char getGravityFormat() { return _gravityFormat; }
   void setGravityFormat(char c) {
-    gravityFormat = c;
-    saveNeeded = true;
+    if (c == 'G' || c == 'P') {
+      _gravityFormat = c;
+      _saveNeeded = true;
     }
-  bool isGravitySG() { return gravityFormat == 'G' ? false : true; }
-  bool isGravityPlato() { return gravityFormat == 'P' ? false : true; }
+  }
+  bool isGravitySG() { return _gravityFormat == 'G'; }
+  bool isGravityPlato() { return _gravityFormat == 'P'; }
 
-  const RawGyroData& getGyroCalibration() { return gyroCalibration; }
+  const RawGyroData& getGyroCalibration() { return _gyroCalibration; }
   void setGyroCalibration(const RawGyroData& r) {
-    gyroCalibration = r;
-    saveNeeded = true;
+    _gyroCalibration = r;
+    _saveNeeded = true;
   }
 
-  const RawFormulaData& getFormulaData() { return formulaData; }
+  const RawFormulaData& getFormulaData() { return _formulaData; }
   void setFormulaData(const RawFormulaData& r) {
-    formulaData = r;
-    saveNeeded = true;
+    _formulaData = r;
+    _saveNeeded = true;
   }
 
   // IO functions
@@ -336,12 +320,12 @@ class Config {
   bool saveFile();
   bool loadFile();
   void checkFileSystem();
-  bool isSaveNeeded() { return saveNeeded; }
-  void setSaveNeeded() { saveNeeded = true; }
+  bool isSaveNeeded() { return _saveNeeded; }
+  void setSaveNeeded() { _saveNeeded = true; }
 };
 
-// Global instance created
 extern Config myConfig;
+extern HardwareConfig myHardwareConfig;
 
 #endif  // SRC_CONFIG_HPP_
 

src/gyro.cpp

@@ -22,16 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 #include <gyro.hpp>
-#include <helper.hpp>
+#include <main.hpp>
 
 GyroSensor myGyro;
 MPU6050 accelgyro;
 
 #define GYRO_USE_INTERRUPT  // Use interrupt to detect when new sample is ready
-#define SENSOR_MOVING_THREASHOLD 500
-#define SENSOR_READ_COUNT 50
-#define SENSOR_READ_DELAY 3150  // us, empirical, to hold sampling to 200 Hz
-
 #define GYRO_SHOW_MINMAX    // Will calculate the min/max values when doing
                             // calibration
 // #define GYRO_CALIBRATE_STARTUP          // Will  calibrate sensor at startup
@@ -43,19 +39,19 @@ bool GyroSensor::setup() {
 #if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
   Log.verbose(F("GYRO: Setting up hardware." CR));
 #endif
-  Wire.begin(D3, D4);
+  Wire.begin(PIN_SDA, PIN_SCL);
   Wire.setClock(400000);  // 400kHz I2C clock. Comment this line if having
                           // compilation difficulties
 
   if (!accelgyro.testConnection()) {
     Log.error(F("GYRO: Failed to connect to MPU6050 (gyro)." CR));
-    sensorConnected = false;
+    _sensorConnected = false;
   } else {
 #if !defined(GYRO_DISABLE_LOGGING)
     Log.notice(F("GYRO: Connected to MPU6050 (gyro)." CR));
 #endif
     accelgyro.initialize();
-    sensorConnected = true;
+    _sensorConnected = true;
 
     // Configure the sensor
     accelgyro.setTempSensorEnabled(true);
@@ -77,10 +73,10 @@ bool GyroSensor::setup() {
 
     // Once we have calibration values stored we just apply them from the
     // config.
-    calibrationOffset = myConfig.getGyroCalibration();
+    _calibrationOffset = myConfig.getGyroCalibration();
     applyCalibration();
   }
-  return sensorConnected;
+  return _sensorConnected;
 }
 
 //
@@ -215,11 +211,11 @@ bool GyroSensor::isSensorMoving(RawGyroData &raw) {
 #endif
 
   int x = abs(raw.gx), y = abs(raw.gy), z = abs(raw.gz);
+  int threashold = myHardwareConfig.getGyroSensorMovingThreashold();
 
-  if (x > SENSOR_MOVING_THREASHOLD || y > SENSOR_MOVING_THREASHOLD ||
-      z > SENSOR_MOVING_THREASHOLD) {
-    Log.notice(F("GYRO: Movement detected (%d)\t%d\t%d\t%d." CR),
-               SENSOR_MOVING_THREASHOLD, x, y, z);
+  if (x > threashold || y > threashold || z > threashold) {
+    Log.notice(F("GYRO: Movement detected (%d)\t%d\t%d\t%d." CR), threashold, x,
+               y, z);
     return true;
   }
 
@@ -234,35 +230,37 @@ bool GyroSensor::read() {
   Log.verbose(F("GYRO: Getting new gyro position." CR));
 #endif
 
-  if (!sensorConnected) return false;
+  if (!_sensorConnected) return false;
 
-  readSensor(lastGyroData, SENSOR_READ_COUNT,
-             SENSOR_READ_DELAY);  // Last param is unused if GYRO_USE_INTERRUPT
-                                  // is defined.
+  readSensor(
+      _lastGyroData, myHardwareConfig.getGyroReadCount(),
+      myHardwareConfig.getGyroReadDelay());  // Last param is unused if
+                                             // GYRO_USE_INTERRUPT is defined.
 
   // If the sensor is unstable we return false to signal we dont have valid
   // value
-  if (isSensorMoving(lastGyroData)) {
+  if (isSensorMoving(_lastGyroData)) {
 #if !defined(GYRO_DISABLE_LOGGING)
     Log.notice(F("GYRO: Sensor is moving." CR));
 #endif
-    validValue = false;
+    _validValue = false;
   } else {
-    validValue = true;
-    angle = calculateAngle(lastGyroData);
+    _validValue = true;
+    _angle = calculateAngle(_lastGyroData);
 #if !defined(GYRO_DISABLE_LOGGING)
-    Log.notice(F("GYRO: Sensor values %d,%d,%d\t%F" CR), lastGyroData.ax,
-               lastGyroData.ay, lastGyroData.az, angle);
+    Log.notice(F("GYRO: Sensor values %d,%d,%d\t%F" CR), _lastGyroData.ax,
+               _lastGyroData.ay, _lastGyroData.az, _angle);
 #endif
   }
 
-  sensorTemp = (static_cast<float>(lastGyroData.temp)) / 340 + 36.53;
+  _sensorTemp = (static_cast<float>(_lastGyroData.temp)) / 340 + 36.53;
 
   // The first read value is close to the DS18 value according to my tests, if
   // more reads are done then the gyro temp will increase to much
-  if (initialSensorTemp == INVALID_TEMPERATURE) initialSensorTemp = sensorTemp;
+  if (_initialSensorTemp == INVALID_TEMPERATURE)
+    _initialSensorTemp = _sensorTemp;
 
-  return validValue;
+  return _validValue;
 }
 
 //
@@ -270,10 +268,10 @@ bool GyroSensor::read() {
 //
 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,
-              calibrationOffset.ay, calibrationOffset.az);
-  Log.verbose(F("GYRO: Gyro offset \t%d\t%d\t%d" CR), calibrationOffset.gx,
-              calibrationOffset.gy, calibrationOffset.gz);
+  Log.verbose(F("GYRO: Accel offset\t%d\t%d\t%d" CR), _calibrationOffset.ax,
+              _calibrationOffset.ay, _calibrationOffset.az);
+  Log.verbose(F("GYRO: Gyro offset \t%d\t%d\t%d" CR), _calibrationOffset.gx,
+              _calibrationOffset.gy, _calibrationOffset.gz);
 #endif
 }
 
@@ -285,19 +283,19 @@ void GyroSensor::applyCalibration() {
   Log.verbose(F("GYRO: Applying calibration offsets to sensor." CR));
 #endif
 
-  if ((calibrationOffset.ax + calibrationOffset.ay + calibrationOffset.az +
-       calibrationOffset.gx + calibrationOffset.gy + calibrationOffset.gz) ==
+  if ((_calibrationOffset.ax + _calibrationOffset.ay + _calibrationOffset.az +
+       _calibrationOffset.gx + _calibrationOffset.gy + _calibrationOffset.gz) ==
       0) {
     Log.error(F("GYRO: No valid calibraion values exist, aborting." CR));
     return;
   }
 
-  accelgyro.setXAccelOffset(calibrationOffset.ax);
-  accelgyro.setYAccelOffset(calibrationOffset.ay);
-  accelgyro.setZAccelOffset(calibrationOffset.az);
-  accelgyro.setXGyroOffset(calibrationOffset.gx);
-  accelgyro.setYGyroOffset(calibrationOffset.gy);
-  accelgyro.setZGyroOffset(calibrationOffset.gz);
+  accelgyro.setXAccelOffset(_calibrationOffset.ax);
+  accelgyro.setYAccelOffset(_calibrationOffset.ay);
+  accelgyro.setZAccelOffset(_calibrationOffset.az);
+  accelgyro.setXGyroOffset(_calibrationOffset.gx);
+  accelgyro.setYGyroOffset(_calibrationOffset.gy);
+  accelgyro.setZGyroOffset(_calibrationOffset.gz);
 }
 
 //
@@ -317,15 +315,15 @@ void GyroSensor::calibrateSensor() {
   accelgyro.PrintActiveOffsets();
   Serial.print(CR);
 
-  calibrationOffset.ax = accelgyro.getXAccelOffset();
-  calibrationOffset.ay = accelgyro.getYAccelOffset();
-  calibrationOffset.az = accelgyro.getZAccelOffset();
-  calibrationOffset.gx = accelgyro.getXGyroOffset();
-  calibrationOffset.gy = accelgyro.getYGyroOffset();
-  calibrationOffset.gz = accelgyro.getZGyroOffset();
+  _calibrationOffset.ax = accelgyro.getXAccelOffset();
+  _calibrationOffset.ay = accelgyro.getYAccelOffset();
+  _calibrationOffset.az = accelgyro.getZAccelOffset();
+  _calibrationOffset.gx = accelgyro.getXGyroOffset();
+  _calibrationOffset.gy = accelgyro.getYGyroOffset();
+  _calibrationOffset.gz = accelgyro.getZGyroOffset();
 
   // Save the calibrated values
-  myConfig.setGyroCalibration(calibrationOffset);
+  myConfig.setGyroCalibration(_calibrationOffset);
   myConfig.saveFile();
 }
 
@@ -380,17 +378,17 @@ void GyroSensor::debug() {
   }
 
   Log.verbose(F("GYRO: Debug - Acc OffX    %d\t%d." CR),
-              accelgyro.getXAccelOffset(), calibrationOffset.az);
+              accelgyro.getXAccelOffset(), _calibrationOffset.az);
   Log.verbose(F("GYRO: Debug - Acc OffY    %d\t%d." CR),
-              accelgyro.getYAccelOffset(), calibrationOffset.ay);
+              accelgyro.getYAccelOffset(), _calibrationOffset.ay);
   Log.verbose(F("GYRO: Debug - Acc OffZ    %d\t%d." CR),
-              accelgyro.getZAccelOffset(), calibrationOffset.az);
+              accelgyro.getZAccelOffset(), _calibrationOffset.az);
   Log.verbose(F("GYRO: Debug - Gyr OffX    %d\t%d." CR),
-              accelgyro.getXGyroOffset(), calibrationOffset.gx);
+              accelgyro.getXGyroOffset(), _calibrationOffset.gx);
   Log.verbose(F("GYRO: Debug - Gyr OffY    %d\t%d." CR),
-              accelgyro.getYGyroOffset(), calibrationOffset.gy);
+              accelgyro.getYGyroOffset(), _calibrationOffset.gy);
   Log.verbose(F("GYRO: Debug - Gyr OffZ    %d\t%d." CR),
-              accelgyro.getZGyroOffset(), calibrationOffset.gz);
+              accelgyro.getZGyroOffset(), _calibrationOffset.gz);
 #endif
 }
 

src/gyro.hpp

@@ -27,13 +27,10 @@ SOFTWARE.
 #define I2CDEV_IMPLEMENTATION I2CDEV_ARDUINO_WIRE
 // #define I2CDEV_IMPLEMENTATION I2CDEV_BUILTIN_SBWIRE
 
-// Includes
-#include <Arduino.h>
 #include <MPU6050.h>
 
 #include <config.hpp>
 
-// Classes
 struct RawGyroDataL {  // Used for average multiple readings
   int32_t ax;          // Raw Acceleration
   int32_t ay;
@@ -50,13 +47,13 @@ struct RawGyroDataL {  // Used for average multiple readings
 
 class GyroSensor {
  private:
-  bool sensorConnected = false;
-  bool validValue = false;
-  float angle = 0;
-  float sensorTemp = 0;
-  float initialSensorTemp = INVALID_TEMPERATURE;
-  RawGyroData calibrationOffset;
-  RawGyroData lastGyroData;
+  bool _sensorConnected = false;
+  bool _validValue = false;
+  float _angle = 0;
+  float _sensorTemp = 0;
+  float _initialSensorTemp = INVALID_TEMPERATURE;
+  RawGyroData _calibrationOffset;
+  RawGyroData _lastGyroData;
 
   void debug();
   void applyCalibration();
@@ -71,16 +68,15 @@ class GyroSensor {
   bool read();
   void calibrateSensor();
 
-  const RawGyroData &getLastGyroData() { return lastGyroData; }
-  float getAngle() { return angle; }
-  float getSensorTempC() { return sensorTemp; }
-  float getInitialSensorTempC() { return initialSensorTemp; }
-  bool isConnected() { return sensorConnected; }
-  bool hasValue() { return validValue; }
+  const RawGyroData &getLastGyroData() { return _lastGyroData; }
+  float getAngle() { return _angle; }
+  float getSensorTempC() { return _sensorTemp; }
+  float getInitialSensorTempC() { return _initialSensorTemp; }
+  bool isConnected() { return _sensorConnected; }
+  bool hasValue() { return _validValue; }
   void enterSleep();
 };
 
-// Global instance created
 extern GyroSensor myGyro;
 
 #endif  // SRC_GYRO_HPP_

src/helper.cpp

@@ -21,25 +21,57 @@ 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 (ESP8266)
 #include <ESP8266HTTPClient.h>
 #include <ESP8266WiFi.h>
+#else // defined (ESP32)
+#include <WiFi.h>
+#include <HTTPClient.h>
+#endif
 
 #include <config.hpp>
 #include <gyro.hpp>
 #include <helper.hpp>
+#include <main.hpp>
 #include <tempsensor.hpp>
+#include <wifi.hpp>
 
 SerialDebug mySerial;
 BatteryVoltage myBatteryVoltage;
 
+//
+// Convert sg to plato
+//
+double convertToPlato(double sg) { return 259 - (259 / sg); }
+
+//
+// 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; }
+
 //
 // Print the heap information.
 //
 void printHeap() {
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(HELPER_DISABLE_LOGGING)
+#if defined (ESP8266)
   Log.verbose(F("HELP: Heap %d kb, HeapFrag %d %%, FreeSketch %d kb." CR),
               ESP.getFreeHeap() / 1024, ESP.getHeapFragmentation(),
               ESP.getFreeSketchSpace() / 1024);
+#else // defined (ESP32)
+  Log.verbose(F("HELP: Heap %d kb, FreeSketch %d kb." CR),
+              ESP.getFreeHeap() / 1024, ESP.getFreeSketchSpace() / 1024);
+#endif
 #endif
 }
 
@@ -47,7 +79,7 @@ void printHeap() {
 // Enter deep sleep for the defined duration (Argument is seconds)
 //
 void deepSleep(int t) {
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(HELPER_DISABLE_LOGGING)
   Log.verbose(F("HELP: Entering sleep mode for %ds." CR), t);
 #endif
   uint32_t wake = t * 1000000;
@@ -105,11 +137,19 @@ void BatteryVoltage::read() {
   // the voltage (from max 5V)
   float factor = myConfig.getVoltageFactor();  // Default value is 1.63
   int v = analogRead(A0);
-  batteryLevel = ((3.3 / 1023) * v) * factor;
-#if LOG_LEVEL == 6
+
+  // 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
+
+#if defined (ESP8266)
+  _batteryLevel = ((3.3 / 1023) * v) * factor;
+#else // defined (ESP32)
+  _batteryLevel = ((3.3 / 4095) * v) * factor;
+#endif 
+#if LOG_LEVEL == 6 && !defined(HELPER_DISABLE_LOGGING)
   Log.verbose(
       F("BATT: Reading voltage level. Factor=%F Value=%d, Voltage=%F." CR),
-      factor, v, batteryLevel);
+      factor, v, _batteryLevel);
 #endif
 }
 
@@ -177,14 +217,13 @@ void PerfLogging::print() {
 void PerfLogging::pushInflux() {
   if (!myConfig.isInfluxDb2Active()) return;
 
-  WiFiClient client;
   HTTPClient http;
   String serverPath =
       String(myConfig.getInfluxDb2PushUrl()) +
       "/api/v2/write?org=" + String(myConfig.getInfluxDb2PushOrg()) +
       "&bucket=" + String(myConfig.getInfluxDb2PushBucket());
 
-  http.begin(client, serverPath);
+  http.begin(myWifi.getWifiClient(), serverPath);
 
   // Create body for influxdb2, format used
   // key,host=mdns value=0.0
@@ -225,7 +264,7 @@ void PerfLogging::pushInflux() {
 
   // Log.notice(F("PERF: data %s." CR), body.c_str() );
 
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(HELPER_DISABLE_LOGGING)
   Log.verbose(F("PERF: url %s." CR), serverPath.c_str());
   Log.verbose(F("PERF: data %s." CR), body.c_str());
 #endif
@@ -236,15 +275,18 @@ void PerfLogging::pushInflux() {
   int httpResponseCode = http.POST(body);
 
   if (httpResponseCode == 204) {
+#if !defined(HELPER_DISABLE_LOGGING)
     Log.notice(
         F("PERF: InfluxDB2 push performance data successful, response=%d" CR),
         httpResponseCode);
+#endif
   } else {
     Log.error(F("PERF: InfluxDB2 push performance data failed, response=%d" CR),
               httpResponseCode);
   }
 
   http.end();
+  myWifi.closeWifiClient();
 }
 
 #endif  // COLLECT_PERFDATA
@@ -267,4 +309,73 @@ float reduceFloatPrecision(float f, int dec) {
   return atof(&buffer[0]);
 }
 
+//
+// urlencode
+//
+// https://circuits4you.com/2019/03/21/esp8266-url-encode-decode-example/
+//
+String urlencode(String str) {
+  String encodedString = "";
+  char c;
+  char code0;
+  char code1;
+  for (int i =0; i < static_cast<int>(str.length()); i++) {
+    c = str.charAt(i);
+    if (isalnum(c)){
+      encodedString += c;
+    } else {
+      code1 = (c & 0xf) + '0';
+      if ((c & 0xf) >9) {
+          code1 = (c & 0xf) - 10 + 'A';
+      }
+      c = (c>>4) & 0xf;
+      code0 = c + '0';
+      if (c > 9) {
+          code0 = c - 10 + 'A';
+      }
+      encodedString += '%';
+      encodedString += code0;
+      encodedString += code1;
+    }
+  }
+  //Log.verbose(F("HELP: encode=%s" CR), encodedString.c_str());
+  return encodedString; 
+}
+
+unsigned char h2int(char c) {
+  if (c >= '0' && c <='9') {
+    return((unsigned char)c - '0');
+  }
+  if (c >= 'a' && c <='f') {
+    return((unsigned char)c - 'a' + 10);
+  }
+  if (c >= 'A' && c <='F') {
+    return((unsigned char)c - 'A' + 10);
+  }
+  return(0);
+}
+
+String urldecode(String str) {
+  String encodedString = "";
+  char c;
+  char code0;
+  char code1;
+  for (int i = 0; i < static_cast<int>(str.length()); i++){
+    c = str.charAt(i);
+    if (c == '%') {
+      i++;
+      code0 = str.charAt(i);
+      i++;
+      code1 = str.charAt(i);
+      c = (h2int(code0) << 4) | h2int(code1);
+      encodedString += c;
+    } else {
+      encodedString += c;
+    }
+  }   
+
+  //Log.verbose(F("HELP: decode=%s" CR), encodedString.c_str());
+  return encodedString;
+}
+
 // EOF

src/helper.hpp

@@ -25,7 +25,7 @@ SOFTWARE.
 #define SRC_HELPER_HPP_
 
 // Includes
-#include <ArduinoLog.h>
+#include <main.hpp>
 
 // Sleep mode
 void deepSleep(int t);
@@ -33,6 +33,16 @@ void deepSleep(int t);
 // Show build options
 void printBuildOptions();
 
+// Data conversion
+double convertToPlato(double sg);
+double convertToSG(double plato);
+float convertCtoF(float c);
+float convertFtoC(float f);
+
+// url encode/decode
+String urldecode(String str);
+String urlencode(String str);
+
 // Float to String
 char* convertFloatToString(float f, char* buf, int dec = 2);
 float reduceFloatPrecision(float f, int dec = 2);
@@ -51,11 +61,11 @@ class SerialDebug {
 
 class BatteryVoltage {
  private:
-  float batteryLevel;
+  float _batteryLevel;
 
  public:
   void read();
-  float getVoltage() { return batteryLevel; }
+  float getVoltage() { return _batteryLevel; }
 };
 
 #if defined(COLLECT_PERFDATA)

src/main.cpp

@@ -21,12 +21,11 @@ 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.
  */
-#include <LittleFS.h>
-
 #include <calc.hpp>
 #include <config.hpp>
 #include <gyro.hpp>
 #include <helper.hpp>
+#include <main.hpp>
 #include <pushtarget.hpp>
 #include <tempsensor.hpp>
 #include <webserver.hpp>
@@ -63,14 +62,18 @@ void checkSleepMode(float angle, float volt) {
 
   if (!g.ax && !g.ay && !g.az && !g.gx && !g.gy && !g.gz) {
     // Will not enter sleep mode if: no calibration data
+#if !defined(MAIN_DISABLE_LOGGING)
     Log.notice(
         F("MAIN: Missing calibration data, so forcing webserver to be "
           "active." CR));
+#endif
     runMode = RunMode::configurationMode;
   } else if (sleepModeAlwaysSkip) {
     // Check if the flag from the UI has been set, the we force configuration
     // mode.
+#if !defined(MAIN_DISABLE_LOGGING)
     Log.notice(F("MAIN: Sleep mode disabled from web interface." CR));
+#endif
     runMode = RunMode::configurationMode;
   } else if ((volt < 4.15 && (angle > 85 && angle < 95)) || (volt > 4.15)) {
     runMode = RunMode::configurationMode;
@@ -80,14 +83,18 @@ void checkSleepMode(float angle, float volt) {
 
   switch (runMode) {
     case RunMode::configurationMode:
+#if !defined(MAIN_DISABLE_LOGGING)
       Log.notice(F("MAIN: run mode CONFIG (angle=%F volt=%F)." CR), angle,
                  volt);
+#endif
       break;
     case RunMode::wifiSetupMode:
       break;
     case RunMode::gravityMode:
+#if !defined(MAIN_DISABLE_LOGGING)
       Log.notice(F("MAIN: run mode GRAVITY (angle=%F volt=%F)." CR), angle,
                  volt);
+#endif
       break;
   }
 }
@@ -103,21 +110,39 @@ void setup() {
 #if LOG_LEVEL == 6 && !defined(MAIN_DISABLE_LOGGING)
   // Add a delay so that serial is started.
   // delay(3000);
+#if defined (ESP8266)
   Log.verbose(F("Main: Reset reason %s." CR), ESP.getResetInfo().c_str());
+#else // defined (ESP32)
+#endif
 #endif
   // Main startup
+#if defined (ESP8266)
   Log.notice(F("Main: Started setup for %s." CR),
              String(ESP.getChipId(), HEX).c_str());
+#else // defined (ESP32)
+  char buf[20];
+  uint32_t chipId = 0;
+  for (int i = 0; i < 17; i = i+8) {
+    chipId |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
+  }
+  snprintf(&buf[0], sizeof(buf), "%6x", chipId);
+  Log.notice(F("Main: Started setup for %s." CR), &buf[0]);
+#endif
   printBuildOptions();
 
   LOG_PERF_START("main-config-load");
   myConfig.checkFileSystem();
   myConfig.loadFile();
+  myWifi.init();
+  myHardwareConfig.loadFile();
   LOG_PERF_STOP("main-config-load");
 
   // Setup watchdog
+#if defined (ESP8266)
   ESP.wdtDisable();
   ESP.wdtEnable(5000);  // 5 seconds
+#else // defined (ESP32)
+#endif
 
   // No stored config, move to portal
   if (!myWifi.hasConfig()) {
@@ -169,7 +194,7 @@ void setup() {
         if (myWifi.checkFirmwareVersion()) myWifi.updateFirmware();
         LOG_PERF_STOP("main-wifi-ota");
 #endif
-        myWebServer
+        myWebServerHandler
             .setupWebServer();  // Takes less than 4ms, so skip this measurement
       }
 
@@ -207,22 +232,21 @@ bool loopReadGravity() {
     stableGyroMillis = millis();  // Reset timer
 
     LOG_PERF_START("loop-temp-read");
-    float temp = myTempSensor.getTempC(myConfig.isGyroTemp());
+    float tempC = myTempSensor.getTempC(myConfig.isGyroTemp());
     LOG_PERF_STOP("loop-temp-read");
 
-    float gravity = calculateGravity(angle, temp);
-    float corrGravity =
-        gravityTemperatureCorrection(gravity, temp, myConfig.getTempFormat());
+    float gravitySG = calculateGravity(angle, tempC);
+    float corrGravitySG = gravityTemperatureCorrectionC(gravitySG, tempC);
 
 #if LOG_LEVEL == 6 && !defined(MAIN_DISABLE_LOGGING)
-    Log.verbose(F("Main: Sensor values gyro angle=%F, temp=%F, gravity=%F, "
-                  "corr=%F." CR),
-                angle, temp, gravity, corrGravity);
+    Log.verbose(F("Main: Sensor values gyro angle=%F, temp=%FC, gravity=%F, "
+                  "corr_gravity=%F." CR),
+                angle, tempC, gravity, corrGravity);
 #endif
 
     LOG_PERF_START("loop-push");
     // Force the transmission if we are going to sleep
-    myPushTarget.send(angle, gravity, corrGravity, temp,
+    myPushTarget.send(angle, gravitySG, corrGravitySG, tempC,
                       (millis() - runtimeMillis) / 1000,
                       runMode == RunMode::gravityMode ? true : false);
     LOG_PERF_STOP("loop-push");
@@ -241,17 +265,12 @@ void loopGravityOnInterval() {
   if (abs((int32_t)(millis() - loopMillis)) > interval) {
     loopReadGravity();
     loopMillis = millis();
-#if LOG_LEVEL == 6 && !defined(MAIN_DISABLE_LOGGING)
-    Log.verbose(F("Main: Heap %d kb FreeSketch %d kb HeapFrag %d %%." CR),
-                ESP.getFreeHeap() / 1024, ESP.getFreeSketchSpace() / 1024,
-                ESP.getHeapFragmentation());
-#endif
+    printHeap();
     LOG_PERF_START("loop-gyro-read");
     myGyro.read();
     LOG_PERF_STOP("loop-gyro-read");
     myBatteryVoltage.read();
     checkSleepMode(myGyro.getAngle(), myBatteryVoltage.getVoltage());
-    LOG_PERF_PUSH();
   }
 }
 
@@ -279,7 +298,7 @@ void goToSleep(int sleepInterval) {
 void loop() {
   switch (runMode) {
     case RunMode::configurationMode:
-      myWebServer.loop();
+      myWebServerHandler.loop();
       myWifi.loop();
       loopGravityOnInterval();
       break;

src/main.hpp

@@ -0,0 +1,51 @@
+/*
+MIT License
+
+Copyright (c) 2021-22 Magnus
+
+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 above 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.
+ */
+#ifndef SRC_MAIN_HPP_
+#define SRC_MAIN_HPP_
+
+#include <Arduino.h>
+#include <ArduinoJson.h>
+#include <ArduinoLog.h>
+#include <stdlib.h>
+
+#if defined (ESP8266)
+#include <LittleFS.h>
+#define ESP_RESET ESP.reset
+#define PIN_SDA D3
+#define PIN_SCL D4
+#define PIN_DS D6
+#else // defined (ESP32)
+#define LittleFS SPIFFS
+#define ESPhttpUpdate httpUpdate
+#define ESP_RESET ESP.restart
+#define ESP8266WebServer WebServer
+#include <spiffs.h>
+#define PIN_SDA 17
+#define PIN_SCL 16
+#define PIN_DS 19
+#endif
+
+#define PIN_LED 2
+
+#endif  // SRC_MAIN_HPP_

src/pushtarget.cpp

@@ -21,20 +21,27 @@ 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(ESP8266)
+#include <ESP8266HTTPClient.h>
+#include <ESP8266mDNS.h>
+#else  // defined (ESP32)
+#include <HTTPClient.h>
+#endif
 #include <MQTT.h>
 
 #include <config.hpp>
-#include <gyro.hpp>
+#include <helper.hpp>
 #include <pushtarget.hpp>
+#include <wifi.hpp>
 
 PushTarget myPushTarget;
 
 //
-// Send the pressure value
+// Send the data to targets
 //
-void PushTarget::send(float angle, float gravity, float corrGravity, float temp,
-                      float runTime, bool force) {
-  uint32_t timePassed = abs((int32_t)(millis() - ms));
+void PushTarget::send(float angle, float gravitySG, float corrGravitySG,
+                      float tempC, float runTime, bool force) {
+  uint32_t timePassed = abs((int32_t)(millis() - _ms));
   uint32_t interval = myConfig.getSleepInterval() * 1000;
 
   if ((timePassed < interval) && !force) {
@@ -45,85 +52,80 @@ void PushTarget::send(float angle, float gravity, float corrGravity, float temp,
     return;
   }
 
-#if LOG_LEVEL == 6 && !defined(PUSH_DISABLE_LOGGING)
-  Log.verbose(F("PUSH: Sending data." CR));
+  _ms = millis();
+
+#if defined(ESP8266)
+  if (ESP.getFreeContStack() < 1500) {
+    Log.error(F("PUSH: Low on memory, skipping push since it will crasch. "
+                "(stack=%d, heap=%d)." CR),
+              ESP.getFreeContStack(), ESP.getFreeHeap());
+    myWifi.closeWifiClient();
+    return;
+  }
 #endif
 
-  ms = millis();
+  TemplatingEngine engine;
+  engine.initialize(angle, gravitySG, corrGravitySG, tempC, runTime);
 
   if (myConfig.isBrewfatherActive()) {
     LOG_PERF_START("push-brewfather");
-    sendBrewfather(angle, gravity, corrGravity, temp);
+    sendBrewfather(engine);
     LOG_PERF_STOP("push-brewfather");
   }
 
   if (myConfig.isHttpActive()) {
     LOG_PERF_START("push-http");
-    sendHttp(myConfig.getHttpPushUrl(), angle, gravity, corrGravity, temp,
-             runTime);
+    sendHttp(engine, 0);
     LOG_PERF_STOP("push-http");
   }
 
   if (myConfig.isHttpActive2()) {
     LOG_PERF_START("push-http2");
-    sendHttp(myConfig.getHttpPushUrl2(), angle, gravity, corrGravity, temp,
-             runTime);
+    sendHttp(engine, 1);
     LOG_PERF_STOP("push-http2");
   }
 
   if (myConfig.isInfluxDb2Active()) {
     LOG_PERF_START("push-influxdb2");
-    sendInfluxDb2(angle, gravity, corrGravity, temp, runTime);
+    sendInfluxDb2(engine);
     LOG_PERF_STOP("push-influxdb2");
   }
 
   if (myConfig.isMqttActive()) {
     LOG_PERF_START("push-mqtt");
-    sendMqtt(angle, gravity, corrGravity, temp, runTime);
+    sendMqtt(engine);
     LOG_PERF_STOP("push-mqtt");
   }
+
+  LOG_PERF_PUSH();
 }
 
 //
 // Send to influx db v2
 //
-void PushTarget::sendInfluxDb2(float angle, float gravity, float corrGravity,
-                               float temp, float runTime) {
+void PushTarget::sendInfluxDb2(TemplatingEngine& engine) {
 #if !defined(PUSH_DISABLE_LOGGING)
-  Log.notice(
-      F("PUSH: Sending values to influxdb2 angle=%F, gravity=%F, temp=%F." CR),
-      angle, gravity, temp);
+  Log.notice(F("PUSH: Sending values to influxdb2." CR));
 #endif
 
-  WiFiClient client;
-  HTTPClient http;
   String serverPath =
       String(myConfig.getInfluxDb2PushUrl()) +
       "/api/v2/write?org=" + String(myConfig.getInfluxDb2PushOrg()) +
       "&bucket=" + String(myConfig.getInfluxDb2PushBucket());
+  String doc = engine.create(TemplatingEngine::TEMPLATE_INFLUX);
 
-  http.begin(client, serverPath);
-
-  // Create body for influxdb2
-  char buf[1024];
-  snprintf(&buf[0], sizeof(buf),
-           "measurement,host=%s,device=%s,temp-format=%c,gravity-format=%s "
-           "gravity=%.4f,corr-gravity=%.4f,angle=%.2f,temp=%.2f,battery=%.2f,"
-           "rssi=%d\n",
-           // TODO: Add support for plato format
-           myConfig.getMDNS(), myConfig.getID(), myConfig.getTempFormat(), "SG",
-           myConfig.isGravityTempAdj() ? corrGravity : gravity, corrGravity,
-           angle, temp, myBatteryVoltage.getVoltage(), WiFi.RSSI());
+  HTTPClient http;
+  http.begin(myWifi.getWifiClient(), serverPath);
 
 #if LOG_LEVEL == 6 && !defined(PUSH_DISABLE_LOGGING)
   Log.verbose(F("PUSH: url %s." CR), serverPath.c_str());
-  Log.verbose(F("PUSH: data %s." CR), &buf[0]);
+  Log.verbose(F("PUSH: data %s." CR), doc.c_str());
 #endif
 
   // Send HTTP POST request
   String auth = "Token " + String(myConfig.getInfluxDb2PushToken());
   http.addHeader(F("Authorization"), auth.c_str());
-  int httpResponseCode = http.POST(&buf[0]);
+  int httpResponseCode = http.POST(doc);
 
   if (httpResponseCode == 204) {
     Log.notice(F("PUSH: InfluxDB2 push successful, response=%d" CR),
@@ -134,62 +136,32 @@ void PushTarget::sendInfluxDb2(float angle, float gravity, float corrGravity,
   }
 
   http.end();
+  myWifi.closeWifiClient();
 }
 
 //
 // Send data to brewfather
 //
-void PushTarget::sendBrewfather(float angle, float gravity, float corrGravity,
-                                float temp) {
+void PushTarget::sendBrewfather(TemplatingEngine& engine) {
 #if !defined(PUSH_DISABLE_LOGGING)
-  Log.notice(
-      F("PUSH: Sending values to brewfather angle=%F, gravity=%F, temp=%F." CR),
-      angle, gravity, temp);
+  Log.notice(F("PUSH: Sending values to brewfather" CR));
 #endif
 
-  DynamicJsonDocument doc(300);
-  //
-  //  {
-  //  "name": "YourDeviceName", // Required field, this will be the ID in
-  //  Brewfather "temp": 20.32, "aux_temp": 15.61, // Fridge Temp
-  //  "ext_temp": 6.51, // Room Temp
-  //  "temp_unit": "C", // C, F, K
-  //  "gravity": 1.042,
-  //  "gravity_unit": "G", // G, P
-  //  "pressure": 10,
-  //  "pressure_unit": "PSI", // PSI, BAR, KPA
-  //  "ph": 4.12,
-  //  "bpm": 123, // Bubbles Per Minute
-  //  "comment": "Hello World",
-  //  "beer": "Pale Ale"
-  //  "battery": 4.98
-  //  }
-  //
-  doc["name"] = myConfig.getMDNS();
-  doc["temp"] = reduceFloatPrecision(temp, 1);
-  doc["temp_unit"] = String(myConfig.getTempFormat());
-  doc["battery"] = reduceFloatPrecision(myBatteryVoltage.getVoltage(), 2);
-  // TODO: Add support for plato format
-  doc["gravity"] = reduceFloatPrecision(
-      myConfig.isGravityTempAdj() ? corrGravity : gravity, 4);
-  doc["gravity_unit"] = myConfig.isGravitySG() ? "G" : "P";
-
-  WiFiClient client;
-  HTTPClient http;
   String serverPath = myConfig.getBrewfatherPushUrl();
+  String doc = engine.create(TemplatingEngine::TEMPLATE_BREWFATHER);
 
   // Your Domain name with URL path or IP address with path
-  http.begin(client, serverPath);
-  String json;
-  serializeJson(doc, json);
+  HTTPClient http;
+  http.begin(myWifi.getWifiClient(), serverPath);
+
 #if LOG_LEVEL == 6 && !defined(PUSH_DISABLE_LOGGING)
   Log.verbose(F("PUSH: url %s." CR), serverPath.c_str());
-  Log.verbose(F("PUSH: json %s." CR), json.c_str());
+  Log.verbose(F("PUSH: json %s." CR), doc.c_str());
 #endif
 
   // Send HTTP POST request
   http.addHeader(F("Content-Type"), F("application/json"));
-  int httpResponseCode = http.POST(json);
+  int httpResponseCode = http.POST(doc);
 
   if (httpResponseCode == 200) {
     Log.notice(F("PUSH: Brewfather push successful, response=%d" CR),
@@ -200,63 +172,45 @@ void PushTarget::sendBrewfather(float angle, float gravity, float corrGravity,
   }
 
   http.end();
+  myWifi.closeWifiClient();
 }
 
 //
 // Send data to http target
 //
-void PushTarget::createIspindleFormat(DynamicJsonDocument &doc, float angle,
-                                      float gravity, float corrGravity,
-                                      float temp, float runTime) {
-  // Use iSpindle format for compatibility
-  doc["name"] = myConfig.getMDNS();
-  doc["ID"] = myConfig.getID();
-  doc["token"] = "gravmon";
-  doc["interval"] = myConfig.getSleepInterval();
-  doc["temperature"] = reduceFloatPrecision(temp, 1);
-  doc["temp-units"] = String(myConfig.getTempFormat());
-  // TODO: Add support for plato format
-  doc["gravity"] = reduceFloatPrecision(
-      myConfig.isGravityTempAdj() ? corrGravity : gravity, 4);
-  doc["corr-gravity"] = reduceFloatPrecision(corrGravity, 4);
-  doc["angle"] = reduceFloatPrecision(angle, 2);
-  doc["battery"] = reduceFloatPrecision(myBatteryVoltage.getVoltage(), 2);
-  doc["rssi"] = WiFi.RSSI();
-
-  // Some additional information
-  doc["gravity-units"] = "SG";
-  doc["run-time"] = reduceFloatPrecision(runTime, 2);
-}
-
-//
-// Send data to http target
-//
-void PushTarget::sendHttp(String serverPath, float angle, float gravity,
-                          float corrGravity, float temp, float runTime) {
+void PushTarget::sendHttp(TemplatingEngine& engine, int index) {
 #if !defined(PUSH_DISABLE_LOGGING)
-  Log.notice(
-      F("PUSH: Sending values to http angle=%F, gravity=%F, temp=%F." CR),
-      angle, gravity, temp);
+  Log.notice(F("PUSH: Sending values to http (%s)" CR),
+             index ? "http2" : "http1");
 #endif
 
-  DynamicJsonDocument doc(256);
-  createIspindleFormat(doc, angle, gravity, corrGravity, temp, runTime);
+  String serverPath, doc;
+
+  if (index == 0) {
+    serverPath = myConfig.getHttpPushUrl();
+    doc = engine.create(TemplatingEngine::TEMPLATE_HTTP1);
+  } else {
+    serverPath = myConfig.getHttpPushUrl2();
+    doc = engine.create(TemplatingEngine::TEMPLATE_HTTP2);
+  }
 
-  WiFiClient client;
   HTTPClient http;
+  if (serverPath.startsWith("https://")) {
+    myWifi.getWifiClientSecure().setInsecure();
+    Log.notice(F("PUSH: HTTP, SSL enabled without validation." CR));
+    http.begin(myWifi.getWifiClientSecure(), serverPath);
+  } else {
+    http.begin(myWifi.getWifiClient(), serverPath);
+  }
 
-  // Your Domain name with URL path or IP address with path
-  http.begin(client, serverPath);
-  String json;
-  serializeJson(doc, json);
 #if LOG_LEVEL == 6 && !defined(PUSH_DISABLE_LOGGING)
   Log.verbose(F("PUSH: url %s." CR), serverPath.c_str());
-  Log.verbose(F("PUSH: json %s." CR), json.c_str());
+  Log.verbose(F("PUSH: json %s." CR), doc.c_str());
 #endif
 
   // Send HTTP POST request
   http.addHeader(F("Content-Type"), F("application/json"));
-  int httpResponseCode = http.POST(json);
+  int httpResponseCode = http.POST(doc);
 
   if (httpResponseCode == 200) {
     Log.notice(F("PUSH: HTTP push successful, response=%d" CR),
@@ -266,46 +220,75 @@ void PushTarget::sendHttp(String serverPath, float angle, float gravity,
   }
 
   http.end();
+  myWifi.closeWifiClient();
 }
 
 //
 // Send data to http target
 //
-void PushTarget::sendMqtt(float angle, float gravity, float corrGravity,
-                          float temp, float runTime) {
+void PushTarget::sendMqtt(TemplatingEngine& engine) {
 #if !defined(PUSH_DISABLE_LOGGING)
-  Log.notice(
-      F("PUSH: Sending values to mqtt angle=%F, gravity=%F, temp=%F." CR),
-      angle, gravity, temp);
+  Log.notice(F("PUSH: Sending values to mqtt." CR));
 #endif
 
-  DynamicJsonDocument doc(256);
-  createIspindleFormat(doc, angle, gravity, corrGravity, temp, runTime);
+  MQTTClient mqtt(512);
+  String url = myConfig.getMqttUrl();
+  String doc = engine.create(TemplatingEngine::TEMPLATE_MQTT);
+  int port = myConfig.getMqttPort();
 
-  WiFiClient client;
-  MQTTClient mqtt(512);  // Maximum message size
+  // if (url.endsWith(":8883")) {
+  if (port > 8000) {
+    // Allow secure channel, but without certificate validation
+    myWifi.getWifiClientSecure().setInsecure();
+    Log.notice(F("PUSH: MQTT, SSL enabled without validation." CR));
+    mqtt.begin(url.c_str(), port, myWifi.getWifiClientSecure());
+  } else {
+    mqtt.begin(myConfig.getMqttUrl(), port, myWifi.getWifiClient());
+  }
 
-  mqtt.begin(myConfig.getMqttUrl(), client);
   mqtt.connect(myConfig.getMDNS(), myConfig.getMqttUser(),
                myConfig.getMqttPass());
 
-  String json;
-  serializeJson(doc, json);
 #if LOG_LEVEL == 6 && !defined(PUSH_DISABLE_LOGGING)
   Log.verbose(F("PUSH: url %s." CR), myConfig.getMqttUrl());
-  Log.verbose(F("PUSH: json %s." CR), json.c_str());
+  Log.verbose(F("PUSH: data %s." CR), doc.c_str());
 #endif
 
-  // Send MQQT message
+  // Send MQQT message(s)
   mqtt.setTimeout(10);  // 10 seconds timeout
-  if (mqtt.publish(myConfig.getMqttTopic(), json)) {
-    Log.notice(F("PUSH: MQTT publish successful" CR));
+
+  int lines = 1;
+  // Find out how many lines are in the document. Each line is one
+  // topic/message. | is used as new line.
+  for (unsigned int i = 0; i < doc.length() - 1; i++) {
+    if (doc.charAt(i) == '|') lines++;
+  }
+
+  int index = 0;
+  while (lines) {
+    int next = doc.indexOf('|', index);
+    String line = doc.substring(index, next);
+
+    // Each line equals one topic post, format is <topic>:<value>
+    String topic = line.substring(0, line.indexOf(":"));
+    String value = line.substring(line.indexOf(":") + 1);
+#if LOG_LEVEL == 6 && !defined(PUSH_DISABLE_LOGGING)
+    Log.verbose(F("PUSH: topic '%s', value '%s'." CR), topic.c_str(),
+                value.c_str());
+#endif
+    if (mqtt.publish(topic, value)) {
+      Log.notice(F("PUSH: MQTT publish successful on %s" CR), topic.c_str());
     } else {
       Log.error(F("PUSH: MQTT publish failed err=%d, ret=%d" CR),
                 mqtt.lastError(), mqtt.returnCode());
     }
 
+    index = next + 1;
+    lines--;
+  }
+
   mqtt.disconnect();
+  myWifi.closeWifiClient();
 }
 
 // EOF

src/pushtarget.hpp

@@ -24,34 +24,20 @@ SOFTWARE.
 #ifndef SRC_PUSHTARGET_HPP_
 #define SRC_PUSHTARGET_HPP_
 
-// Includes
-#include <Arduino.h>
-#include <ArduinoJson.h>
-#include <ESP8266HTTPClient.h>
-#include <ESP8266WiFi.h>
+#include <templating.hpp>
 
-#include <helper.hpp>
-
-// Classes
 class PushTarget {
  private:
-  uint32_t ms;  // Used to check that we do not post to often
+  uint32_t _ms;  // Used to check that we do not post to often
 
-  void sendBrewfather(float angle, float gravity, float corrGravity,
-                      float temp);
-  void sendHttp(String serverPath, float angle, float gravity,
-                float corrGravity, float temp, float runTime);
-  void sendInfluxDb2(float angle, float gravity, float corrGravity, float temp,
-                     float runTime);
-  void sendMqtt(float angle, float gravity, float corrGravity, float temp,
-                float runTime);
-  void createIspindleFormat(DynamicJsonDocument &doc, float angle,
-                            float gravity, float corrGravity, float temp,
-                            float runTime);
+  void sendBrewfather(TemplatingEngine& engine);
+  void sendHttp(TemplatingEngine& engine, int index);
+  void sendInfluxDb2(TemplatingEngine& engine);
+  void sendMqtt(TemplatingEngine& engine);
 
  public:
-  PushTarget() { ms = millis(); }
-  void send(float angle, float gravity, float corrGravity, float temp,
+  PushTarget() { _ms = millis(); }
+  void send(float angle, float gravitySG, float corrGravitySG, float tempC,
             float runTime, bool force = false);
 };
 

src/resources.cpp

@@ -21,23 +21,24 @@ 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 (ESP8266)
 #define INCBIN_OUTPUT_SECTION ".irom.text"
+#endif
 #include <incbin.h>
 
-#if defined(EMBED_HTML)
+#include <resources.hpp>
 
+#if defined(EMBED_HTML)
 // Using minify to reduce memory usage. Reducing RAM memory usage with about 7%
 INCBIN(IndexHtm, "data/index.min.htm");
 INCBIN(DeviceHtm, "data/device.min.htm");
 INCBIN(ConfigHtm, "data/config.min.htm");
 INCBIN(CalibrationHtm, "data/calibration.min.htm");
+INCBIN(FormatHtm, "data/format.min.htm");
 INCBIN(AboutHtm, "data/about.min.htm");
-
 #else
-
 // Minium web interface for uploading htm files
 INCBIN(UploadHtm, "data/upload.min.htm");
-
 #endif
 
 // EOF

src/resources.hpp

@@ -0,0 +1,76 @@
+/*
+MIT License
+
+Copyright (c) 2021-22 Magnus
+
+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 above 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.
+ */
+#ifndef SRC_RESOURCES_HPP_
+#define SRC_RESOURCES_HPP_
+
+// Common strings used in json formats.
+#define PARAM_ID "id"
+#define PARAM_MDNS "mdns"
+#define PARAM_OTA "ota-url"
+#define PARAM_SSID "wifi-ssid"
+#define PARAM_PASS "wifi-pass"
+#define PARAM_PUSH_BREWFATHER "brewfather-push"
+#define PARAM_PUSH_HTTP "http-push"
+#define PARAM_PUSH_HTTP2 "http-push2"
+#define PARAM_PUSH_INFLUXDB2 "influxdb2-push"
+#define PARAM_PUSH_INFLUXDB2_ORG "influxdb2-org"
+#define PARAM_PUSH_INFLUXDB2_BUCKET "influxdb2-bucket"
+#define PARAM_PUSH_INFLUXDB2_AUTH "influxdb2-auth"
+#define PARAM_PUSH_MQTT "mqtt-push"
+#define PARAM_PUSH_MQTT_USER "mqtt-user"
+#define PARAM_PUSH_MQTT_PASS "mqtt-pass"
+#define PARAM_PUSH_MQTT_PORT "mqtt-port"
+#define PARAM_SLEEP_INTERVAL "sleep-interval"
+#define PARAM_TEMPFORMAT "temp-format"
+#define PARAM_VOLTAGEFACTOR "voltage-factor"
+#define PARAM_GRAVITY_FORMULA "gravity-formula"
+#define PARAM_GRAVITY_FORMAT "gravity-format"
+#define PARAM_GRAVITY_TEMP_ADJ "gravity-temp-adjustment"
+#define PARAM_TEMP_ADJ "temp-adjustment-value"
+#define PARAM_GYRO_CALIBRATION "gyro-calibration-data"
+#define PARAM_GYRO_TEMP "gyro-temp"
+#define PARAM_FORMULA_DATA "formula-calculation-data"
+#define PARAM_APP_NAME "app-name"
+#define PARAM_APP_VER "app-ver"
+#define PARAM_ANGLE "angle"
+#define PARAM_GRAVITY "gravity"
+#define PARAM_TEMP_C "temp-c"
+#define PARAM_TEMP_F "temp-f"
+#define PARAM_BATTERY "battery"
+#define PARAM_SLEEP_MODE "sleep-mode"
+#define PARAM_RSSI "rssi"
+#define PARAM_ERROR "error"
+#define PARAM_HW_GYRO_READ_COUNT "gyro-read-count"
+#define PARAM_HW_GYRO_READ_DELAY "gyro-read-delay"
+#define PARAM_HW_GYRO_MOVING_THREASHOLD "gyro-moving-threashold"
+#define PARAM_HW_FORMULA_DEVIATION "formula-max-deviation"
+#define PARAM_HW_FORMULA_CALIBRATION_TEMP "formula-calibration-temp"
+#define PARAM_HW_WIFI_PORTALTIMEOUT "wifi-portaltimeout"
+#define PARAM_FORMAT_HTTP1 "http-1"
+#define PARAM_FORMAT_HTTP2 "http-2"
+#define PARAM_FORMAT_BREWFATHER "brewfather"
+#define PARAM_FORMAT_INFLUXDB "influxdb"
+#define PARAM_FORMAT_MQTT "mqtt"
+
+#endif  // SRC_RESOURCES_HPP_

src/templating.cpp

@@ -0,0 +1,191 @@
+/*
+MIT License
+
+Copyright (c) 2021-22 Magnus
+
+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 above 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.
+ */
+#include <templating.hpp>
+#include <config.hpp>
+
+#if defined (ESP8266)
+#include <ESP8266WiFi.h>
+#else // defined (ESP32)
+#include <WiFi.h>
+#endif
+
+// Use iSpindle format for compatibility
+const char iSpindleFormat[] PROGMEM = 
+  "{"
+    "\"name\" : \"${mdns}\", "
+     "\"ID\": \"${id}\", "
+     "\"token\" : \"gravmon\", "
+     "\"interval\": ${sleep-interval}, "
+     "\"temperature\": ${temp}, "
+     "\"temp-units\": \"${temp-unit}\", "
+     "\"gravity\": ${gravity}, "
+     "\"angle\": ${angle}, "
+     "\"battery\": ${battery}, "
+     "\"rssi\": ${rssi}, "
+     "\"corr-gravity\": ${corr-gravity}, "
+     "\"gravity-unit\": \"${gravity-unit}\", "
+     "\"run-time\": ${run-time} "
+   "}";
+
+const char brewfatherFormat[] PROGMEM = 
+  "{"
+    "\"name\": \"${mdns}\","
+    "\"temp\": ${temp}, "
+    "\"aux_temp\": 0, "
+    "\"ext_temp\": 0, "
+    "\"temp_unit\": \"${temp-unit}\", "
+    "\"gravity\": ${gravity}, "
+    "\"gravity_unit\": \"${gravity-unit}\", "
+    "\"pressure\": 0, "
+    "\"pressure_unit\": \"PSI\", "
+    "\"ph\": 0, "
+    "\"bpm\": 0, "
+    "\"comment\": \"\", "
+    "\"beer\": \"\", "
+    "\"battery\": ${battery}"
+  "}";
+
+const char influxDbFormat[] PROGMEM = 
+  "measurement,host=${mdns},device=${id},temp-format=${temp-unit},gravity-format=${gravity-unit} "
+  "gravity=${gravity},corr-gravity=${corr-gravity},angle=${angle},temp=${temp},battery=${battery},"
+  "rssi=${rssi}\n";
+
+const char mqttFormat[] PROGMEM = 
+  "ispindel/${mdns}/tilt:${angle}|"
+  "ispindel/${mdns}/temperature:${temp}|"
+  "ispindel/${mdns}/temp_units:${temp-unit}|"
+  "ispindel/${mdns}/battery:${battery}|"
+  "ispindel/${mdns}/gravity:${gravity}|"
+  "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) {
+
+  // Names
+  setVal(TPL_MDNS, myConfig.getMDNS());
+  setVal(TPL_ID, myConfig.getID());
+
+  // Temperature
+  if (myConfig.isTempC()) {
+    setVal(TPL_TEMP, tempC, 1);
+  } else {
+    setVal(TPL_TEMP, convertCtoF(tempC), 1);
+  }
+
+  setVal(TPL_TEMP_C, tempC, 1);
+  setVal(TPL_TEMP_F, convertCtoF(tempC), 1);
+  setVal(TPL_TEMP_UNITS, myConfig.getTempFormat());
+
+  // Battery & Timer
+  setVal(TPL_BATTERY, myBatteryVoltage.getVoltage());
+  setVal(TPL_SLEEP_INTERVAL, myConfig.getSleepInterval());
+
+  // Performance metrics
+  setVal(TPL_RUN_TIME, runTime, 1);
+  setVal(TPL_RSSI, WiFi.RSSI());
+
+  // Angle/Tilt
+  setVal(TPL_TILT, angle);
+  setVal(TPL_ANGLE, angle);
+
+  // Gravity options
+  if (myConfig.isGravitySG()) {
+    setVal(TPL_GRAVITY, gravitySG, 4);
+    setVal(TPL_GRAVITY_CORR, corrGravitySG, 4);
+  }
+  else {
+    setVal(TPL_GRAVITY, convertToPlato(gravitySG), 1);
+    setVal(TPL_GRAVITY_CORR, convertToPlato(corrGravitySG), 1);
+  }
+
+  setVal(TPL_GRAVITY_G, gravitySG, 4);
+  setVal(TPL_GRAVITY_P, convertToPlato(gravitySG), 1);
+  setVal(TPL_GRAVITY_CORR_G, corrGravitySG, 4);
+  setVal(TPL_GRAVITY_CORR_P, convertToPlato(corrGravitySG), 1);
+  setVal(TPL_GRAVITY_UNIT, myConfig.getGravityFormat());
+
+#if LOG_LEVEL == 6
+  // dumpAll();
+#endif
+}
+
+//
+// Create the data using defined template.
+//
+const String& TemplatingEngine::create(TemplatingEngine::Templates idx) {
+  String fname;
+
+  // Load templates from memory
+  switch (idx) {
+    case TEMPLATE_HTTP1:
+      baseTemplate = String(iSpindleFormat);
+      fname = TPL_FNAME_HTTP1;
+    break;
+    case TEMPLATE_HTTP2:
+      baseTemplate = String(iSpindleFormat);
+      fname = TPL_FNAME_HTTP2;
+    break;
+    case TEMPLATE_BREWFATHER:
+      baseTemplate = String(brewfatherFormat);
+      //fname = TPL_FNAME_BREWFATHER;
+    break;
+    case TEMPLATE_INFLUX:
+      baseTemplate = String(influxDbFormat);
+      fname = TPL_FNAME_INFLUXDB;
+    break;
+    case TEMPLATE_MQTT:
+      baseTemplate = String(mqttFormat);
+      fname = TPL_FNAME_MQTT;
+    break;
+  }
+
+  // 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
+  //Log.verbose(F("TPL : Base '%s'." CR), baseTemplate.c_str());
+#endif
+
+  // Insert data into template.
+  transform(baseTemplate);
+
+#if LOG_LEVEL == 6
+  //Log.verbose(F("TPL : Transformed '%s'." CR), baseTemplate.c_str());
+#endif
+
+  return baseTemplate;
+}
+
+// EOF

src/templating.hpp

@@ -0,0 +1,147 @@
+/*
+MIT License
+
+Copyright (c) 2021-22 Magnus
+
+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 above 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.
+ */
+#ifndef SRC_TEMPLATING_HPP_
+#define SRC_TEMPLATING_HPP_
+
+// Includes
+#include <Arduino.h>
+#include <main.hpp>
+#include <helper.hpp>
+#include <algorithm>
+
+// Templating variables
+#define TPL_MDNS "${mdns}"
+#define TPL_ID "${id}"
+#define TPL_SLEEP_INTERVAL "${sleep-interval}"
+#define TPL_TEMP "${temp}"
+#define TPL_TEMP_C "${temp-c}"
+#define TPL_TEMP_F "${temp-f}"
+#define TPL_TEMP_UNITS "${temp-unit}" // C or F
+#define TPL_BATTERY "${battery}"
+#define TPL_RSSI "${rssi}"
+#define TPL_RUN_TIME "${run-time}"
+#define TPL_ANGLE "${angle}"
+#define TPL_TILT "${tilt}" // same as angle
+#define TPL_GRAVITY "${gravity}"
+#define TPL_GRAVITY_G "${gravity-sg}"
+#define TPL_GRAVITY_P "${gravity-plato}"
+#define TPL_GRAVITY_CORR "${corr-gravity}"
+#define TPL_GRAVITY_CORR_G "${corr-gravity-sg}"
+#define TPL_GRAVITY_CORR_P "${corr-gravity-plato}"
+#define TPL_GRAVITY_UNIT "${gravity-unit}" // G or P
+
+#define TPL_FNAME_HTTP1 "/http-1.tpl"
+#define TPL_FNAME_HTTP2 "/http-2.tpl"
+// #define TPL_FNAME_BREWFATHER "/brewfather.tpl"
+#define TPL_FNAME_INFLUXDB "/influxdb.tpl"
+#define TPL_FNAME_MQTT "/mqtt.tpl"
+
+extern const char iSpindleFormat[] PROGMEM;
+extern const char brewfatherFormat[] PROGMEM;
+extern const char influxDbFormat[] PROGMEM;
+extern const char mqttFormat[] PROGMEM;
+
+// Classes
+class TemplatingEngine {
+ private:
+  struct KeyVal {
+    String key;
+    String val;
+  };
+
+  KeyVal items[19] = { 
+    { 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, "" }
+  };
+
+  char buffer[20];
+  String baseTemplate;
+
+  void setVal(String key, float val, int dec = 2) { 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);
+    for (int i = 0; i < max; i++) {
+      if (items[i].key.equals(key)) {
+        items[i].val = val;
+        return;
+      }
+    }
+
+    Log.error(F("TPL : Key not found %s." CR), key.c_str());
+  }
+
+  void transform(String& s) {
+    int max = sizeof(items)/sizeof(KeyVal);
+    for (int i = 0; i < max; i++) {
+      while (s.indexOf(items[i].key) != -1)
+        s.replace(items[i].key, items[i].val);
+    }
+  }
+
+  void dumpAll() {
+    int max = sizeof(items)/sizeof(KeyVal);
+    for (int i = 0; i < max; i++) {
+        Serial.print( "Key=\'" );
+        Serial.print( items[i].key.c_str() );
+        Serial.print( "\', Val=\'" );
+        Serial.print( items[i].val.c_str() );
+        Serial.println( "\'" );
+    }
+  }
+
+ public:
+  enum Templates {
+    TEMPLATE_HTTP1 = 0,
+    TEMPLATE_HTTP2 = 1,
+    TEMPLATE_BREWFATHER = 2,
+    TEMPLATE_INFLUX = 3,
+    TEMPLATE_MQTT = 4
+  };
+
+  void initialize(float angle, float gravitySG, float corrGravitySG, float tempC, float runTime);
+  const String& create(TemplatingEngine::Templates idx);
+};
+
+#endif  // SRC_TEMPLATING_HPP_
+
+// EOF

src/tempsensor.cpp

@@ -27,15 +27,10 @@ SOFTWARE.
 
 #include <config.hpp>
 #include <gyro.hpp>
-#include <helper.hpp>
+#include <main.hpp>
 #include <tempsensor.hpp>
 
-//
-// Conversion between C and F
-//
-float convertCtoF(float t) { return (t * 1.8) + 32.0; }
-
-OneWire myOneWire(D6);
+OneWire myOneWire(PIN_DS);
 DallasTemperature mySensors(&myOneWire);
 #define TEMPERATURE_PRECISION 9
 
@@ -63,20 +58,12 @@ void TempSensor::setup() {
     mySensors.setResolution(TEMPERATURE_PRECISION);
   }
 
-  float t = myConfig.getTempSensorAdj();
-
   // Set the temp sensor adjustment values
-  if (myConfig.isTempC()) {
-    tempSensorAdjF = t * 1.8;  // Convert the adjustment value to C
-    tempSensorAdjC = t;
-  } else {
-    tempSensorAdjF = t;
-    tempSensorAdjC = t * 0.556;  // Convert the adjustent value to F
-  }
+  _tempSensorAdjC = myConfig.getTempSensorAdjC();
 
 #if LOG_LEVEL == 6 && !defined(TSEN_DISABLE_LOGGING)
-  Log.verbose(F("TSEN: Adjustment values for temp sensor %F C, %F F." CR),
-              tempSensorAdjC, tempSensorAdjF);
+  Log.verbose(F("TSEN: Adjustment values for temp sensor %F C." CR),
+              _tempSensorAdjC);
 #endif
 }
 
@@ -95,13 +82,15 @@ float TempSensor::getValue(bool useGyro) {
 #if LOG_LEVEL == 6 && !defined(TSEN_DISABLE_LOGGING)
     Log.verbose(F("TSEN: Reciving temp value for gyro sensor %F C." CR), c);
 #endif
-    hasSensor = true;
+    _hasSensor = true;
     return c;
   }
 
   // If we dont have sensors just return 0
   if (!mySensors.getDS18Count()) {
-    Log.error(F("TSEN: No temperature sensors found. Skipping read." CR));
+#if !defined(TSEN_DISABLE_LOGGING)
+    Log.notice(F("TSEN: No temperature sensors found. Skipping read." CR));
+#endif
     return -273;
   }
 
@@ -116,7 +105,7 @@ float TempSensor::getValue(bool useGyro) {
 #if LOG_LEVEL == 6 && !defined(TSEN_DISABLE_LOGGING)
     Log.verbose(F("TSEN: Reciving temp value for DS18B20 sensor %F C." CR), c);
 #endif
-    hasSensor = true;
+    _hasSensor = true;
   }
   return c;
 }

src/tempsensor.hpp

@@ -24,29 +24,20 @@ SOFTWARE.
 #ifndef SRC_TEMPSENSOR_HPP_
 #define SRC_TEMPSENSOR_HPP_
 
-// definitions
-float convertCtoF(float t);
-
-// classes
 class TempSensor {
  private:
-  bool hasSensor = false;
-  float tempSensorAdjF = 0;
-  float tempSensorAdjC = 0;
+  bool _hasSensor = false;
+  float _tempSensorAdjC = 0;
   float getValue(bool useGyro);
 
  public:
   void setup();
-  bool isSensorAttached() { return hasSensor; }
+  bool isSensorAttached() { return _hasSensor; }
   float getTempC(bool useGyro = false) {
-    return getValue(useGyro) + tempSensorAdjC;
-  }
-  float getTempF(bool useGyro = false) {
-    return convertCtoF(getValue(useGyro)) + tempSensorAdjF;
+    return getValue(useGyro) + _tempSensorAdjC;
   }
 };
 
-// Global instance created
 extern TempSensor myTempSensor;
 
 #endif  // SRC_TEMPSENSOR_HPP_

src/webserver.hpp

@@ -24,29 +24,33 @@ SOFTWARE.
 #ifndef SRC_WEBSERVER_HPP_
 #define SRC_WEBSERVER_HPP_
 
-// Include
+#if defined (ESP8266)
 #include <ESP8266WebServer.h>
 #include <ESP8266WiFi.h>
 #include <ESP8266mDNS.h>
+#else // defined (ESP32)
+#include <WebServer.h>
+#include <WiFi.h>
+#include <ESPmDNS.h>
+#endif
 #include <incbin.h>
 
-// Binary resouces
 #if defined(EMBED_HTML)
 INCBIN_EXTERN(IndexHtm);
 INCBIN_EXTERN(DeviceHtm);
 INCBIN_EXTERN(ConfigHtm);
 INCBIN_EXTERN(CalibrationHtm);
+INCBIN_EXTERN(FormatHtm);
 INCBIN_EXTERN(AboutHtm);
 #else
 INCBIN_EXTERN(UploadHtm);
 #endif
 
-// classes
-class WebServer {
+class WebServerHandler {
  private:
-  ESP8266WebServer* server = 0;
-  File uploadFile;
-  int lastFormulaCreateError = 0;
+  ESP8266WebServer* _server = 0;
+  File _uploadFile;
+  int _lastFormulaCreateError = 0;
 
   void webHandleConfig();
   void webHandleFormulaWrite();
@@ -55,6 +59,8 @@ class WebServer {
   void webHandleConfigGravity();
   void webHandleConfigPush();
   void webHandleConfigDevice();
+  void webHandleConfigFormatRead();
+  void webHandleConfigFormatWrite();
   void webHandleStatusSleepmode();
   void webHandleClearWIFI();
   void webHandleStatus();
@@ -63,32 +69,44 @@ class WebServer {
   void webHandleUploadFile();
   void webHandleUpload();
   void webHandleDevice();
+  void webHandleDeviceParam();
   void webHandlePageNotFound();
 
+  String readFile(String fname);
+  bool writeFile(String fname, String data);
+
+  String getRequestArguments();
+
   // Inline functions.
-  void webReturnOK() { server->send(200); }
+  void webReturnOK() { _server->send(200); }
 #if defined(EMBED_HTML)
   void webReturnIndexHtm() {
-    server->send_P(200, "text/html", (const char*)gIndexHtmData, gIndexHtmSize);
+    _server->send_P(200, "text/html", (const char*)gIndexHtmData,
+                    gIndexHtmSize);
   }
   void webReturnDeviceHtm() {
-    server->send_P(200, "text/html", (const char*)gDeviceHtmData,
+    _server->send_P(200, "text/html", (const char*)gDeviceHtmData,
                     gDeviceHtmSize);
   }
   void webReturnConfigHtm() {
-    server->send_P(200, "text/html", (const char*)gConfigHtmData,
+    _server->send_P(200, "text/html", (const char*)gConfigHtmData,
                     gConfigHtmSize);
   }
   void webReturnCalibrationHtm() {
-    server->send_P(200, "text/html", (const char*)gCalibrationHtmData,
+    _server->send_P(200, "text/html", (const char*)gCalibrationHtmData,
                     gCalibrationHtmSize);
   }
+  void webReturnFormatHtm() {
+    _server->send_P(200, "text/html", (const char*)gFormatHtmData,
+                    gFormatHtmSize);
+  }
   void webReturnAboutHtm() {
-    server->send_P(200, "text/html", (const char*)gAboutHtmData, gAboutHtmSize);
+    _server->send_P(200, "text/html", (const char*)gAboutHtmData,
+                    gAboutHtmSize);
   }
 #else
   void webReturnUploadHtm() {
-    server->send_P(200, "text/html", (const char*)gUploadHtmData,
+    _server->send_P(200, "text/html", (const char*)gUploadHtmData,
                     gUploadHtmSize);
   }
 #endif
@@ -99,7 +117,8 @@ class WebServer {
     HTML_DEVICE = 1,
     HTML_CONFIG = 2,
     HTML_ABOUT = 3,
-    HTML_CALIBRATION = 4
+    HTML_CALIBRATION = 4,
+    HTML_FORMAT = 5
   };
 
   bool setupWebServer();
@@ -109,7 +128,7 @@ class WebServer {
 };
 
 // Global instance created
-extern WebServer myWebServer;
+extern WebServerHandler myWebServerHandler;
 
 #endif  // SRC_WEBSERVER_HPP_
 

src/wifi.cpp

@@ -21,22 +21,27 @@ 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 (ESP8266)
 #include <ESP8266HTTPClient.h>
 #include <ESP8266httpUpdate.h>
-#include <LittleFS.h>
+#else // defined (ESP32)
+#include <WiFi.h>
+#include <HTTPClient.h>
+#include <HTTPUpdate.h>
+#endif
 #include <incbin.h>
-
-#include <ArduinoJson.hpp>
-#include <calc.hpp>
 #include <config.hpp>
-#include <gyro.hpp>
-#include <helper.hpp>
-#include <tempsensor.hpp>
+#include <main.hpp>
 #include <wifi.hpp>
 
 // Settings for DRD
+#if defined (ESP8266)
 #define ESP_DRD_USE_LITTLEFS true
 #define ESP_DRD_USE_SPIFFS false
+#else // defined (ESP32)
+#define ESP_DRD_USE_LITTLEFS false
+#define ESP_DRD_USE_SPIFFS true
+#endif
 #define ESP_DRD_USE_EEPROM false
 #include <ESP_DoubleResetDetector.h>
 #define DRD_TIMEOUT 3
@@ -65,15 +70,14 @@ ESP_WiFiManager *myWifiManager;
 DoubleResetDetector *myDRD;
 
 WifiConnection myWifi;
+
 const char *userSSID = USER_SSID;
 const char *userPWD = USER_SSID_PWD;
 
-const int PIN_LED = 2;
-
 //
-// Constructor
+// Initialize
 //
-WifiConnection::WifiConnection() {
+void WifiConnection::init() {
   myDRD = new DoubleResetDetector(DRD_TIMEOUT, DRD_ADDRESS);
 }
 
@@ -110,6 +114,8 @@ 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();
 }
 
@@ -130,7 +136,8 @@ void WifiConnection::startPortal() {
   myWifiManager = new ESP_WiFiManager(WIFI_MDNS);
   myWifiManager->setMinimumSignalQuality(-1);
   myWifiManager->setConfigPortalChannel(0);
-  myWifiManager->setConfigPortalTimeout(120);
+  myWifiManager->setConfigPortalTimeout(
+      myHardwareConfig.getWifiPortalTimeout());
 
   if (myWifiManager->startConfigPortal(WIFI_DEFAULT_SSID, WIFI_DEFAULT_PWD)) {
     Log.notice(F("WIFI: Exited portal, connected to wifi. Rebooting..." CR));
@@ -144,7 +151,7 @@ void WifiConnection::startPortal() {
 
   stopDoubleReset();
   delay(500);
-  ESP.reset();
+  ESP_RESET();
 }
 
 //
@@ -191,7 +198,6 @@ bool WifiConnection::waitForConnection(int maxTime) {
       return false;  // Return to main that we have failed to connect.
     }
   }
-
   Serial.print(CR);
   Log.notice(F("WIFI: Connected to wifi ip=%s." CR), getIPAddress().c_str());
   Log.notice(F("WIFI: Using mDNS name %s." CR), myConfig.getMDNS());
@@ -222,7 +228,7 @@ bool WifiConnection::disconnect() {
 //
 //
 bool WifiConnection::updateFirmware() {
-  if (!newFirmware) {
+  if (!_newFirmware) {
     Log.notice(F("WIFI: No newer version exist, skipping update." CR));
     return false;
   }
@@ -230,11 +236,17 @@ bool WifiConnection::updateFirmware() {
   Log.verbose(F("WIFI: Updating firmware." CR));
 #endif
 
-  WiFiClient client;
   String serverPath = myConfig.getOtaURL();
   serverPath += "firmware.bin";
+  HTTPUpdateResult ret;
 
-  HTTPUpdateResult ret = ESPhttpUpdate.update(client, serverPath);
+  if (serverPath.startsWith("https://")) {
+    myWifi.getWifiClientSecure().setInsecure();
+    Log.notice(F("WIFI: OTA, SSL enabled without validation." CR));
+    ret = ESPhttpUpdate.update(myWifi.getWifiClientSecure(), serverPath);
+  } else {
+    ret = ESPhttpUpdate.update(myWifi.getWifiClient(), serverPath);
+  }
 
   switch (ret) {
     case HTTP_UPDATE_FAILED:
@@ -247,7 +259,7 @@ bool WifiConnection::updateFirmware() {
     case HTTP_UPDATE_OK:
       Log.notice("WIFI: OTA Update sucesfull, rebooting.");
       delay(100);
-      ESP.reset();
+      ESP_RESET();
       break;
   }
   return false;
@@ -257,16 +269,21 @@ bool WifiConnection::updateFirmware() {
 // Download and save file
 //
 void WifiConnection::downloadFile(const char *fname) {
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
   Log.verbose(F("WIFI: Download file %s." CR), fname);
 #endif
-  WiFiClient client;
   HTTPClient http;
   String serverPath = myConfig.getOtaURL();
   serverPath += fname;
 
-  // Your Domain name with URL path or IP address with path
-  http.begin(client, serverPath);
+  if (serverPath.startsWith("https://")) {
+    myWifi.getWifiClientSecure().setInsecure();
+    Log.notice(F("WIFI: OTA, SSL enabled without validation." CR));
+    http.begin(myWifi.getWifiClientSecure(), serverPath);
+  } else {
+    http.begin(myWifi.getWifiClient(), serverPath);
+  }
+
   int httpResponseCode = http.GET();
 
   if (httpResponseCode == 200) {
@@ -279,22 +296,28 @@ void WifiConnection::downloadFile(const char *fname) {
               httpResponseCode);
   }
   http.end();
+  myWifi.closeWifiClient();
 }
 
 //
 // Check what firmware version is available over OTA
 //
 bool WifiConnection::checkFirmwareVersion() {
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
   Log.verbose(F("WIFI: Checking if new version exist." CR));
 #endif
-  WiFiClient client;
   HTTPClient http;
   String serverPath = myConfig.getOtaURL();
   serverPath += "version.json";
 
   // Your Domain name with URL path or IP address with path
-  http.begin(client, serverPath);
+  if (serverPath.startsWith("https://")) {
+    myWifi.getWifiClientSecure().setInsecure();
+    Log.notice(F("WIFI: OTA, SSL enabled without validation." CR));
+    http.begin(myWifi.getWifiClientSecure(), serverPath);
+  } else {
+    http.begin(myWifi.getWifiClient(), serverPath);
+  }
 
   // Send HTTP GET request
   int httpResponseCode = http.GET();
@@ -303,7 +326,7 @@ bool WifiConnection::checkFirmwareVersion() {
     Log.notice(F("WIFI: Found version.json, response=%d" CR), httpResponseCode);
 
     String payload = http.getString();
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
     Log.verbose(F("WIFI: Payload %s." CR), payload.c_str());
 #endif
     DynamicJsonDocument ver(300);
@@ -311,7 +334,7 @@ bool WifiConnection::checkFirmwareVersion() {
     if (err) {
       Log.error(F("WIFI: Failed to parse version.json, %s" CR), err);
     } else {
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
       Log.verbose(F("WIFI: Project %s version %s." CR),
                   (const char *)ver["project"], (const char *)ver["version"]);
 #endif
@@ -320,25 +343,25 @@ bool WifiConnection::checkFirmwareVersion() {
 
       if (parseFirmwareVersionString(newVer, (const char *)ver["version"])) {
         if (parseFirmwareVersionString(curVer, CFG_APPVER)) {
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
           Log.verbose(F("WIFI: OTA checking new=%d.%d.%d cur=%d.%d.%d" CR),
                       newVer[0], newVer[1], newVer[2], curVer[0], curVer[1],
                       curVer[2]);
 #endif
           // Compare major version
-          if (newVer[0] > curVer[0]) newFirmware = true;
+          if (newVer[0] > curVer[0]) _newFirmware = true;
           // Compare minor version
           if (newVer[0] == curVer[0] && newVer[1] > curVer[1])
-            newFirmware = true;
+            _newFirmware = true;
           // Compare patch version
           if (newVer[0] == curVer[0] && newVer[1] == curVer[1] &&
               newVer[2] > curVer[2])
-            newFirmware = true;
+            _newFirmware = true;
         }
       }
 
       // Download new html files to filesystem if they are present.
-      if (!ver["html"].isNull() && newFirmware) {
+      if (!ver["html"].isNull() && _newFirmware) {
         Log.notice(F("WIFI: OTA downloading new html files." CR));
         JsonArray htmlFiles = ver["html"].as<JsonArray>();
         for (JsonVariant v : htmlFiles) {
@@ -355,11 +378,12 @@ bool WifiConnection::checkFirmwareVersion() {
               httpResponseCode);
   }
   http.end();
+  myWifi.closeWifiClient();
 #if LOG_LEVEL == 6
   Log.verbose(F("WIFI: OTA found new version %s." CR),
-              newFirmware ? "true" : "false");
+              _newFirmware ? "true" : "false");
 #endif
-  return newFirmware;
+  return _newFirmware;
 }
 
 //
@@ -367,7 +391,7 @@ bool WifiConnection::checkFirmwareVersion() {
 //
 bool WifiConnection::parseFirmwareVersionString(int (&num)[3],
                                                 const char *version) {
-#if LOG_LEVEL == 6
+#if LOG_LEVEL == 6 && !defined(WIFI_DISABLE_LOGGING)
   Log.verbose(F("WIFI: Parsing version number string %s." CR), version);
 #endif
   char temp[80];

src/wifi.hpp

@@ -24,16 +24,30 @@ SOFTWARE.
 #ifndef SRC_WIFI_HPP_
 #define SRC_WIFI_HPP_
 
-// Include
-#include <Arduino.h>
+#if defined (ESP8266)
+#include <ESP8266WiFi.h>
+#else // defined (ESP32)
+#include <WiFiClient.h>
+#include <WiFiClientSecure.h>
+#endif
+
+#define WIFI_DEFAULT_SSID "GravityMon"  // Name of created SSID
+#define WIFI_DEFAULT_PWD "password"     // Password for created SSID
+#define WIFI_MDNS "gravitymon"          // Prefix for MDNS name
+
+// tcp cleanup, to avoid memory crash.
+struct tcp_pcb;
+extern struct tcp_pcb* tcp_tw_pcbs;
+extern "C" void tcp_abort(struct tcp_pcb* pcb);
 
-// classes
 class WifiConnection {
  private:
   // WIFI
+  WiFiClient _client;
+  WiFiClientSecure _secureClient;
 
   // OTA
-  bool newFirmware = false;
+  bool _newFirmware = false;
   bool parseFirmwareVersionString(int (&num)[3], const char* version);
   void downloadFile(const char* fname);
   void connectAsync();
@@ -41,7 +55,7 @@ class WifiConnection {
 
  public:
   // WIFI
-  WifiConnection();
+  void init();
 
   bool connect();
   bool disconnect();
@@ -53,6 +67,16 @@ class WifiConnection {
   void startPortal();
   void loop();
 
+  WiFiClient& getWifiClient() { return _client; }
+  WiFiClientSecure& getWifiClientSecure() { return _secureClient; }
+  void closeWifiClient() {
+    _client.stop();
+    _secureClient.stop();
+
+    // Cleanup memory allocated by open tcp connetions.
+    while (tcp_tw_pcbs) tcp_abort(tcp_tw_pcbs);
+  }
+
   // OTA
   bool updateFirmware();
   bool checkFirmwareVersion();

src_docs/source/advanced.rst

@@ -0,0 +1,92 @@
+Advanced Configuration
+######################
+
+.. _format-editor:
+
+Format editor
++++++++++++++
+
+To reduce the need for adding custom endpoints for various services there is an built in format editor that allows the user to customize the format being sent to the push target. 
+
+.. warning::
+
+   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 formla and reload the data from the device. 
+
+.. tip::
+
+   If you save a blank string the default template will be loaded.
+
+These are the format keys available for use in the format.
+
+.. list-table:: Directory structure
+   :widths: 30 50 20
+   :header-rows: 1
+
+   * - key 
+     - description
+     - example
+   * - ${mdns}
+     - Name of the device
+     - gravmon2
+   * - ${id}
+     - Unique id of the device
+     - e422a3
+   * - ${sleep-interval}
+     - Seconds between data is pushed
+     - 900
+   * - ${temp}
+     - Temperature in format configured on device, one decimal
+     - 21.2
+   * - ${temp-c}
+     - Temperature in C, one decimal
+     - 21.2
+   * - ${temp-f}
+     - Temperature in F, one decimal
+     - 58.0
+   * - ${temp-unit}
+     - Temperature format `C` or `F`
+     - C
+   * - ${battery}
+     - Battery voltage, two decimals
+     - 3.89
+   * - ${rssi}
+     - Wifi signal strength
+     - -75
+   * - ${run-time}
+     - How long the last measurement took, two decimals
+     - 3.87
+   * - ${angle}
+     - Angle of the gyro, two decimals
+     - 28.67
+   * - ${tilt}
+     - Same as angle.
+     - 28.67
+   * - ${gravity}
+     - Calculated gravity, 4 decimals for SG and 1 for Plato.
+     - 1.0456
+   * - ${gravity-sg}
+     - Calculated gravity in SG, 4 decimals
+     - 1.0456
+   * - ${gravity-plato}
+     - Calculated gravity in Plato, 1 decimal
+     - 8.5
+   * - ${corr-gravity}
+     - Temperature corrected gravity, 4 decimals for SG and 1 for Plato.
+     - 1.0456
+   * - ${corr-gravity-sg}
+     - Temperature corrected gravity in SG, 4 decimals
+     - 1.0456
+   * - ${corr-gravity-plato}
+     - Temperature corrected gravity in Plato, 1 decimal
+     - 8.5
+   * - ${gravity-unit}
+     - Gravity format, `G` or `P`
+     - G
+

src_docs/source/api.rst

@@ -0,0 +1,322 @@
+.. _rest-api:
+
+REST API
+########
+
+All the API's use a key called ``ID`` which is the unique device id (chip id). This is used as an API key when sending requests to the device. 
+
+GET: /api/config
+================
+
+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)
+
+Other parameters are the same as in the configuration guide.
+
+.. code-block:: json
+
+   {
+      "mdns": "gravmon",
+      "id": "ee1bfc",
+      "ota-url": "http://192.168.1.50:80/firmware/gravmon/",
+      "temp-format": "C",
+      "brewfather-push": "http://log.brewfather.net/stream?id=Qwerty",
+      "http-push": "http://192.168.1.50:9090/api/v1/Qwerty/telemetry",
+      "http-push-h1": "header: value",                           
+      "http-push-h2": "header: value",                           
+      "http-push2": "http://192.168.1.50/ispindel",
+      "http-push2-h1": "header: value",                           
+      "http-push2-h2": "header: value",                           
+      "influxdb2-push": "http://192.168.1.50:8086",
+      "influxdb2-org": "org",
+      "influxdb2-bucket": "bucket_id",
+      "influxdb2-auth": "token",
+      "mqtt-push": "192.168.1.50",
+      "mqtt-port": 1883,
+      "mqtt-user": "user",
+      "mqtt-pass": "pass",
+      "sleep-interval": 30,
+      "voltage-factor": 1.59,
+      "gravity-formula": "0.0*tilt^3+0.0*tilt^2+0.0017978*tilt+0.9436",
+      "gravity-format": "G",
+      "temp-adjustment-value": 0,
+      "gravity-temp-adjustment": false,
+      "gyro-temp": true,
+      "gyro-calibration-data": {
+         "ax": -330,
+         "ay": -2249,
+         "az": 1170,
+         "gx": 99,
+         "gy": -6,
+         "gz": 4
+      },
+      "angle": 90.93,
+      "gravity": 1.105,
+      "battery": 0.04
+   }
+
+
+GET: /api/device
+================
+
+Retrive the current device settings via an HTTP GET command. Payload is in JSON format.
+
+.. code-block:: json
+
+   {
+      "app-name": "GravityMon",
+      "app-ver": "0.0.0",
+      "id": "ee1bfc",
+      "mdns": "gravmon"
+   }
+
+
+GET: /api/status
+================
+
+Retrive the current device status via an HTTP GET command. Payload is in JSON format.
+
+* ``temp-format`` can be either ``C`` or ``F``
+
+Other parameters are the same as in the configuration guide.
+
+.. code-block:: json
+
+   {
+      "id": "ee1bfc",
+      "angle": 89.86,
+      "gravity": 1.1052,
+      "gravity-tempcorr": 1.1031,
+      "temp-c": 0,
+      "temp-f": 32,
+      "battery": 0,
+      "temp-format": "C",
+      "sleep-mode": false,
+      "rssi": -56
+   }
+
+
+GET: /api/config/formula
+========================
+
+Retrive the data used for formula calculation data via an HTTP GET command. Payload is in JSON format.
+
+* ``a1``-``a4`` are the angles/tilt readings (up to 5 are currently supported)
+* ``g1``-``g4`` are the corresponding gravity reaadings in SG or Plato depending on the device-format.
+
+.. code-block:: json
+
+   { 
+      "id": "ee1bfc",   
+      "a1": 22.4,       
+      "a2": 54.4, 
+      "a3": 58, 
+      "a4": 0, 
+      "a5": 0, 
+      "g1": 1.000,      
+      "g2": 1.053, 
+      "g3": 1.062, 
+      "g4": 1, 
+      "g5": 1,
+      "gravity-format": "G", 
+      "gravity-formula": "0.0*tilt^3+0.0*tilt^2+0.0017978*tilt+0.9436"
+   }
+
+
+POST: /api/config/device
+========================
+
+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`` (Celcius) or ``F`` (Farenheight)
+
+.. code-block:: 
+
+   id=ee1bfc
+   mdns=gravmon
+   temp-format=C
+   sleep-interval=30
+
+
+POST: /api/config/push
+======================
+
+Used to update push settings via an HTTP POST command. Payload is in JSON format.
+
+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.
+
+.. code-block::
+
+   id=ee1bfc
+   http-push=http://192.168.1.50/ispindel
+   http-push2=
+   http-push-h1=
+   http-push-h2=
+   http-push2-h1=
+   http-push2-h2=
+   brewfather-push=
+   influxdb2-push=http://192.168.1.50:8086
+   influxdb2-org=
+   influxdb2-bucket=
+   influxdb2-auth=
+   mqtt-push=192.168.1.50
+   mqtt-port=1883
+   mqtt-user=
+   mqtt-pass=
+
+
+POST: /api/config/gravity
+=========================
+
+Used to update gravity settings via an HTTP POST command. Payload is in JSON format.
+
+* ``gravity-formula`` keywords ``temp`` and ``tilt`` are supported.
+* ``gravity-format`` can be either ``G`` (SG) or ``P`` (PLATO)
+
+.. note::
+  ``gravity-temp-adjustment`` is defined as "on" or "off" when posting since this is the output values 
+  from a checkbox, when reading data it's sent as boolean (true,false).
+
+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.
+
+.. code-block:: 
+
+   id=ee1bfc                                              
+   gravity-formula=0.0*tilt^3+0.0*tilt^2+0.0017978*tilt+0.9436,
+   gravity-format=P
+   gravity-temp-adjustment=off                                  
+
+
+POST: /api/config/hardware
+==========================
+
+Used to update hardware settings via an HTTP POST command. Payload is in JSON format.
+
+.. note::
+  ``gyro-temp`` is defined as "on" or "off" when posting since this is the output values from a checkbox, when
+  reading data it's sent as boolean (true,false).
+
+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.
+
+.. code-block:: 
+
+   id=ee1bfc
+   voltage-factor=1.59
+   temp-adjustment=0 
+   gyro-temp=off
+   ota-url=http://192.168.1.50/firmware/gravmon/
+
+
+POST: /api/config/formula
+=========================
+
+Used to update formula calculation data via an HTTP POST command. Payload is in JSON format.
+
+* ``a1``-``a4`` are the angles/tilt readings (up to 5 are currently supported)
+* ``g1``-``g4`` are the corresponding gravity reaadings (in SG)
+
+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.
+
+.. code-block::
+
+   id=ee1bfc
+   a1=22.4
+   a2=54.4
+   a3=58
+   a4=0
+   a5=0
+   g1=1.000      
+   g2=1.053 
+   g3=1.062
+   g4=1
+   g5=1 
+
+
+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.
+
+The requests package converts the json to standard form post format. 
+
+.. code-block:: python
+
+   import requests
+   import json
+
+   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 ):
+      headers = { "ContentType": "application/json" }
+      print( url )
+      resp = requests.post( url, headers=headers, data=json )
+      if resp.status_code != 200 :
+         print ( "Failed "  )
+      else :
+         print ( "Success "  )
+
+   url = "http://" + host + "/api/config/device"
+   json = { "id": id, 
+            "mdns": "gravmon",             # Name of the device
+            "temp-format": "C",            # Temperature format C or F
+            "sleep-interval": 30           # Sleep interval in seconds
+         }
+   set_config( url, json )
+
+   url = "http://" + host + "/api/config/push"
+   json = { "id": id, 
+            "http-push": "http://192.168.1.1/ispindel",  
+            "http-push2": "",                           
+            "http-push-h1": "",                           
+            "http-push-h2": "",                           
+            "http-push2-h1": "",                           
+            "http-push2-h2": "",                           
+            "brewfather-push": "",                      
+            "influxdb2-push": "",                       
+            "influxdb2-org": "",
+            "influxdb2-bucket": "",
+            "influxdb2-auth": "",
+            "mqtt-push": "192.168.1.50",
+            "mqtt-port": 1883,
+            "mqtt-user": "Qwerty",
+            "mqtt-pass": "Qwerty"
+            }  
+   set_config( url, json )
+
+   url = "http://" + host + "/api/config/gravity"
+   json = { "id": id, 
+            "gravity-formula": "",                  
+            "gravity-format": "P",
+            "gravity-temp-adjustment": "off"        # Adjust gravity (on/off)
+            }
+   set_config( url, json )
+
+   url = "http://" + host + "/api/config/hardware"
+   json = { "id": id, 
+            "voltage-factor": 1.59,                 # Default value for voltage calculation
+            "temp-adjustment": 0,                   # If temp sensor needs to be corrected
+            "gyro-temp": "on",                      # Use the temp sensor in the gyro instead (on/off)
+            "ota-url": ""                           # if the device should seach for a new update when active
+         }
+   set_config( url, json )
+
+   url = "http://" + host + "/api/formula"
+   json = { "id": id, 
+            "a1": 22.4, 
+            "a2": 54.4, 
+            "a3": 58, 
+            "a4": 0, 
+            "a5": 0, 
+            "g1": 1.000, 
+            "g2": 1.053, 
+            "g3": 1.062, 
+            "g4": 1, 
+            "g5": 1 
+            }
+   set_config( url, json )

src_docs/source/backlog.rst

@@ -1,13 +0,0 @@
-Backlog of changes
-##################
-
-Documentation
--------------
-
-- Write contribution instructions
-
-Code
--------------
-
-- Support for plato
-- Use pre-commit for validating check-in

src_docs/source/compiling.rst

@@ -30,12 +30,16 @@ In the platformio config there are 3 targets defined
 * gravity-debug; Maximum logging for trouble shooting, deep sleep is disabled.
 * gravity-release; Standard release
 * gravity-perf; Standard release but contains code for measuring performance 
+* gravity32-perf: Experimental version for ESP32.
+
+.. 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 unsable and crash the device under certain circumstanses. 
-  Excessive logging to the serial port can cause corruption and crashes. I'm still 
-  trying to figure out what causes these issues in the debug target. Other targets are 
-  stable and works fine.
+  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.
 
 
 Source structure 
@@ -83,19 +87,9 @@ This is a list of C++ defines that is used to enable/disable functions in the co
    * - ACTIVATE_OTA
      - Enables the OTA functionallity in the code
    * - SKIP_SLEEPMODE
-     - THe device never goes into sleep mode, useful when developing.
-   * - CFG_DISABLE_LOGGING
-     - Done include verbose logging in Config class. Excessive logging may crash device.
-   * - GYRO_DISABLE_LOGGING
-     - Done include verbose logging in Gyro class. Excessive logging may crash device.
-   * - PUSH_DISABLE_LOGGING
-     - Done include verbose logging in PushTarget class. Excessive logging may crash device.
-   * - TSEN_DISABLE_LOGGING
-     - Done include verbose logging in TempSensor class. Excessive logging may crash device.
-   * - WEB_DISABLE_LOGGING
-     - Done include verbose logging in WebServer class. Excessive logging may crash device.
-   * - MAIN_DISABLE_LOGGING
-     - Done include verbose logging in Main class. Excessive logging may crash device.
+     - The device never goes into sleep mode, useful when developing.
+   * - xxx_DISABLE_LOGGING
+     - Done include verbose logging in the corresponding class. Excessive logging may crash device.
    * - USE_LITTLEFS
      - Use the new filesystem in Ardurino
    * - EMBED_HTML

src_docs/source/conf.py

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

src_docs/source/configuration.rst

@@ -1,7 +1,7 @@
 .. _setting-up-device:
 
-Setting up device
-#################
+Configuration
+#############
 
 The device can operate in two modes and must be in ``configuration mode`` in order for the web server to be active.
 
@@ -12,6 +12,7 @@ One of the following conditions will place the device in ``configuration mode``:
 - Placed in horizontal mode 85-90 degrees
 - Charger connected >4.15V
 
+
 Status 
 ======
 
@@ -47,11 +48,12 @@ URL: (http://gravmon.local/device)
 
 * **Device name:** 
 
-   This is unique name of the device. 
+   This is unique name of the device which is set in the configuration, also known as MDNS name.
 
 * **Device ID:** 
 
-   This is unique identifier for the device (ESP8266 id), this is required when using the API as an API Key to safeguard against faulty requests.
+   This is unique identifier for the device (ESP8266 id), this is required when using the API as an API Key to safeguard 
+   against faulty requests. This is the ESP8266 chip ID, so it should be unique.
 
 
 Configuration 
@@ -72,15 +74,19 @@ Device Setting
 
 * **Temperature format:** 
 
-   Choose between Celsius and Farenheight
+   Choose between Celsius and Farenheight when displaying temperature. 
 
 * **Interval:** 
 
-   This defines how long the device should be sleeping between the readings when in `gravity monitoring` mode. You will also see the values in minutes/seconds to easier set the interval. 900s is a recommended interval.
+   This defines how long the device should be sleeping between the readings when in `gravity monitoring` mode. You will also see 
+   the values in minutes/seconds to easier set the interval. 900s is a recommended interval.  The sleep interval can 
+   be set between 10 - 3600 seconds (60 minutes). 
 
 .. note::
 
-   The sleep interval can be set between 10 - 3600 seconds (60 minutes). 
+   A low value such as 30s will give a lifespan of 1-2 weeks and 300s (5 min) would last for 3+ weeks. This assumes that 
+   there is good wifi connection that takes less than 1s to reconnect. Poor wifi connection is the main reason for battery drain.
+   
 
 * **Calibration values:** 
 
@@ -97,21 +103,35 @@ Push Settings
   :width: 800
   :alt: 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 belive this is a good balance.
+
+
 * **HTTP URL 1:**
 
-   Endpoint to send data via http. Format used is standard iSpindle format (see format section).
+   Endpoint to send data via http. Default format used Format used :ref:`data-formats-ispindle`. You can customize the format using :ref:`format-editor`.
+
+   If you add the prefix `https://` then the device will use SSL when sending data.
 
 * **HTTP URL 2:**
 
-   Endpoint to send data via http. Format used is standard iSpindle format (see format section).
+   Endpoint to send data via http. Default format used :ref:`data-formats-ispindle`. You can customize the format using :ref:`format-editor`.
+
+   If you add the prefix `https://` then the device will use SSL when sending data. 
 
 * **Brewfather URL:**
 
-   Endpoint to send data via http to brewfather. Format used is defined by brewfather (see format section).
+   Endpoint to send data via http to brewfather. Format used :ref:`data-formats-brewfather`
+
+   SSL is not supported for this target.
 
 * **Influx DB v2 URL:**
 
-   Endpoint to send data via http to InfluxDB. For format (see format section).
+   Endpoint to send data via http to InfluxDB. Format used :ref:`data-formats-influxdb2`. You can customize the format using :ref:`format-editor`.
+
+   SSL is not supported for this target. Raise a issue on github if this is wanted.
 
 * **Influx DB v2 Organisation:**
 
@@ -127,11 +147,11 @@ Push Settings
 
 * **MQTT server:**
 
-   IP or name of server to send data to.
+   IP or name of server to send data to. Default format used :ref:`data-formats-mqtt`. You can customize the format using :ref:`format-editor`.
 
-* **MQTT Topic:**
+* **MQTT Port:**
 
-   Name of topic to publish sensor readings to, iSpindle format is used.
+   Which port should be used for communication, default is 1883 (standard port). For SSL use 8883 (any port over 8000 is treated as SSL). 
 
 * **MQTT user:**
 
@@ -149,18 +169,27 @@ Gravity Settings
   :width: 800
   :alt: Gravity Settings
 
+* **Gravity format:**
+
+   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. Is updated if the calibration function is used.
+   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 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:**
 
-   Will apply a temperature calibration formula to the gravity as a second step. 
+   Will apply a temperature calibration formula to the gravity as a second step after gravity has been calculated. It's also possible to 
+   build this into the gravity formula.
 
 .. warning::
-   This formula assumes that the calibration has been done at 20C.
+   This formula assumes that the calibration has been done at 20°C / 68°F.
 
-Formula used in temperature correction:
+Formula used in temperature correction. 
 
 ::
 
@@ -193,11 +222,13 @@ Hardware Settings
 
 * **OTA URL:**
 
-   Should point to a URL where the .bin file + version.json file is located. 
+   Should point to a URL where the firmware.bin file + version.json file are located. 
 
    For the OTA to work, place the following files (version.json + firmware.bin) at the location that you pointed out in OTA URL. If the version number in the json file is newer than in the 
    code the update will be done during startup.
 
+   If you have the previx `https://` then the device will use secure transfer without CA validation.
+
    Example; OTA URL (don't forget trailing dash), the name of the file should be firmware.bin
 
 .. code-block::
@@ -205,392 +236,3 @@ Hardware Settings
    http://192.168.1.1/firmware/gravmon/
 
 
-.. _create-formula:
-
-Create formula
-##############
-
-.. image:: images/formula1.png
-  :width: 800
-  :alt: Formula data
-
-Here you can enter up to 5 values (angles + gravity) that is then used to create the formula. Angles equal to zero will be regarded as empty even if there is a gravity reading.
-
-.. image:: images/formula2.png
-  :width: 800
-  :alt: Formula graph
-
-Once the formula is created a graph over the entered values and a simulation of the formula will give you a nice overview on how the formula will work.
-
-.. _rest-api:
-
-REST API
-########
-
-All the API's use a key called ``ID`` which is the unique device id (chip id). This is used as an API key when sending requests to the device. 
-
-GET: /api/config
-================
-
-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)
-
-Other parameters are the same as in the configuration guide.
-
-.. code-block:: json
-
-   {
-      "mdns": "gravmon",
-      "id": "ee1bfc",
-      "ota-url": "http://192.168.1.50:80/firmware/gravmon/",
-      "temp-format": "C",
-      "brewfather-push": "http://log.brewfather.net/stream?id=Qwerty",
-      "http-push": "http://192.168.1.50:9090/api/v1/Qwerty/telemetry",
-      "http-push2": "http://192.168.1.50/ispindel",
-      "influxdb2-push": "http://192.168.1.50:8086",
-      "influxdb2-org": "Qwerty",
-      "influxdb2-bucket": "Qwerty",
-      "influxdb2-auth": "Qwerty",
-      "sleep-interval": 30,
-      "voltage-factor": 1.59,
-      "gravity-formula": "0.0*tilt^3+0.0*tilt^2+0.0017978*tilt+0.9436",
-      "gravity-format": "G",
-      "temp-adjustment-value": 0,
-      "gravity-temp-adjustment": false,
-      "gyro-temp": true,
-      "gyro-calibration-data": {
-         "ax": -330,
-         "ay": -2249,
-         "az": 1170,
-         "gx": 99,
-         "gy": -6,
-         "gz": 4
-      },
-      "angle": 90.93,
-      "gravity": 1.105,
-      "battery": 0.04
-   }
-
-
-GET: /api/device
-================
-
-Retrive the current device settings via an HTTP GET command. Payload is in JSON format.
-
-.. code-block:: json
-
-   {
-      "app-name": "GravityMon ",
-      "app-ver": "0.0.0",
-      "id": "ee1bfc",
-      "mdns": "gravmon"
-   }
-
-
-GET: /api/status
-================
-
-Retrive the current device status via an HTTP GET command. Payload is in JSON format.
-
-* ``temp-format`` can be either ``C`` or ``F``
-
-Other parameters are the same as in the configuration guide.
-
-.. code-block:: json
-
-   {
-      "id": "ee1bfc",
-      "angle": 89.86,
-      "gravity": 1.1052,
-      "gravity-tempcorr": 1.1031,
-      "temp-c": 0,
-      "temp-f": 32,
-      "battery": 0,
-      "temp-format": "C",
-      "sleep-mode": false,
-      "rssi": -56
-   }
-
-
-GET: /api/config/formula
-========================
-
-Retrive the data used for formula calculation data via an HTTP GET command. Payload is in JSON format.
-
-* ``a1``-``a4`` are the angles/tilt readings (up to 5 are currently supported)
-* ``g1``-``g4`` are the corresponding gravity reaadings (in SG)
-
-.. code-block:: json
-
-   { 
-      "id": "ee1bfc",   
-      "a1": 22.4,       
-      "a2": 54.4, 
-      "a3": 58, 
-      "a4": 0, 
-      "a5": 0, 
-      "g1": 1.000,      
-      "g2": 1.053, 
-      "g3": 1.062, 
-      "g4": 1, 
-      "g5": 1 
-      "gravity-formula": "0.0*tilt^3+0.0*tilt^2+0.0017978*tilt+0.9436",
-   }
-
-
-POST: /api/config/device
-========================
-
-Used to update device settings via an HTTP POST command. Payload is in JSON format.
-
-* ``temp-format`` can be either ``C`` or ``F``
-
-.. code-block:: json
-
-   { 
-      "id": "ee1bfc",            
-      "mdns": "gravmon",         
-      "temp-format": "C",        
-      "sleep-interval": 30       
-   }
-
-
-POST: /api/config/push
-======================
-
-Used to update push settings via an HTTP POST command. Payload is in JSON format.
-
-.. code-block:: json
-
-   { 
-      "id": "ee1bfc",                                 
-      "http-push": "http://192.168.1.50/ispindel", 
-      "http-push2": "", 
-      "brewfather-push": "",
-      "influxdb2-push": "http://192.168.1.50:8086",
-      "influxdb2-org": "Qwerty",
-      "influxdb2-bucket": "Qwerty",
-      "influxdb2-auth": "Qwerty" 
-   }  
-
-
-POST: /api/config/gravity
-=========================
-
-Used to update gravity settings via an HTTP POST command. Payload is in JSON format.
-
-* ``gravity-formula`` keywords ``temp`` and ``tilt`` are supported.
-
-.. note::
-  ``gravity-temp-adjustment`` is defined as "on" or "off" when posting since this is the output values 
-  from a checkbox, when reading data it's sent as boolean (true,false).
-
-.. code-block:: json
-
-   { 
-      "id": "ee1bfc",                                                   
-      "gravity-formula": "0.0*tilt^3+0.0*tilt^2+0.0017978*tilt+0.9436",
-      "gravity-temp-adjustment": "off"                                  
-   }
-
-
-POST: /api/config/hardware
-==========================
-
-Used to update hardware settings via an HTTP POST command. Payload is in JSON format.
-
-.. note::
-  ``gyro-temp`` is defined as "on" or "off" when posting since this is the output values from a checkbox, when
-  reading data it's sent as boolean (true,false).
-
-.. code-block:: json
-
-   { 
-      "id": "ee1bfc",                                   
-      "voltage-factor": 1.59, 
-      "temp-adjustment": 0, 
-      "gyro-temp": "off",
-      "ota-url": "http://192.168.1.50/firmware/gravmon/" 
-   }
-
-
-POST: /api/config/formula
-=========================
-
-Used to update formula calculation data via an HTTP POST command. Payload is in JSON format.
-
-* ``a1``-``a4`` are the angles/tilt readings (up to 5 are currently supported)
-* ``g1``-``g4`` are the corresponding gravity reaadings (in SG)
-
-.. code-block:: json
-
-   { 
-      "id": "ee1bfc",   
-      "a1": 22.4,       
-      "a2": 54.4, 
-      "a3": 58, 
-      "a4": 0, 
-      "a5": 0, 
-      "g1": 1.000,      
-      "g2": 1.053, 
-      "g3": 1.062, 
-      "g4": 1, 
-      "g5": 1 
-   }
-
-
-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.
-
-.. code-block:: python
-
-   import requests
-   import json
-
-   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 ):
-      headers = { "ContentType": "application/json" }
-      print( url )
-      resp = requests.post( url, headers=headers, data=json )
-      if resp.status_code != 200 :
-         print ( "Failed "  )
-      else :
-         print ( "Success "  )
-
-   url = "http://" + host + "/api/config/device"
-   json = { "id": id, 
-            "mdns": "gravmon",             # Name of the device
-            "temp-format": "C",            # Temperature format C or F
-            "sleep-interval": 30           # Sleep interval in seconds
-         }
-   set_config( url, json )
-
-   url = "http://" + host + "/api/config/push"
-   json = { "id": id, 
-            "http-push": "http://192.168.1.1/ispindel",  
-            "http-push2": "",                           
-            "brewfather-push": "",                      
-            "influxdb2-push": "",                       
-            "influxdb2-org": "",
-            "influxdb2-bucket": "",
-            "influxdb2-auth": "" 
-            }  
-   set_config( url, json )
-
-   url = "http://" + host + "/api/config/gravity"
-   json = { "id": id, 
-            "gravity-formula": "",                  
-            "gravity-temp-adjustment": "off"        # Adjust gravity (on/off)
-            }
-   set_config( url, json )
-
-   url = "http://" + host + "/api/config/hardware"
-   json = { "id": id, 
-            "voltage-factor": 1.59,                 # Default value for voltage calculation
-            "temp-adjustment": 0,                   # If temp sensor needs to be corrected
-            "gyro-temp": "on",                      # Use the temp sensor in the gyro instead (on/off)
-            "ota-url": ""                           # if the device should seach for a new update when active
-         }
-   set_config( url, json )
-
-   url = "http://" + host + "/api/formula"
-   json = { "id": id, 
-            "a1": 22.4, 
-            "a2": 54.4, 
-            "a3": 58, 
-            "a4": 0, 
-            "a5": 0, 
-            "g1": 1.000, 
-            "g2": 1.053, 
-            "g3": 1.062, 
-            "g4": 1, 
-            "g5": 1 
-            }
-   set_config( url, json )
-
-
-.. _data-formats:
-
-Data Formats
-############
-
-iSpindle format 
-===============
-
-This is the format used for standard http posts. 
-
-* ``corr-gravity`` is an extended parameter containing a temperature corrected gravity reading.
-* ``run-time`` is an extended parameter containing the number of seconds the execution took.
-
-.. code-block:: json
-
-   { 
-      "name" : "gravmon",
-      "ID": "2E6753",
-      "token" : "gravmon",
-      "interval": 900,
-      "temperature": 20.5,
-      "temp-units": "C",
-      "gravity": 1.0050,
-      "corr-gravity": 1.0050,
-      "angle": 45.34,
-      "battery": 3.67,
-      "rssi": -12,
-      "run-time": 6
-   }
-   
-
-Brewfather format 
-=================
-
-This is the format for Brewfather
-
-.. code-block:: json
-
-   { 
-      "name" : "gravmon",     
-      "temp": 20.5,
-      "temp-unit": "C",
-      "battery": 3.67,
-      "gravity": 1.0050,
-      "gravity_unit": "G",
-   }
-
-
-Influx DB v2
-============
-
-This is the format for InfluxDB v2
-
-.. code-block::
-   
-   measurement,host=<mdns>,device=<id>,temp-format=<C|F>,gravity-format=SG,gravity=1.0004,corr-gravity=1.0004,angle=45.45,temp=20.1,battery=3.96,rssi=-18
-   
-
-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 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
-
-   { 
-      "project":"gravmon", 
-      "version":"0.4.10",  
-      "html": [ 
-         "index.min.htm", 
-         "device.min.htm", 
-         "config.min.htm", 
-         "calibration.min.htm", 
-         "about.min.htm" 
-      ] 
-   }

src_docs/source/data.rst

@@ -0,0 +1,156 @@
+.. _data-formats:
+
+Data Formats
+############
+
+.. _data-formats-ispindle:
+
+iSpindle format 
+===============
+
+This is the format used for standard http posts. 
+
+* ``corr-gravity`` is an extended parameter containing a temperature corrected gravity reading.
+* ``gravity-format`` is an extended parameter containing the gravity format (G or P).
+* ``run-time`` is an extended parameter containing the number of seconds the execution took.
+
+.. code-block:: json
+
+   { 
+      "name" : "gravmon",
+      "ID": "2E6753",
+      "token" : "gravmon",
+      "interval": 900,
+      "temperature": 20.5,
+      "temp-units": "C",
+      "gravity": 1.0050,
+      "angle": 45.34,
+      "battery": 3.67,
+      "rssi": -12,
+
+      "corr-gravity": 1.0050,
+      "gravity-unit": "G",
+      "run-time": 6
+   }
+
+This is the format template used to create the json above. 
+
+.. code-block::
+
+  {
+   "name" : "${mdns}",
+   "ID": "${id}",
+   "token" : "gravmon",
+   "interval": ${sleep-interval}, 
+   "temperature": ${temp},
+   "temp-units": "${temp-unit}",
+   "gravity": ${gravity},
+   "angle": ${angle},
+   "battery": ${battery},
+   "rssi": ${rssi},
+   "corr-gravity": ${corr-gravity},
+   "gravity-unit": "${gravity-unit}",
+   "run-time": ${run-time}
+  }
+
+
+.. _data-formats-brewfather:
+
+Brewfather format 
+=================
+
+This is the format for Brewfather. See: `Brewfather API docs <https://docs.brewfather.app/integrations/custom-stream>`_
+
+.. code-block:: json
+
+   { 
+      "name" : "gravmon",     
+      "temp": 20.5,
+      "temp_unit": "C",
+      "battery": 3.67,
+      "gravity": 1.0050,
+      "gravity_unit": "G",
+   }
+
+
+.. _data-formats-influxdb2:
+
+Influx DB v2
+============
+
+This is the format for InfluxDB v2
+
+.. code-block::
+   
+   measurement,host=<mdns>,device=<id>,temp-format=<C|F>,gravity-format=SG,gravity=1.0004,corr-gravity=1.0004,angle=45.45,temp=20.1,battery=3.96,rssi=-18
+
+
+This is the format template used to create the json above. 
+
+.. code-block::
+
+  measurement,host=${mdns},device=${id},temp-format=${temp-unit},gravity-format=${gravity-unit} gravity=${gravity},corr-gravity=${corr-gravity},angle=${angle},temp=${temp},battery=${battery},rssi=${rssi}
+
+
+.. _data-formats-mqtt:
+
+MQTT
+====
+
+This is the format used to send data to MQTT. Each of the lines are specific topics
+
+.. code-block::
+   
+   ispindel/device_name/tilt 89.96796
+   ispindel/device_name/temperature 21.375
+   ispindel/device_name/temp_units C
+   ispindel/device_name/battery 0.04171
+   ispindel/device_name/gravity 33.54894
+   ispindel/device_name/interval 1
+   ispindel/device_name/RSSI -58
+
+
+This is the format template used to create the json above. 
+
+.. tip::
+
+   Each line in the format is treated as one topic. The `|` is used as separator between lines and the first `:` is used as separator between topic and value. Each line is formatted as `<topic>:<value>`
+
+.. code-block::
+
+  ispindel/${mdns}/tilt:${angle}|
+  ispindel/${mdns}/temperature:${temp}|
+  ispindel/${mdns}/temp_units:${temp-unit}|
+  ispindel/${mdns}/battery:${battery}|
+  ispindel/${mdns}/gravity:${gravity}|
+  ispindel/${mdns}/interval:${sleep-interval}|
+  ispindel/${mdns}/RSSI:${rssi}|
+
+This is a format template that is compatible with v0.6. Just replace the `topic` with the topic you want to post data to.
+
+.. code-block::
+   
+   topic:{"name":"gravmon","ID":"${id}","token":"gravmon","interval": ${sleep-interval},"temperature": ${temp},"temp-units": "${temp-unit}","gravity":${gravity},"angle": ${angle},"battery":${battery},"rssi": ${rssi},"corr-gravity":${corr-gravity},"gravity-unit": "${gravity-unit}","run-time": ${run-time}}|
+
+
+version.json
+============
+
+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 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
+
+   { 
+      "project":"gravmon", 
+      "version":"0.7.0",  
+      "html": [ 
+         "index.min.htm", 
+         "device.min.htm", 
+         "config.min.htm", 
+         "format.min.htm", 
+         "calibration.min.htm", 
+         "about.min.htm" 
+      ] 
+   }

src_docs/source/formula.rst

@@ -0,0 +1,16 @@
+.. _create-formula:
+
+Create formula
+##############
+
+.. image:: images/formula1.png
+  :width: 800
+  :alt: Formula data
+
+Here you can enter up to 5 values (angles + gravity) that is then used to create the formula. Angles equal to zero will be regarded as empty even if there is a gravity reading.
+
+.. image:: images/formula2.png
+  :width: 800
+  :alt: Formula graph
+
+Once the formula is created a graph over the entered values and a simulation of the formula will give you a nice overview on how the formula will work.

src_docs/source/functionallity.rst

@@ -3,36 +3,57 @@
 Functionallity
 ==============
 
-The main differences
---------------------
+The main features
+-----------------
 
 * **Operates in two modes gravity monitoring and configuration mode**
 
-  In ``gravity monitoring`` mode it behaves just like the iSpindle, it wakes up at regular intervals, measures angle/tile, temperature, calculates gravity and pushes the data to defined endpoints. 
+  In ``gravity monitoring`` mode it behaves just like the iSpindle, it wakes up at regular intervals, measures 
+  angle/tile, temperature, calculates gravity and pushes the data to defined endpoints. 
 
-  In ``configuration mode`` the device is always active and the webserver is active. Here you can view the angle/tilt values, change configuration options and more. When in this mode you can also interact with the device
+  In ``configuration mode`` the device is always active and the webserver is active. Here you can view the 
+  angle/tilt values, change configuration options and more. When in this mode you can also interact with the device
   via an REST API so data can be pushed to the device via scripts (see API section for more information).
 
-  You can force the device into ``configuration mode`` while measuring gravity. This is useful when calibrating the device so you don't needs to wait for the device to wake up and push the data. The entire calibration
+  You can force the device into ``configuration mode`` while measuring gravity. This is useful when calibrating 
+  the device so you don't needs to wait for the device to wake up and push the data. The entire calibration
   sequence can be handled via the web interface without need for additional software tools.
 
   See the :ref:`setting-up-device` section for more information on how to trigger the configuration mode.
 
 * **Can send data to multiple endpoints at once**
 
-  The original iSpindle can only have one destination, this software will push data to all defined endpoints so in theory you can use them all. However this will consume a lot of battery power so use only as many as needed. 
+  The original iSpindle can only have one destination, this software will push data to all defined endpoints so 
+  in theory you can use them all. However this will consume more battery power so use only as many as needed. 
 
-  Currently the device supports the following endpoints: http (2 different), influxdb2 and Brewfather
+  Currently the device supports the following endpoints: http (2 different), influxdb2, Brewfather and MQTT.
 
   If you want additional targets please raise a feature request in the github repo.
 
-* **Build in function to create gravity formulas, so no need for using other tools for this part**
+* **Create gravity formulas on the device**
 
-  Another big difference is that this software can create the gravity formula in the device, just enter the angle/gravity data that you have collected. You will also see a graph simulating how the formula would work. 
+  Another big difference is that this software can create the gravity formula in the device, just enter the 
+  angle/gravity data that you have collected. You will also see a graph simulating how the formula would work. 
+
+.. note::
+
+  This feature needs more testing to be validated.
+
+* **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. 
+  If you have a good template please share it on the girhub repository and I will add it to the documentation 
+  for other users to enjoy. See the :ref:`format-editor` for more information.
+
+.. note::
+
+  This feature needs more testing to be validated.
 
 * **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 independant of the formula. 
+  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 independant of the formula. 
 
 .. note::
 
@@ -98,11 +119,16 @@ Experimental features
 Battery life
 ------------
 
-I'm currently measuring battery life of v0.5 but previous versions have been able to measure gravity for a 2-3 weeks without issues (Using 900 seconds as interval). 
+I'm currently measuring battery life of v0.5 but previous versions have been able to measure gravity for 
+a 2-3 weeks without issues (Using 900 seconds as interval). 
+
+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. From what I have discovered 
+it's the WIFI connection that has the most impact on the battery life. In a perfect scenario it 
+can take around 400ms but can in some cases take up to 8 seconds. 
 
 *More on this topics once my tests are done*
 
-
 Performance 
 -----------
 

src_docs/source/index.rst

@@ -7,11 +7,13 @@ Welcome to GravityMon's documentation!
 ######################################
 
 .. note::
-  This documentation reflects **v0.6**. Last updated 2022-01-13
+  This documentation reflects **v0.7.1**. Last updated 2022-01-30
   
 
 GravityMon is a replacement firmare for the iSpindle firmware, it uses the same hardware configuration so 
-you can easily switch between them. It's used to measure gravity in beer and show the progress of fermentation. 
+you can easily switch between them. 
+
+It's used to measure gravity in beer and show the progress of fermentation. 
 
 For more information on this topic and function please visit `iSpindel Homepage <https://www.ispindel.de>`_ .
 
@@ -30,29 +32,38 @@ be found here; `GravityMon on Github <https://github.com/mp-se/gravitymon>`_
   I dont take responsibility for any errors that can cause problems with the use. I have tested v0.4 on 5+ brews 
   over the last 6 months without any issues.
 
-
 The main differences:
 ---------------------
 
-* Operates in two modes ``gravity monitoring`` and ``configuration mode``
-* Send data to multiple endpoints when pushing data.
+* Operates in two modes gravity monitoring and configuration mode (simplify calibration)
+* Modern web based UI for configuration (in config mode)
+* REST API
+* Send data to multiple endpoints when pushing data (2xhttp, brewfather, influxdb v2, mqtt supported)
 * Automatic temperature adjustment of gravity reading
 * OTA support from local webserver
-* Build in function to create gravity formulas
-
-There are also a experimental features such as:
-
+* Built in function to create gravity formulas, no need for additional software, just enter tilt/gravity. 
+* Visual graph showing how formula will be interpreted
 * Using the temperature sensor in gyro instead of DS18B20 (faster)
-* Performance measurements (used to optimise code)
+* Built in performance measurements (used to optimise code)
+* SSL support in standard HTTP and MQTT connections.
+* Option to customize data posted to endpoints using template from the UI.
 
 For a complete breakdown see the :ref:`functionallity`
 
+This is a simple overview of the different components that the software contains. The green ones are only active during `configuration mode` in 
+order to save battery.
+
+.. image:: images/software_design.png
+  :width: 600
+  :alt: Software design
+
+
 Credits to
 ----------
 Ideas to some of these functions have been picked up from disucssions in the iSpindle forums. This software uses 
 the following libraries and without these this would have been much more difficult to acheive:
 
-* https://github.com/jrowberg/i2cdevlib.git 
+* https://github.com/jrowberg/i2cdevlib 
 
   This library contains the basic code to interact with the gyro + many more chips.
 
@@ -114,10 +125,14 @@ the following libraries and without these this would have been much more difficu
    functionallity
    installation
    configuration
+   formula
+   services
+   advanced
+   api
+   data
    compiling
    contributing
    q_and_a
-   backlog
 
 Indices and tables
 ==================

src_docs/source/installation.rst

@@ -1,36 +1,16 @@
 Installation 
 ------------
 
-Official esptool
-================
+Brewflasher
+===========
 
-The prefered option for flashing esp8266 device is via the official esptool. Documentation can be found 
-here; `esptool home page <https://docs.espressif.com/projects/esptool/en/latest/esp32/>`_
+The prefered option for flashing GravityMon is using BrewFlasher, its a tools that support many brewing related firmwares for ESP8266 and ESP32. This works 
+on both Windows and Mac. You can download the latest version from here: `Brewflasher <https://www.brewflasher.com/>`_
 
-Windows 10 should install a driver for the USB -> Serial automatically when you connect a esp8266.
-
-Flashing on windows
-*******************
-
-The basic command for flashing on Windows is;
-
-``esptool.py --port COM4 write_flash 0x0 firmware.bin``
-
-If there are issues you can try do erase the flash first using this command;
-
-``esptool.py --port COM4 erase_flash``
-
-Serial Monitoring
-*******************
-
-To check output from the device (logs) there are several tools out there. I found this simple tool in the Windows Store called ``Serial Port Monitoring``. 
-Just select a baud rate of 115200, 8N1.
-
-.. image:: images/serial.png
-  :width: 800
+.. image:: images/brewflasher.png
+  :width: 600
   :alt: Serial output
 
-
 Binaries
 ********
 
@@ -44,7 +24,6 @@ In the /bin directory you will find 2 different firmware builds;
 
   This version also submits performance data to an influx database with detailed execution times.
 
-
 In these versions all the html files are embedded in the binaries. The file system is currently only used for storing 
 the configuration file. 
 
@@ -52,6 +31,31 @@ If the software becomes so large the html files can be moved to the file system,
 default (see compiling for details). This approach makes installation much easier and ensure that html files 
 and code is in sync. 
 
+Esptool
+=======
+
+The other option for flashing esp8266 device is via the official esptool. Documentation can be found 
+here; `esptool home page <https://docs.espressif.com/projects/esptool/en/latest/esp32/>`_
+
+Windows 10 should install a driver for the USB -> Serial automatically when you connect a esp8266.
+
+The basic command for flashing on Windows is;
+
+``esptool.py --port COM4 write_flash 0x0 firmware.bin``
+
+If there are issues you can try do erase the flash first using this command;
+
+``esptool.py --port COM4 erase_flash``
+
+Serial Monitoring
+=================
+
+To check output from the device (logs) there are several tools out there. I found this simple tool in the Windows Store called ``Serial Port Monitoring``. 
+Just select a baud rate of 115200, 8N1.
+
+.. image:: images/serial.png
+  :width: 800
+  :alt: Serial output
 
 Configuring WIFI
 ================

src_docs/source/q_and_a.rst

@@ -6,3 +6,4 @@ My device is no going in to sleep after fully charged
 - Calibrate the device in the web interface
 - Check the angle/tilt. If the device is reporting 90 degress then its not going into sleep. Tilt the device and check if sleep works.
 - Check in reported voltage of the battery in the web interface. If this is higher than 4.15V the device belives its beeing charged. In that case adjust the voltage factor under hardware so the voltage drops below 4.15V.
+- Check if the `always on` option is activated in the web interface.

src_docs/source/releases.rst

@@ -3,10 +3,48 @@
 Releases 
 ########
 
-v0.6.0 (work in progress)
--------------------------
+v0.7.1
+------
 
-This is features for the next release.
+* Added instructions for how to configure integration with Fermentrack
+* Added instructions for how to configure integration with Ubidots
+* Added instructions for how to configure integration with HomeAssistant
+* Added instructions for how to configure integration with Brewers Friend (not verified)
+* BUG: Defined mqtt port was ignored, used default values.
+* BUG: Extended length of HTTP url fields from 100 to 120 chars.
+* BUG: Fixed issue with default template so it now includes the device name correctly. 
+
+v0.7.0
+------
+
+Latest stable version. `Release v0.7 on Github <https://github.com/mp-se/gravitymon/releases/tag/v0.7.0>`_
+
+* SSL support for HTTP targets
+* SSL support for MQTT targets
+* SSL support for OTA
+* Added support for Plato
+* Added error handling for calibration page.
+* Added experimental target ESP32 (using an ESP32 D1 Mini which is pin compatible with ESP8266). Not 
+  really usable since wifi connection is extreamly slow with current Arduino releases (3-8 seconds).
+* Added experimental format editor so users can customize their data format used for pushing data. 
+  This will reduce the need for custom push targets. As long as the service is supporting http 
+  or https then the data format can be customized.
+* Added check so that pushing data is not done if memory is low (this will avoid crashes)
+* MQTT topic has been removed from config (handled via format templates)
+* MQTT port port number added. Port over 8000 will activate SSL.
+
+* **Breaking change**: To simplify the internal structure the 
+  temp sensor adjustment is now stored in C. So if you have 
+  enabled this function using F you will need to go into 
+  the configuration and update the adjustment factor again (hardware config).
+
+* **Breaking change**: The MQTT push option has been changed to match the iSpindle behaviour. If 
+  the behaviour in v0.6 is wanted this can be done via the format editor. 
+
+v0.6.0
+------
+
+`Release v0.6 on Github <https://github.com/mp-se/gravitymon/releases/tag/v0.6.0>`_
 
 * Changed the wifi manager and refactored wifi.cpp
 * LED is now turned on when Wifi Portal is open
@@ -22,7 +60,7 @@ This is features for the next release.
 v0.5.0
 ------
 
-Latest stable version.
+`Release v0.5 on Github <https://github.com/mp-se/gravitymon/releases/tag/v0.5.0>`_
 
 * Added feature to calcuate formula on device
 * Total rewrite of documentation
@@ -31,9 +69,9 @@ Latest stable version.
 * Cleanup of code
 * Refactor code from C to C++
 
-`Release v0.5 on Github <https://github.com/mp-se/gravitymon/releases/tag/v0.5.0>`_
-
 v0.4.0
 ------
 
 `Release v0.4 on Github <https://github.com/mp-se/gravitymon/releases/tag/v0.4.0>`_
+
+* First release

src_docs/source/services.rst

@@ -0,0 +1,136 @@
+.. _services:
+
+Service Integration
+###################
+
+This chapter contains a list of targets and what configuration is needed to interact with them.
+
+Brewfather
+++++++++++
+
+Brewfather is an all in one service that allows you to manage you recepies and brews. 
+
+Just enter the http adress found on brewfather, not other settings are needed. The endpoint has the following format:
+
+.. code-block::
+
+   http://log.brewfather.net/http://log.brewfather.net/stream?id=<yourid>
+
+
+The URL is found under settings.
+
+Fermentrack
++++++++++++
+
+`Fermentrack <https://www.fermentrack.com>`_ is a open source brewing software to monitor and control fermentation.
+
+GravityMon can be installed and used as an iSpindle. Just register the device as an iSpindle and use the defined endpoint which normally is:
+
+.. code-block::
+
+   http://myservername/ispindel
+
+
+UBIdots
++++++++
+
+`UBIdots <https://www.ubidots.com>`_ is a IoT service that display data collected various sources. 
+
+For this service there are two options to configure the integration. First you will need your default token which is found under `API Credentials` (<api-tokem> in the example below).
+Swap the text <devicename> with the name you want to show in ubidots. 
+
+**Option 1** - token as an URL parameter
+
+Enter the following as URL:
+
+.. code-block::
+
+   http://industrial.api.ubidots.com/api/v1.6/devices/<devicename>/?token=<api-token>
+
+
+Even though ubidots can handle the default ispindle format it probably better to just post the data you want. This is an example of a 
+format template that can be used. For information on customizing the format see :ref:`format-editor`.
+
+.. code-block:: 
+
+   { 
+      "temperature": ${temp}, 
+      "gravity": ${gravity}, 
+      "angle": ${angle}, 
+      "battery": ${battery}, 
+      "rssi": ${rssi} 
+   }
+
+
+Home Assistant
++++++++++++++++
+
+`HomeAssistant <https://www.homeassistant.com>`_ is a platform for home automation and can collect sensor data
+from multiple devices. 
+
+This setup uses the MQTT integration with home assistant to collect values from the device.
+
+This part of the configuration goes into the home assistant configuration.yaml file. The example assumes that the
+device is named `gravmon2`
+
+::
+
+   sensor:
+   - platform: mqtt
+      name: "gravmon2_gravity"
+      state_topic: "gravmon/gravmon2/gravity"
+   - platform: mqtt
+      name: "gravmon2_battery"
+      state_topic: "gravmon/gravmon2/battery"
+   - platform: mqtt
+      name: "gravmon2_rssi"
+      state_topic: "gravmon/gravmon2/rssi"
+
+
+Enter the name of the MQTT server in Home Assistant in the URL. You might need to install that option 
+first. This is the format needed to submit the data to the correct topics as needed above. You can add as 
+many sensors / topics as you want.
+
+::
+
+   gravmon/${mdns}/tilt:${angle}|
+   gravmon/${mdns}/temperature:${temp}|
+   gravmon/${mdns}/temp_units:${temp-unit}|
+
+
+Brewer's Friend
++++++++++++++++
+
+Brewer's friend is an all in one service that allows you to manage you recepies and brews. 
+
+.. warning::
+  I dont have an account for brewers friend so I have not been able to verfy this completely. Its based on
+  the available documentation.
+
+You can find you API key when logged in to the service. Follow these `instructions <https://docs.brewersfriend.com/devices/ispindel>`_
+
+**Note there are different URLs if you are using plato or specific gravity!**
+
+.. code-block::
+
+   http://log.brewersfriend.com/ispindel/[API KEY]
+   http://log.brewersfriend.com/ispindel_sg/[API KEY]
+
+
+From what I can read in the documentation you need to add the API key as a token as well. This can be done using a custom 
+format for the endpoint. Just add you API key after token.
+
+.. code-block:: 
+
+  {
+   "name" : "${mdns}",
+   "ID": "${id}",
+   "token" : "[API KEY]",
+   "interval": ${sleep-interval}, 
+   "temperature": ${temp},
+   "temp-units": "${temp-unit}",
+   "gravity": ${gravity},
+   "angle": ${angle},
+   "battery": ${battery},
+   "rssi": ${rssi}
+  }

src_docs/source/sofware_overview.drawio

@@ -0,0 +1 @@
+<mxfile host="app.diagrams.net" modified="2022-01-14T15:32:37.218Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36 Edg/97.0.1072.55" etag="muU0EPGkWBAsdBhYYONY" version="14.7.3" type="device"><diagram id="H8u3kietkkmoQsI5FEME" name="Page-1">7VpRb6M4EP41kfYetgoYCHls0na7uq3U22TV7dPJgSHxLcGRMU3SX38GDAFMknZL6vR0LxEeG2O+b+absUMPjZebLwyvFnfUh7Bn9v1ND131THOILPGbGra5wUDWILfMGfGlbWeYkGeQxr60JsSHuDaQUxpysqobPRpF4PGaDTNG1/VhAQ3rT13hOSiGiYdD1fpAfL7Ira452NlvgcwXxZMNZ5j3LHExWL5JvMA+XVdM6LqHxoxSnl8tN2MIU/AKXPL7bvb0lgtjEPGX3BDebQa3z8nj3xMy/OFux7M/J78+IznNEw4T+cZytXxbQMBoEvmQztLvodF6QThMVthLe9eCdGFb8GUoWoa4xCGZR+I6hECsaiRnB8Zhs3fdRomGcCOgS+BsK4bIG2yJX+FBRXu9o2PgSNuiQoVduBCWLjAvp96hJC4kUK8AzXROC5qP40V2q9ENgoZRh7AMrgqEJVpVCK2TQai63X0SL7LgFj9TzObA4wOgGsdBDUgYjmlIWXYvCoLA9Dxhjzmjv6DS4zszx3a6gdoaNKBu8VbDbIHaOZmzHvdViPzLVCpFywtxHBOvjiRsCP+ZXl/0naL9mHr2hY2QbF9tpKtnjW2lcQ+MiFcBJm3548FXdLeBsVgiTZgHx7xI5aLq1m3CIG0MQszJU30ZbfjLJ9xTIhZYUo3cOtVOM1jy5cu7qsLcmMhxGj6DGhPxLByUiTJ3KF/79z0EKR5yO53eZ+sz+6LHCVNRmjFxNU+vRgzWgchuwNS+r1EQJpurUTpfy613f02nivuJaON1h6uHaEQjaMSzNDV0M41cIlL3pTQvie+nD2lVirpAdxD6TiP0jWFL6LeprHuq0LcUYr9sGX2bqhaQewKVNKT1yKxhn5vMDl4gs0LyJrJJGV/QOY1weL2zNnxyN+YbpSuJ/z/A+VaWyTgR2bLGTofaaufjcu05MM5pJ+rF4vom1F0dIAso2fZntSGTYdHc5cKsVSRDDeRYOskZaiWnwsdjte98yNkjce9DjqFFn/ax0z/CTlmB1qvPg7WnDkb7WilFeil9nRoWlO5ofKwQ3E5pLBjg6lYlM9+QUGMWNLQGc/k6/+fBPQBpDUxTb2B+AHpMnfTYSum+xCT69IdC2gfcKCGrvlFCSPdGST07ncJyBQzzhIHomEAUCyS6xb4DJJtbTv1IGq4C5QTYUwqievKCV6uQeCKaaKRDjDoUleII5XhO3rP7kYR+7l8YhmHUSDXfeDRYDKFBEMNJDuuKt6+Q/gCzjPeW47hPHo0CQubihiX14cSS5tvg+labpLnmDDknOmK3tJ/9FE5U4eT79WQqLJf3X/eR8p/mxLa0c+J8pJrrdzZDXUqq9VJJ1XtmMVTjDLCf5bsb8fvARKi00v4NzyA8Ejh7/z1gEJNnPMvmS4FfpWKfvZs96tlXhyJIfpUgb+6V+aVK0gH33Rtv/QsRv3a9Hnlb5iqSYn3SssZ4h8Sm/lshEluqodXKRdFSlkSxGJT29Wfp5x7ATq2oGNygtXB3PBdmQTeK6rjnluXMlsqDBKRjsDuArlmpWy2fO7wzdKYC3TirARLWXpF/wJ2mgvrQ1o26+p/cO2w1zwJ8/ZtTU92cnkAtzgJs/fqCVH35XsmLPjwRgaiSPCFeuaajFspv/yDjeFF1/JOMgEZcFtqiCumEObORVM22MHFbmDNfz5xo7r7tzIuk3Rey6Ppf</diagram></mxfile>

test/config.json

@@ -11,7 +11,7 @@
     "influxdb2-bucket": "spann",
     "influxdb2-auth": "OijkU((jhfkh",
     "mqtt-push": "192.168.1.10",
-    "mqtt-topic": "mytopic",
+    "mqtt-port": 1883,
     "mqtt-user": "user",
     "mqtt-pass": "pass",
     "sleep-interval": 30,

test/configure.py

@@ -36,7 +36,11 @@ json = { "id": id,
          "influxdb2-push": "",                          # InfluxDB2 settings
          "influxdb2-org": "",
          "influxdb2-bucket": "",
-         "influxdb2-auth": "" 
+         "influxdb2-auth": "" ,
+         "mqtt-push": "",
+         "mqtt-port": 1883,
+         "mqtt-user": "",
+         "mqtt-pass": ""
          }  
 set_config( url, json )
 

test/format.json

@@ -0,0 +1,7 @@
+{
+    "id": "7376ef",
+    "http-1": "%7B%22name%22%20%3A%20%22gravmon%22%2C%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%20%22token%22%20%3A%20%22gravmon%22%2C%20%22interval%22%3A%20%24%7Bsleep%2Dinterval%7D%2C%20%22temperature%22%3A%20%24%7Btemp%7D%2C%20%22temp%2Dunits%22%3A%20%22%24%7Btemp%2Dunit%7D%22%2C%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%20%22angle%22%3A%20%24%7Bangle%7D%2C%20%22battery%22%3A%20%24%7Bbattery%7D%2C%20%22rssi%22%3A%20%24%7Brssi%7D%2C%20%22corr%2Dgravity%22%3A%20%24%7Bcorr%2Dgravity%7D%2C%20%22gravity%2Dunit%22%3A%20%22%24%7Bgravity%2Dunit%7D%22%2C%20%22run%2Dtime%22%3A%20%24%7Brun%2Dtime%7D%20%7D",
+    "http-2": "%7B%22name%22%20%3A%20%22gravmon%22%2C%20%22ID%22%3A%20%22%24%7Bid%7D%22%2C%20%22token%22%20%3A%20%22gravmon%22%2C%20%22interval%22%3A%20%24%7Bsleep%2Dinterval%7D%2C%20%22temperature%22%3A%20%24%7Btemp%7D%2C%20%22temp%2Dunits%22%3A%20%22%24%7Btemp%2Dunit%7D%22%2C%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%20%22angle%22%3A%20%24%7Bangle%7D%2C%20%22battery%22%3A%20%24%7Bbattery%7D%2C%20%22rssi%22%3A%20%24%7Brssi%7D%2C%20%22corr%2Dgravity%22%3A%20%24%7Bcorr%2Dgravity%7D%2C%20%22gravity%2Dunit%22%3A%20%22%24%7Bgravity%2Dunit%7D%22%2C%20%22run%2Dtime%22%3A%20%24%7Brun%2Dtime%7D%20%7D",
+    "influxdb": "measurement%2Chost%3D%24%7Bmdns%7D%2Cdevice%3D%24%7Bid%7D%2Ctemp%2Dformat%3D%24%7Btemp%2Dunit%7D%2Cgravity%2Dformat%3D%24%7Bgravity%2Dunit%7D%20gravity%3D%24%7Bgravity%7D%2Ccorr%2Dgravity%3D%24%7Bcorr%2Dgravity%7D%2Cangle%3D%24%7Bangle%7D%2Ctemp%3D%24%7Btemp%7D%2Cbattery%3D%24%7Bbattery%7D%2Crssi%3D%24%7Brssi%7D%0A",
+    "mqtt": "ispindel%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Bangle%7D%7Cispindel%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7Cispindel%2F%24%7Bmdns%7D%2Ftemp%5Funits%3A%24%7Btemp%2Dunit%7D%7Cispindel%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7Cispindel%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7Cispindel%2F%24%7Bmdns%7D%2Finterval%3A%24%7Bsleep%2Dinterval%7D%7Cispindel%2F%24%7Bmdns%7D%2FRSSI%3A%24%7Brssi%7D%7C"
+}

test/upload.json

@@ -3,5 +3,6 @@
     "device": false,
     "config": false,
     "calibration": false,
+    "format": false,
     "about": true
 }