Skip to content

Commit

Permalink
Merge pull request #30 from mp-se/dev
Browse files Browse the repository at this point in the history 
Merge dev into master for 0.9
  • Loading branch information
@mp-se
mp-se authored Jan 28, 2024
2 parents 98aa1ac + be0cad3 commit 09b6d8f
Show file tree
Hide file tree
Showing 51 changed files with 315 additions and 309 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pio-build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: PlatformIO Run
uses: karniv00l/platformio-run-action@v1
with:
environments: "kegmon-release,kegmon32s2-release"
environments: "kegmon-release,kegmon32s2-release,kegmon32s3-release"
#targets: "kegmon-release,kegmon32s2-release"
#project-dir: "./some_dir"
#project-conf: "./some_dir/custom.ini"
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ For docs see: https://mp-se.github.io/kegmon/index.html

# Hardware

* Supports ESP8266 D1 mini or ESP32s2 mini
* Supports ESP8266 D1 mini, ESP32s2 mini or ESP32s3 mini
* Loadcells and HX711/NAU7802 ADC converters
* DS18B20, DHT22 or BME280 temperature sensors
* DS18B20, DHT22, BME280 or BrewPI(IP) temperature sensors
* OLED 0.96" or LCD 20x4/20x2 displays

# Features
Expand All @@ -37,4 +37,3 @@ For docs see: https://mp-se.github.io/kegmon/index.html
* Modern HTML5 UI
* Easy scale calibration
* 3D models and PCB
* Mobile dashboard
Binary file modified bin/firmware.bin
View file
Binary file not shown.
Binary file modified bin/firmware32s2.bin
View file
Binary file not shown.
Binary file added bin/firmware32s3.bin
View file
Binary file not shown.
Binary file added bin/partitions32s3.bin
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion html/about.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@ <h2 class="accordion-header" id="headingAbout">

<!-- START FOOTER -->

