Skip to content

Commit 3fe46a7

Browse files
authored
Merge pull request #215 from mp-se/revert-214-pressuremon
Revert "Merge pressuremon and gateway code into dev"
2 parents d18b088 + 47301e5 commit 3fe46a7

File tree

91 files changed

+3136
-7843
lines changed

Some content is hidden

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

91 files changed

+3136
-7843
lines changed

.github/workflows/pio-build.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ jobs:
2222
cp gravitymon-ui/dist/assets/style.css.gz html/app.css.gz
2323
cp gravitymon-ui/dist/assets/index.js.gz html/app.js.gz
2424
25+
#cp gravitymon-ui/dist/index.html html/
26+
2527
- name: Setup PlatformIO
2628
uses: n-vr/[email protected]
2729

2830
- name: PlatformIO Run
2931
uses: karniv00l/platformio-run-action@v1
3032
with:
31-
environments: "gravity-release,gravity32-release,gravity32c3-release,gravity32s2-release,gravity32s3-release,gravity32lite-release,gravity-olimex_esp32_c3_devkit_lipo,gravity-super_mini_esp32c3"
32-
# environments: "gravity-release,gravity32-release,gravity32c3-release,gravity32s2-release,gravity32s3-release,gravity32lite-release"
33+
environments: "gravity-release,gravity32-release,gravity32c3-release,gravity32s2-release,gravity32s3-release,gravity32lite-release"
3334
jobs: 6
3435
silent: false
3536
verbose: true

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# name: pre-commit
2+
23
# on:
34
# pull_request:
45
# push:
56
# branches:
67
# - master
78
# - dev
89
# - '2.0.0-fwk'
10+
911
# jobs:
1012
# pre-commit:
1113
# runs-on: ubuntu-latest

.gitignore

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
.vscode
33
.env
44
__pycache__
5+
_build
56
env
7+
*.map
8+
src_docs/_build/*
69
.env/*
710
*.pyc
8-
src_docs/_build/*
11+
*.json
12+
gcov/*.gcno
13+
gcov/*.gcov
14+
gcov/*.gcda
915
.DS_Store
10-
*.map

CONTRIBUTING.md

-10
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,4 @@
3232

3333
* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
3434

35-
#### **Adding a new board**
36-
37-
It's now possible to add new boards to GravityMon, these will not be tested as part of the release process since I dont really have access to all of them. This should be a showstopper since I test all the supported board types. In order to add a new board type do the following:
38-
39-
* If the board is not supported by Arduino/Platformio create the defintions and add them to the boards root directory. Place the pin defintions in a subfolder with the board id.
40-
* Add a new target to the platformio.ini file with the board defintion and configuration needed. Use the naming standard [env:gravity-boardid] for example [env:gravity-d1_mini], the result of this build will be copied to bin/custom-boardid.bin for example bin/custom-d1_mini.bin to indicate this is a custom board.
41-
* Update the documentation at src_docs/custom.rst
42-
* Test and verify
43-
* Create a PR
44-
4535
Thanks!
-1.69 MB
Binary file not shown.

bin/custom-super_mini_esp32c3.bin

-1.49 MB
Binary file not shown.

bin/firmware.bin

0 Bytes
Binary file not shown.

bin/firmware32.bin

0 Bytes
Binary file not shown.

bin/firmware32c3.bin

0 Bytes
Binary file not shown.

bin/firmware32lite.bin

0 Bytes
Binary file not shown.

bin/firmware32s2.bin

16 Bytes
Binary file not shown.

bin/firmware32s3.bin

0 Bytes
Binary file not shown.

boards/README.md

-3
This file was deleted.

boards/olimex_esp32_c3_devkit_lipo.json

-35
This file was deleted.

boards/olimex_esp32_c3_devkit_lipo/pins_arduino.h

-34
This file was deleted.

boards/super_mini_esp32c3.json

-44
This file was deleted.

boards/super_mini_esp32c3/pins_arduino.h

-34
This file was deleted.

0 commit comments

Comments
 (0)