Skip to content

Commit 3475adc

Browse files
Merge pull request #241 from ayushsharma82/dev
v4.0.8
2 parents 1f0d98b + f2d08f2 commit 3475adc

File tree

11 files changed

+337
-83
lines changed

11 files changed

+337
-83
lines changed

.github/workflows/ci.yml

Lines changed: 62 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ on:
44
push:
55
paths-ignore:
66
- "**/**.md"
7-
- "/keywords.txt"
8-
- "/library.json"
9-
- "/library.properties"
10-
- "/docs"
7+
- "keywords.txt"
8+
- "library.json"
9+
- "library.properties"
10+
- "docs/**"
1111
pull_request:
1212
paths-ignore:
1313
- "**/**.md"
14-
- "/keywords.txt"
15-
- "/library.json"
16-
- "/library.properties"
17-
- "/docs"
14+
- "keywords.txt"
15+
- "library.json"
16+
- "library.properties"
17+
- "docs/**"
1818

1919
jobs:
2020
arduino:
@@ -56,13 +56,13 @@ jobs:
5656
run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }}
5757

5858
- name: Install AsyncTCP
59-
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.2.3
59+
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.2.10
6060

6161
- name: Install ESPAsyncTCP
6262
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0
6363

6464
- name: Install ESPAsyncWebServer
65-
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.1.1
65+
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.3.14
6666

6767
- name: Install ArduinoJson
6868
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/bblanchon/ArduinoJson#v7.1.0
@@ -86,58 +86,72 @@ jobs:
8686
run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/Interactive/Interactive.ino"
8787

8888
platformio:
89-
name: pio ${{ matrix.name }}
89+
name: "pio:${{ matrix.env }}:${{ matrix.board }}"
9090
runs-on: ubuntu-latest
9191
strategy:
9292
fail-fast: false
9393
matrix:
9494
include:
95-
- name: esp32dev|arduino
95+
- env: ci-arduino-2
9696
board: esp32dev
97-
platform: espressif32
98-
opts: "--project-option 'lib_compat_mode = strict'"
99-
- name: esp32dev|arduino-2
100-
board: esp32dev
101-
102-
opts: "--project-option 'lib_compat_mode = strict'"
103-
- name: esp32dev|arduino-3
104-
board: esp32dev
105-
platform: espressif32
106-
opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'"
107-
- name: esp32-s3-devkitc-1|arduino
97+
- env: ci-arduino-2
98+
board: esp32-s2-saola-1
99+
- env: ci-arduino-2
108100
board: esp32-s3-devkitc-1
109-
platform: espressif32
110-
opts: "--project-option 'lib_compat_mode = strict'"
111-
- name: esp32-s3-devkitc-1|arduino-2
101+
- env: ci-arduino-2
102+
board: esp32-c3-devkitc-02
103+
104+
- env: ci-arduino-3
105+
board: esp32dev
106+
- env: ci-arduino-3
107+
board: esp32-s2-saola-1
108+
- env: ci-arduino-3
112109
board: esp32-s3-devkitc-1
113-
114-
opts: "--project-option 'lib_compat_mode = strict'"
115-
- name: esp32-s3-devkitc-1|arduino-3
110+
- env: ci-arduino-3
111+
board: esp32-c3-devkitc-02
112+
- env: ci-arduino-3
113+
board: esp32-c6-devkitc-1
114+
115+
- env: ci-arduino-310rc1
116+
board: esp32dev
117+
- env: ci-arduino-310rc1
118+
board: esp32-s2-saola-1
119+
- env: ci-arduino-310rc1
116120
board: esp32-s3-devkitc-1
117-
platform: espressif32
118-
opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'"
119-
- name: huzzah|espressif8266
121+
- env: ci-arduino-310rc1
122+
board: esp32-c3-devkitc-02
123+
- env: ci-arduino-310rc1
124+
board: esp32-c6-devkitc-1
125+
126+
- env: ci-esp8266
120127
board: huzzah
121-
platform: espressif8266
122-
opts: "--project-option 'lib_compat_mode = strict'"
128+
- env: ci-esp8266
129+
board: d1_mini
123130
steps:
124-
- uses: actions/checkout@v4
125-
- name: Set up cache
131+
- name: Checkout
132+
uses: actions/checkout@v4
133+
134+
- name: Cache PlatformIO
126135
uses: actions/cache@v4
127136
with:
137+
key: ${{ runner.os }}-pio
128138
path: |
129-
~/.platformio
130139
~/.cache/pip
131-
key: ${{ matrix.name }}
132-
- uses: actions/setup-python@v5
140+
~/.platformio
141+
142+
- name: Python
143+
uses: actions/setup-python@v5
133144
with:
134145
python-version: "3.x"
135-
- run: pip install platformio
136-
- run: platformio platform install ${{ matrix.platform }}
137-
138-
- run: platformio ci "examples/AccessPoint/AccessPoint.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
139-
- run: platformio ci "examples/Basic/Basic.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
140-
- run: platformio ci "examples/Benchmark/Benchmark.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
141-
- run: platformio ci "examples/Chart/Chart.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
142-
- run: platformio ci "examples/Dynamic/Dynamic.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
143-
- run: platformio ci "examples/Interactive/Interactive.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
146+
147+
- name: Build
148+
run: |
149+
python -m pip install --upgrade pip
150+
pip install --upgrade platformio
151+
152+
- run: PLATFORMIO_SRC_DIR=examples/AccessPoint PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}
153+
- run: PLATFORMIO_SRC_DIR=examples/Basic PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}
154+
- run: PLATFORMIO_SRC_DIR=examples/Benchmark PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}
155+
- run: PLATFORMIO_SRC_DIR=examples/Chart PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}
156+
- run: PLATFORMIO_SRC_DIR=examples/Dynamic PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}
157+
- run: PLATFORMIO_SRC_DIR=examples/Interactive PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}