<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-23 Magnus Persson</div>
<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-2024 Magnus Persson</div>
</body>
</html>
2 changes: 1 addition & 1 deletion html/about.min.htm
View file
Original file line number Diff line number Diff line change
@@ -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>Keg Monitor</title><link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous"><style>.row-margin-10{margin-top:1em}</style></head><body class="py-4"><script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script><script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script><!-- START MENU --><nav class="navbar navbar-expand-lg navbar-dark bg-primary"><div class="container"><a class="navbar-brand" href="/index.htm">Beer Keg Monitor</a> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbarNav"><ul class="navbar-nav"><li class="nav-item"><a class="nav-link" href="/index.htm">Home</a></li><li class="nav-item"><a class="nav-link" href="/beer.htm">Beer</a></li><li class="nav-item dropdown"><a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Configuration</a><ul class="dropdown-menu"><li><a class="dropdown-item" href="/config.htm">Configuration</a></li><li><a class="dropdown-item" href="/calibration.htm">Scale calibration</a></li><li><a class="dropdown-item" href="/graph.htm">History graph</a></li><li><a class="dropdown-item" href="/stability.htm">Stability</a></li><li><a class="dropdown-item" href="/upload.htm">Upload firmware</a></li><li><a class="dropdown-item" href="/backup.htm">Backup & Restore</a></li></ul></li><li class="nav-item"><a class="nav-link active" href="/about.htm"><b>About</b></a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container row-margin-10"><div class="accordion row-margin-10" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingAbout"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAbout" aria-expanded="true" aria-controls="collapseAbout"><b>About</b></button></h2><div id="collapseAbout" class="accordion-collapse collapse show" aria-labelledby="headingAbout" data-bs-parent="#accordion"><div class="accordion-body"><div class="row h3 col-sm-10">Beer Keg Monitor</div><div class="row col-sm-10 mb-3">This is a piece of software to measure how many pints are left in a keg based. Based on ideas from the project listed below. No code has been used from those projects.</div><div class="row col-sm-10 mb-3"><ul><li>https://www.hackster.io/davidtilley/iot-home-beer-keg-scale-b603db</li><li>https://www.instructables.com/Beer-Keg-Scales/</li><li>https://brewkegscale.wordpress.com/</li><li>https://github.com/Callwater/Beerkeg-load-cell</li><li>https://github.com/nanab/BeerScale</li></ul></div><div class="row h3 col-sm-10 mb-3">MIT License</div><div class="row col-sm-10 mb-3">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class="row h3 col-sm-8 mb-3">Credits to</div><div class="row col-sm-8 mb-3">This software uses the following projects / libraries and without these this software would have been much more difficult to acheive:<br><br><ul><li>https://github.com/mp-se/gravitymon</li><li>https://github.com/graphitemaster/incbin</li><li>https://github.com/khoih-prog/ESP_WiFiManager</li><li>https://github.com/thijse/Arduino-Log</li><li>https://github.com/bblanchon/ArduinoJson</li><li>https://getbootstrap.com</li><li>https://github.com/lorol/LITTLEFS</li><li>https://github.com/bogde/HX711</li><li>https://github.com/ThingPulse/esp8266-oled-ssd1306</li><li>https://github.com/RobTillaart/Statistic</li><li>https://github.com/denyssene/SimpleKalmanFilter</li></ul></div></div></div></div></div></div><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-23 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>Keg Monitor</title><link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous"><style>.row-margin-10{margin-top:1em}</style></head><body class="py-4"><script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script><script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script><!-- START MENU --><nav class="navbar navbar-expand-lg navbar-dark bg-primary"><div class="container"><a class="navbar-brand" href="/index.htm">Beer Keg Monitor</a> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbarNav"><ul class="navbar-nav"><li class="nav-item"><a class="nav-link" href="/index.htm">Home</a></li><li class="nav-item"><a class="nav-link" href="/beer.htm">Beer</a></li><li class="nav-item dropdown"><a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Configuration</a><ul class="dropdown-menu"><li><a class="dropdown-item" href="/config.htm">Configuration</a></li><li><a class="dropdown-item" href="/calibration.htm">Scale calibration</a></li><li><a class="dropdown-item" href="/graph.htm">History graph</a></li><li><a class="dropdown-item" href="/stability.htm">Stability</a></li><li><a class="dropdown-item" href="/upload.htm">Upload firmware</a></li><li><a class="dropdown-item" href="/backup.htm">Backup & Restore</a></li></ul></li><li class="nav-item"><a class="nav-link active" href="/about.htm"><b>About</b></a></li></ul></div><div class="spinner-border text-light" id="spinner" role="status"></div></div></nav><!-- START MAIN INDEX --><div class="container row-margin-10"><div class="accordion row-margin-10" id="accordion"><div class="accordion-item"><h2 class="accordion-header" id="headingAbout"><button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAbout" aria-expanded="true" aria-controls="collapseAbout"><b>About</b></button></h2><div id="collapseAbout" class="accordion-collapse collapse show" aria-labelledby="headingAbout" data-bs-parent="#accordion"><div class="accordion-body"><div class="row h3 col-sm-10">Beer Keg Monitor</div><div class="row col-sm-10 mb-3">This is a piece of software to measure how many pints are left in a keg based. Based on ideas from the project listed below. No code has been used from those projects.</div><div class="row col-sm-10 mb-3"><ul><li>https://www.hackster.io/davidtilley/iot-home-beer-keg-scale-b603db</li><li>https://www.instructables.com/Beer-Keg-Scales/</li><li>https://brewkegscale.wordpress.com/</li><li>https://github.com/Callwater/Beerkeg-load-cell</li><li>https://github.com/nanab/BeerScale</li></ul></div><div class="row h3 col-sm-10 mb-3">MIT License</div><div class="row col-sm-10 mb-3">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class="row h3 col-sm-8 mb-3">Credits to</div><div class="row col-sm-8 mb-3">This software uses the following projects / libraries and without these this software would have been much more difficult to acheive:<br><br><ul><li>https://github.com/mp-se/gravitymon</li><li>https://github.com/graphitemaster/incbin</li><li>https://github.com/khoih-prog/ESP_WiFiManager</li><li>https://github.com/thijse/Arduino-Log</li><li>https://github.com/bblanchon/ArduinoJson</li><li>https://getbootstrap.com</li><li>https://github.com/lorol/LITTLEFS</li><li>https://github.com/bogde/HX711</li><li>https://github.com/ThingPulse/esp8266-oled-ssd1306</li><li>https://github.com/RobTillaart/Statistic</li><li>https://github.com/denyssene/SimpleKalmanFilter</li></ul></div></div></div></div></div></div><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-2024 Magnus Persson</div></body></html>
4 changes: 2 additions & 2 deletions html/backup.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<li><a class="dropdown-item" href="#">Backup & Restore</a></li>
</ul>
</li>
<li class="nav-item">
<li class="nav-item">
<a class="nav-link" href="/about.htm">About</a>
</li>
</ul>
Expand Down Expand Up @@ -315,6 +315,6 @@ <h2 class="accordion-header" id="headingRestore">

