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 1323695

Browse files
mp-semp-se
authored
Merge pull request #28 from mp-se/dev
Merge 0.8 into master
2 parents 61445b0 + 24da408 commit 1323695

File tree

15 files changed

+341
-142
lines changed

15 files changed

+341
-142
lines changed

‎.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export GITHUB_REPOSITORY=mp-se/kegmon@master
2+
export GITHUB_TOKEN="$(gh auth token)"
3+
export SECRETS_GITHUB_TOKEN="$(gh auth token)"

‎.github/workflows/doc-build.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
name: Sphinx Build
22

33
on:
4+
pull_request:
45
push:
56
branches:
67
- master
78

89
jobs:
9-
build:
10+
doc-build:
1011
runs-on: ubuntu-latest
1112

1213
steps:
13-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1415

1516
- uses: ammaraskar/sphinx-action@master
1617
with:
@@ -41,6 +42,7 @@ jobs:
4142
git commit -m "Update documentation" -a || true
4243
# The above command will fail if no changes were present, so we ignore
4344
# the return code.
45+
4446
- name: Push changes
4547
uses: ad-m/github-push-action@master
4648
with:

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

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,43 @@
11
name: PlatformIO CI
22

33
on:
4+
pull_request:
45
push:
56
branches:
67
- dev
78

89
jobs:
9-
build:
10+
pio-build:
1011
runs-on: ubuntu-latest
1112

1213
steps:
13-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1415

15-
- name: Cache pip
16-
uses: actions/cache@v2
16+
- name: Setup PlatformIO
17+
uses: n-vr/[email protected]
18+
19+
#- name: Run PlatformIO
20+
# run: pio run -e kegmon-release -e kegmon32s2-release
21+
22+
- name: PlatformIO Run
23+
uses: karniv00l/platformio-run-action@v1
1724
with:
18-
path: ~/.cache/pip
19-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
20-
restore-keys: |
21-
${{ runner.os }}-pip-
22-
23-
- name: Cache PlatformIO
24-
uses: actions/cache@v2
25-
with:
26-
path: ~/.platformio
27-
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
28-
29-
- name: Set up Python
30-
uses: actions/setup-python@v2
31-
32-
- name: Install PlatformIO
33-
run: |
34-
python -m pip install --upgrade pip
35-
pip install --upgrade platformio
36-
git config --global advice.detachedHead false
37-
38-
- name: Run PlatformIO
39-
run: pio run -e kegmon-release -e kegmon32s2-release
40-
41-
- uses: EndBug/add-and-commit@v7 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
25+
environments: "kegmon-release,kegmon32s2-release"
26+
#targets: "kegmon-release,kegmon32s2-release"
27+
#project-dir: "./some_dir"
28+
#project-conf: "./some_dir/custom.ini"
29+
jobs: 6
30+
silent: false
31+
verbose: true
32+
disable-auto-clean: false
33+
34+
35+
- uses: EndBug/add-and-commit@v9 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
36+
if: ${{ github.event_name != 'pull_request' }}
4237
with:
4338
add: 'bin'
4439
author_name: GitHub Action
4540
author_email: [email protected]
46-
47-
branch: dev
48-
4941
default_author: github_actor
5042
message: 'GitHub Action Build'
5143
pathspec_error_handling: ignore

‎.github/workflows/pre-commit.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ jobs:
1111
pre-commit:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-python@v2
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-python@v4
1616
- name: clang format support
1717
run: |
18+
sudo apt update
1819
sudo apt install clang-format cppcheck
19-
- uses: pre-commit/action@v2.0.3
20+
- uses: pre-commit/action@v3.0.0

‎bin/firmware.bin‎

528 Bytes
Binary file not shown.

‎bin/firmware32s2.bin‎

2.23 KB
Binary file not shown.

‎bin/littlefs.bin‎

448 KB
Binary file not shown.

‎html/backup.htm‎

Lines changed: 68 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
@@ -16,7 +16,7 @@
1616

1717
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
1818
<script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
19-
19+
2020
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
2121
<div class="container">
2222
<a class="navbar-brand" href="/index.htm">Beer Keg Monitor</a>
@@ -53,99 +53,98 @@
5353
<div class="spinner-border text-light" id="spinner" role="status"></div>
5454
</div>
5555
</nav>
56-
5756

58-
<!-- START MAIN INDEX -->
57+
<!-- START MAIN INDEX -->
5958

60-
<div class="container row-margin-10">
59+
<div class="container row-margin-10">
6160

62-
<div class="alert alert-success alert-dismissible hide fade d-none" role="alert">
63-
<div id="alert"></div>
64-
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
65-
</div>
61+
<div class="alert alert-success alert-dismissible hide fade d-none" role="alert">
62+
<div id="alert"></div>
63+
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
64+
</div>
6665

