WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 09b6d8f

Browse files
authored
Merge pull request #30 from mp-se/dev
Merge dev into master for 0.9
2 parents 98aa1ac + be0cad3 commit 09b6d8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+315
-309
lines changed

.github/workflows/pio-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: PlatformIO Run
2323
uses: karniv00l/platformio-run-action@v1
2424
with:
25-
environments: "kegmon-release,kegmon32s2-release"
25+
environments: "kegmon-release,kegmon32s2-release,kegmon32s3-release"
2626
#targets: "kegmon-release,kegmon32s2-release"
2727
#project-dir: "./some_dir"
2828
#project-conf: "./some_dir/custom.ini"

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ For docs see: https://mp-se.github.io/kegmon/index.html
1616

1717
# Hardware
1818

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

2424
# Features
@@ -37,4 +37,3 @@ For docs see: https://mp-se.github.io/kegmon/index.html
3737
* Modern HTML5 UI
3838
* Easy scale calibration
3939
* 3D models and PCB
40-
* Mobile dashboard

bin/firmware.bin

-1.11 KB
Binary file not shown.

bin/firmware32s2.bin

-1.2 KB
Binary file not shown.

bin/firmware32s3.bin

1.3 MB
Binary file not shown.

bin/partitions32s3.bin

3 KB
Binary file not shown.

html/about.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@ <h2 class="accordion-header" id="headingAbout">
136136

137137
<!-- START FOOTER -->
138138

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

html/about.min.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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/[email protected]/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/[email protected]/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>
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/[email protected]/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/[email protected]/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>

html/backup.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<li><a class="dropdown-item" href="#">Backup & Restore</a></li>
4646
</ul>
4747
</li>
48-
<li class="nav-item">
48+
<li class="nav-item">
4949
<a class="nav-link" href="/about.htm">About</a>
5050
</li>
5151
</ul>
@@ -315,6 +315,6 @@ <h2 class="accordion-header" id="headingRestore">
315315

316316
<!-- START FOOTER -->
317317

318-
<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-23 Magnus Persson</div>
318+
<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-2024 Magnus Persson</div>
319319
</body>
320320
</html>

html/backup.min.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,4 @@
163163
setButtonDisabled( false );
164164
$('#spinner').hide();
165165
});
166-
}</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-23 Magnus Persson</div></body></html>
166+
}</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-2024 Magnus Persson</div></body></html>

0 commit comments

Comments
 (0)