<!-- START FOOTER -->

<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-23 Magnus Persson</div>
<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-2024 Magnus Persson</div>
</body>
</html>
2 changes: 1 addition & 1 deletion html/backup.min.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,4 @@
setButtonDisabled( false );
$('#spinner').hide();
});
}</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-23 Magnus Persson</div></body></html>
}</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-2024 Magnus Persson</div></body></html>
2 changes: 1 addition & 1 deletion html/beer.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ <h5 class="modal-title" id="brewspy-modal-header">Fetch beer from Brewspy</h5>

<!-- START FOOTER -->

<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-23 Magnus Persson</div>
<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-2024 Magnus Persson</div>
</body>

</html>
2 changes: 1 addition & 1 deletion html/beer.min.htm
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/calibration.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,6 @@ <h2 class="accordion-header" id="headingCalibration">

<!-- START FOOTER -->

<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-23 Magnus Persson</div>
<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-2024 Magnus Persson</div>
</body>
</html>
2 changes: 1 addition & 1 deletion html/calibration.min.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@
getScale();
setButtonDisabled(false);
$('#spinner').hide();
}</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-23 Magnus Persson</div></body></html>
}</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-2024 Magnus Persson</div></body></html>
14 changes: 12 additions & 2 deletions html/config.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,21 @@ <h2 class="accordion-header" id="headingHw">
<label for="temp-layout" class="col-sm-2 col-form-label">Temperature sensor</label>
<div class="col-sm-2">
<select class="form-select" id="temp-sensor" name="temp-sensor" data-bs-toggle="tooltip" title="select type of temperature sensor">
<option value="0">DHT22</option>
<option value="1">DS18B20</option>
<option value="0">DHT22</option>
<option value="2">BME280</option>
<option value="3">BREWPI-ESP</option>
</select>
</div>
</div>

<div class="row mb-3">
<label for="mdns" class="col-sm-2 col-form-label">Brewpi-esp URL</label>
<div class="col-sm-3">
<input type="url" maxlength="80" class="form-control" name="brewpi-url" id="brewpi-url" placeholder="http://brewpi.local" data-bs-toggle="tooltip" title="Url to the brewpi-esp installation for the keezer, requires v15 or newer with web interface.">
</div>
</div>

<div class="row mb-2">
<label for="scale-layout" class="col-sm-2 col-form-label">Scale sensor</label>
<div class="col-sm-2">
Expand Down Expand Up @@ -642,6 +650,8 @@ <h2 class="accordion-header" id="headingAdv">
$("#brewfather-apikey").val(cfg["brewfather-apikey"]);
$("#brewfather-userkey").val(cfg["brewfather-userkey"]);

$("#brewpi-url").val(cfg["brewpi-url"]);

$("#brewspy-token1").val(cfg["brewspy-token1"]);
$("#brewspy-token2").val(cfg["brewspy-token2"]);

Expand Down Expand Up @@ -717,7 +727,7 @@ <h2 class="accordion-header" id="headingAdv">

<!-- START FOOTER -->

<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-23 Magnus Persson</div>
<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2022-2024 Magnus Persson</div>
</div>
</body>

Expand Down
4 changes: 2 additions & 2 deletions html/config.min.htm
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 09b6d8f

Please sign in to comment.