67-
<script type="text/javascript">
68-
function showError( msg ) {
69-
$('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
70-
$('#alert').text( msg );
71-
}
66+
<script>
67+
function showError( msg ) {
68+
$('.alert').removeClass('alert-success').addClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
69+
$('#alert').text( msg );
70+
}
7271

73-
function showSuccess( msg ) {
74-
$('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
75-
$('#alert').text( msg );
76-
}
72+
function showSuccess( msg ) {
73+
$('.alert').addClass('alert-success').removeClass('alert-danger').removeClass('hide').addClass('show').removeClass('d-none');
74+
$('#alert').text( msg );
75+
}
7776

78-
$("#alert-btn").click(function(e){
79-
$('.alert').addClass('hide').removeClass('show').addClass('d-none');
80-
});
81-
</script>
77+
$("#alert-btn").click(function(e){
78+
$('.alert').addClass('hide').removeClass('show').addClass('d-none');
79+
});
80+
</script>
8281

83-
<div class="accordion" id="accordion">
82+
<div class="accordion" id="accordion">
8483

85-
<div class="accordion-item">
86-
<h2 class="accordion-header" id="headingBackup">
87-
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseBackup" aria-expanded="true" aria-controls="collapseBackup">
88-
<b>Create backup</b>
89-
</button>
90-
</h2>
91-
<div id="collapseBackup" class="accordion-collapse collapse show" aria-labelledby="headingBackup" data-bs-parent="#accordion">
92-
<div class="accordion-body">
84+
<div class="accordion-item">
85+
<h2 class="accordion-header" id="headingBackup">
86+
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseBackup" aria-expanded="true" aria-controls="collapseBackup">
87+
<b>Create backup</b>
88+
</button>
89+
</h2>
90+
<div id="collapseBackup" class="accordion-collapse collapse show" aria-labelledby="headingBackup" data-bs-parent="#accordion">
91+
<div class="accordion-body">
9392

94-
<div class="row mb-3">
95-
<div class="col-md-12 themed-grid-col bg-light">Backup configuration to file</div>
96-
</div>
93+
<div class="row mb-3">
94+
<div class="col-md-12 themed-grid-col bg-light">Backup configuration to file</div>
95+
</div>
9796

98-
<button class="btn btn-primary btn-sm" type="button" data-bs-toggle="tooltip" name="backup-btn" id="backup-btn" title="Create backup of configuration">
99-
Create backup
100-
</button>
101-
97+
<button class="btn btn-primary btn-sm" type="button" data-bs-toggle="tooltip" name="backup-btn" id="backup-btn" title="Create backup of configuration">
98+
Create backup
99+
</button>
100+
101+
</div>
102102
</div>
103103
</div>
104-
</div>
105104

106-
<div class="accordion-item">
107-
<h2 class="accordion-header" id="headingRestore">
108-
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseRestore" aria-expanded="true" aria-controls="collapseRestore">
109-
<b>Restore backup</b>
110-
</button>
111-
</h2>
112-
<div id="collapseRestore" class="accordion-collapse collapse show" aria-labelledby="headingRestore" data-bs-parent="#accordion">
113-
<div class="accordion-body">
114-
115-
<div class="row mb-3">
116-
<div class="col-md-12 themed-grid-col bg-light">Restore configuration from file</div>
117-
</div>
105+
<div class="accordion-item">
106+
<h2 class="accordion-header" id="headingRestore">
107+
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseRestore" aria-expanded="true" aria-controls="collapseRestore">
108+
<b>Restore backup</b>
109+
</button>
110+
</h2>
111+
<div id="collapseRestore" class="accordion-collapse collapse show" aria-labelledby="headingRestore" data-bs-parent="#accordion">
112+
<div class="accordion-body">
118113

119-
<form id="uploadForm" enctype="multipart/form-data">
120114
<div class="row mb-3">
121-
<div class="col-md-8 custom-file">
122-
<input type="file" accept=".txt" class="custom-file-input" name="name" id="name" data-bs-toggle="tooltip" title="Select a configuration backup to upload">
123-
</div>
115+
<div class="col-md-12 themed-grid-col bg-light">Restore configuration from file</div>
124116
</div>
125-
<div class="row mb-3">
126-
<div class="col-md-4">
127-
<button type="submit" class="btn btn-primary" id="restore-btn" value="upload" data-bs-toggle="tooltip" title="Restore configuration from a file">Restore configuration</button>
117+
118+
<form id="uploadForm" enctype="multipart/form-data">
119+
<div class="row mb-3">
120+
<div class="col-md-8 custom-file">
121+
<input type="file" accept=".txt" class="custom-file-input" name="name" id="name" data-bs-toggle="tooltip" title="Select a configuration backup to upload">
122+
</div>
128123
</div>
124+
<div class="row mb-3">
125+
<div class="col-md-4">
126+
<button type="submit" class="btn btn-primary" id="restore-btn" value="upload" data-bs-toggle="tooltip" title="Restore configuration from a file">Restore configuration</button>
127+
</div>
128+
</div>
129+
</form>
130+
131+
<div class="progress">
132+
<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
129133
</div>
130-
</form>
131134

132-
<div class="progress">
133-
<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
134135
</div>
135-
136136
</div>
137137
</div>
138-
139138
</div>
140139
</div>
141140

142-
<script type="text/javascript">
141+
<script>
143142
var swVer = ""
144143
var backup = {};
145144
var progress = 0;
146145
</script>
147146

148-
<script type="text/javascript">
147+
<script>
149148
window.onload = getStatus;
150149

151150
function download(content, mimeType, filename) {
@@ -266,8 +265,8 @@ <h2 class="accordion-header" id="headingRestore">
266265
console.log( "Selected file: " + fileElement.files[0].name );
267266

268267
let reader = new FileReader();
269-
reader.addEventListener('load', function(e) {
270-
let text = e.target.result;
268+
reader.addEventListener('load', function(e) {
269+
let text = e.target.result;
271270

272271
try {
273272
json = JSON.parse( text );
@@ -280,7 +279,7 @@ <h2 class="accordion-header" id="headingRestore">
280279
}
281280
} catch (error) {
282281
console.error(error);
283-
showError("Unable to parse configuration file for GravityMon.")
282+
showError("Unable to parse configuration file.")
284283
}
285284
});
286285
reader.readAsText(fileElement.files[0]);
@@ -317,5 +316,5 @@ <h2 class="accordion-header" id="headingRestore">
317316
<!-- START FOOTER -->
318317

319318
<div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-23 Magnus Persson</div>
320-
</body>
319+
</body>
321320
</html>

0 commit comments

Comments
 (0)