.github/workflows/cla.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "CLA Assistant"
2+
on:
3+
issue_comment:
4+
types: [created]
5+
pull_request_target:
6+
types: [opened,closed,synchronize]
7+
8+
# explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings
9+
permissions:
10+
actions: write
11+
contents: write # this can be 'read' if the signatures are in remote repository
12+
pull-requests: write
13+
statuses: write
14+
15+
jobs:
16+
CLAAssistant:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: "CLA Assistant"
20+
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
21+
uses: contributor-assistant/[email protected]
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
with:
25+
path-to-signatures: '.github/cla-signatures/cla.json'
26+
path-to-document: 'https://github.com/ayushsharma82/ESP-DASH/blob/master/CLA.md' # e.g. a CLA or a DCO document
27+
# branch should not be protected
28+
branch: 'dev'
29+
allowlist: ayushsharma82,bot*

CLA.md

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# Contributor Agreement
2+
3+
## Individual Contributor Non-Exclusive License Agreement
4+
5+
Thank you for your interest in contributing to Softt's Software ("We" or "Us").
6+
7+
The purpose of this contributor agreement ("Agreement") is to clarify and document the rights granted by contributors to Us.
8+
9+
### How to use this Contributor Agreement
10+
11+
If You are an employee and have created the Contribution as part of your employment, You need to have Your employer approve this Agreement or sign the Entity version of this document. If You do not own the Copyright in the entire work of authorship, any other author of the Contribution should also sign this – in any event, please contact Us at <[email protected]>
12+
13+
### 1\. Definitions
14+
15+
**"You"** means the individual Copyright owner who Submits a Contribution to Us.
16+
17+
**"Legal Entity"** means an entity that is not a natural person.
18+
19+
**"Affiliate"** means any other Legal Entity that controls, is controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities that vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity.
20+
21+
**"Contribution"** means any original work of authorship, including any original modifications or additions to an existing work of authorship, Submitted by You to Us, in which You own the Copyright.
22+
23+
**"Copyright"** means all rights protecting works of authorship, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence.
24+
25+
**"Material"** means the software or documentation made available by Us to third parties. When this Agreement covers more than one software project, the Material means the software or documentation to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material.
26+
27+
**"Submit"** means any act by which a Contribution is transferred to Us by You by means of tangible or intangible media, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us, but excluding any transfer that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
28+
29+
**"Documentation"** means any non-software portion of a Contribution.
30+
31+
### 2\. License grant
32+
33+
#### 2.1 Copyright license to Us
34+
35+
Subject to the terms and conditions of this Agreement, You hereby grant to Us a worldwide, royalty-free, NON-exclusive, perpetual and irrevocable (except as stated in Section 8.2) license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, under the Copyright covering the Contribution to use the Contribution by all means, including, but not limited to:
36+
37+
* publish the Contribution,
38+
* modify the Contribution,
39+
* prepare derivative works based upon or containing the Contribution and/or to combine the Contribution with other Materials,
40+
* reproduce the Contribution in original or modified form,
41+
* distribute, to make the Contribution available to the public, display and publicly perform the Contribution in original or modified form.
42+
43+
#### 2.2 Moral rights
44+
45+
Moral Rights remain unaffected to the extent they are recognized and not waivable by applicable law. Notwithstanding, You may add your name to the attribution mechanism customary used in the Materials you Contribute to, such as the header of the source code files of Your Contribution, and We will respect this attribution when using Your Contribution.
46+
47+
### 3\. Patents
48+
49+
#### 3.1 Patent license
50+
51+
Subject to the terms and conditions of this Agreement You hereby grant to Us and to recipients of Materials distributed by Us a worldwide, royalty-free, non-exclusive, perpetual and irrevocable (except as stated in Section 3.2) patent license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with any Material (and portions of such combination). This license applies to all patents owned or controlled by You, whether already acquired or hereafter acquired, that would be infringed by making, having made, using, selling, offering for sale, importing or otherwise transferring of Your Contribution(s) alone or by combination of Your Contribution(s) with any Material.
52+
53+
#### 3.2 Revocation of patent license
54+
55+
You reserve the right to revoke the patent license stated in section 3.1 if We make any infringement claim that is targeted at your Contribution and not asserted for a Defensive Purpose. An assertion of claims of the Patents shall be considered for a "Defensive Purpose" if the claims are asserted against an entity that has filed, maintained, threatened, or voluntarily participated in a patent infringement lawsuit against Us or any of Our licensees.
56+
57+
### 4. Disclaimer
58+
59+
THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION AND EXTENT TO THE MINIMUM PERIOD AND EXTENT PERMITTED BY LAW.
60+
61+
### 5. Consequential damage waiver
62+
63+
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR WE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
64+
65+
### 6. Approximation of disclaimer and damage waiver
66+
67+
IF THE DISCLAIMER AND DAMAGE WAIVER MENTIONED IN SECTION 4. AND SECTION 5. CANNOT BE GIVEN LEGAL EFFECT UNDER APPLICABLE LOCAL LAW, REVIEWING COURTS SHALL APPLY LOCAL LAW THAT MOST CLOSELY APPROXIMATES AN ABSOLUTE WAIVER OF ALL CIVIL OR CONTRACTUAL LIABILITY IN CONNECTION WITH THE CONTRIBUTION.
68+
69+
### 7. Term
70+
71+
7.1 This Agreement shall come into effect upon Your acceptance of the terms and conditions.
72+
73+
7.3 In the event of a termination of this Agreement Sections 4, 5, 6, 7 and 8 shall survive such termination and shall remain in full force thereafter. For the avoidance of doubt, Free and Open Source Software (sub)licenses that have already been granted for Contributions at the date of the termination shall remain in full force after the termination of this Agreement.
74+
75+
### 8 Miscellaneous
76+
77+
8.1 This Agreement and all disputes, claims, actions, suits or other proceedings arising out of this agreement or relating in any way to it shall be governed by the laws of India excluding its private international law provisions.
78+
79+
8.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.
80+
81+
8.3 In case of Your death, this agreement shall continue with Your heirs. In case of more than one heir, all heirs must exercise their rights through a commonly authorized person.
82+
83+
8.4 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and that is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.
84+
85+
8.5 You agree to notify Us of any facts or circumstances of which you become aware that would make this Agreement inaccurate in any respect.

CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at <[email protected]>. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
<https://www.contributor-covenant.org/faq>
-49.6 KB
Binary file not shown.

library.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"maintainer": true
1616
}
1717
],
18-
"version": "4.0.7",
18+
"version": "4.0.8",
1919
"frameworks": "arduino",
2020
"platforms": ["espressif32", "espressif8266"],
2121
"dependencies": [
@@ -28,7 +28,7 @@
2828
{
2929
"owner": "mathieucarbou",
3030
"name": "ESPAsyncWebServer",
31-
"version": "^3.1.1",
31+
"version": "^3.3.14",
3232
"platforms": ["espressif8266", "espressif32"]
3333
}
3434
]

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ESP-DASH
2-
version=4.0.7
2+
version=4.0.8
33
author=Ayush Sharma
44
category=Communication
55
maintainer=Ayush Sharma <[email protected]>

0 commit comments

Comments
 (0)