Skip to content

Commit a1cfe58

Browse files
authored
Merge branch 'master' into wifi_async_scan_example
2 parents a697d53 + 42ed9c0 commit a1cfe58

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

Diff for: .github/workflows/dangerjs.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: DangerJS Pull Request linter
2+
on:
3+
pull_request_target:
4+
types: [opened, edited, reopened, synchronize]
5+
6+
permissions:
7+
pull-requests: write
8+
contents: write
9+
10+
jobs:
11+
pull-request-style-linter:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check out PR head
15+
uses: actions/checkout@v4
16+
with:
17+
ref: ${{ github.event.pull_request.head.sha }}
18+
19+
- name: DangerJS pull request linter
20+
uses: espressif/shared-github-dangerjs@v1
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Diff for: docs/source/api/reset_reason.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ To get started with Reset Reason, you can try:
1515
Reset Reason
1616
************
1717

18-
.. literalinclude:: ../../../libraries/ESP32/examples/ResetReason/ResetReason.ino
19-
:language: arduino
18+
.. literalinclude:: ../../../libraries/ESP32/examples/ResetReason/ResetReason/ResetReason.ino
19+
:language: arduino

Diff for: platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ recipe.hooks.prebuild.6.pattern.windows=cmd /c if not exist "{build.path}\build_
147147
# Set -DARDUINO_CORE_BUILD only on core file compilation
148148
file_opts.path={build.path}/file_opts
149149
recipe.hooks.prebuild.set_core_build_flag.pattern=/usr/bin/env bash -c ": > '{file_opts.path}'"
150-
recipe.hooks.core.prebuild.set_core_build_flag.pattern=/usr/bin/env bash -c "echo '-DARDUINO_CORE_BUILD' > '{file_opts.path}'"
150+
recipe.hooks.core.prebuild.set_core_build_flag.pattern=/usr/bin/env bash -c "echo -DARDUINO_CORE_BUILD > '{file_opts.path}'"
151151
recipe.hooks.core.postbuild.set_core_build_flag.pattern=/usr/bin/env bash -c ": > '{file_opts.path}'"
152152

153153
recipe.hooks.prebuild.set_core_build_flag.pattern.windows=cmd /c type nul > "{file_opts.path}"

0 commit comments

Comments
 (0)