Skip to content

Commit eed6c57

Browse files
authored
Merge branch 'master' into feature/ppp_after_linter
2 parents e06719a + e33543c commit eed6c57

File tree

7 files changed

+115
-10
lines changed

7 files changed

+115
-10
lines changed

Diff for: .github/workflows/pre-commit-status.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Report Pre-commit Check Status
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened, synchronize, labeled, unlabeled]
6+
7+
permissions:
8+
statuses: write
9+
10+
jobs:
11+
report-run:
12+
name: Check if the PR has run the pre-commit checks
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Report pending
16+
uses: conda/actions/[email protected]
17+
with:
18+
context: "Pre-commit checks"
19+
state: pending
20+
description: The pre-commit checks need to be successful before merging
21+
22+
- name: Wait for pre-commit checks to complete
23+
uses: lucasssvaz/wait-on-workflow@v1
24+
if: |
25+
contains(github.event.pull_request.labels.*.name, 'Status: Pending Merge')
26+
id: wait-on-workflow
27+
with:
28+
timeout: 10
29+
interval: 30
30+
workflow: pre-commit.yml
31+
sha: ${{ github.event.pull_request.head.sha || github.sha }}
32+
33+
- name: Report success
34+
uses: conda/actions/[email protected]
35+
if: |
36+
contains(github.event.pull_request.labels.*.name, 'Status: Pending Merge') &&
37+
steps.wait-on-workflow.outputs.conclusion == 'success'
38+
with:
39+
context: "Pre-commit checks"
40+
state: success
41+
description: All pre-commit checks passed

Diff for: .github/workflows/pre-commit.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
name: Pre-commit check
1+
name: Pre-commit hooks
22

33
on:
44
pull_request:
5-
types: [opened, reopened, synchronize, labeled]
5+
types: [opened, reopened, synchronize, labeled, unlabeled]
66

77
jobs:
88
lint:
99
if: |
1010
contains(github.event.pull_request.labels.*.name, 'Status: Pending Merge')
11-
name: Checking if any fixes are needed
11+
name: Check if fixes are needed
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout latest commit

Diff for: .github/workflows/publishlib.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
# It's convenient to set variables for values used multiple times in the workflow
1212
SKETCHES_REPORTS_PATH: artifacts/libraries-report
1313
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
14-
PR_EVENT_PATH: artifacts/Event File/event.json
14+
PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
1515

1616
jobs:
1717
lib-test-results:
@@ -25,17 +25,22 @@ jobs:
2525
- name: Download and Extract Artifacts
2626
run: |
2727
mkdir -p artifacts && cd artifacts
28+
mkdir -p libraries-report
2829
artifacts_url=${{ github.event.workflow_run.artifacts_url }}
2930
gh api "$artifacts_url" -q '.artifacts[] | [.name, .archive_download_url] | @tsv' | while read artifact
3031
do
3132
IFS=$'\t' read name url <<< "$artifact"
3233
gh api $url > "$name.zip"
33-
unzip -d "$name" "$name.zip"
34+
unzip -j "$name.zip" -d "temp_$name"
35+
mv "temp_$name"/* libraries-report
36+
rm -r "temp_$name"
3437
done
38+
echo "Contents of parent directory:"
39+
ls -R ..
3540
3641
- name: Report results
37-
uses: P-R-O-C-H-Y/report-size-deltas@main
42+
uses: P-R-O-C-H-Y/report-size-deltas@libs
3843
with:
3944
sketches-reports-source: ${{ env.SKETCHES_REPORTS_PATH }}
4045
github-token: ${{ env.GITHUB_TOKEN }}
41-
pr-event-path: ${{ env.PR_EVENT_PATH }}
46+
pr-number: ${{ env.PR_NUMBER }}

Diff for: .github/workflows/publishsizes.yml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Sizes Results
2+
3+
on:
4+
workflow_run:
5+
workflows: [ESP32 Arduino CI]
6+
types:
7+
- completed
8+
9+
workflow_dispatch:
10+
env:
11+
# It's convenient to set variables for values used multiple times in the workflow
12+
SKETCHES_REPORTS_PATH: artifacts/sizes-report
13+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
14+
PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
15+
16+
jobs:
17+
sizes-test-results:
18+
name: Sizes Comparsion Results
19+
runs-on: ubuntu-latest
20+
if: |
21+
github.event.workflow_run.event == 'pull_request' &&
22+
github.event.workflow_run.conclusion == 'success'
23+
24+
steps:
25+
- name: Download and Extract Artifacts
26+
run: |
27+
mkdir -p artifacts && cd artifacts
28+
mkdir -p sizes-report
29+
mkdir -p sizes-report/master
30+
mkdir -p sizes-report/pr
31+
artifacts_url=${{ github.event.workflow_run.artifacts_url }}
32+
gh api "$artifacts_url" -q '.artifacts[] | [.name, .archive_download_url] | @tsv' | while read artifact
33+
do
34+
IFS=$'\t' read name url <<< "$artifact"
35+
gh api $url > "$name.zip"
36+
unzip -j "$name.zip" -d "temp_$name"
37+
if [[ "$name" == *"master"* ]]; then
38+
mv "temp_$name"/* sizes-report/master
39+
elif [[ "$name" == *"pr"* ]]; then
40+
mv "temp_$name"/* sizes-report/pr
41+
else
42+
mv "temp_$name"/* sizes-report
43+
fi
44+
rm -r "temp_$name"
45+
done
46+
echo "Contents of parent directory:"
47+
ls -R ..
48+
49+
- name: Report results
50+
uses: P-R-O-C-H-Y/report-size-deltas@sizes_v2
51+
with:
52+
sketches-reports-source: ${{ env.SKETCHES_REPORTS_PATH }}
53+
github-token: ${{ env.GITHUB_TOKEN }}
54+
pr-number: ${{ env.PR_NUMBER }}

Diff for: cores/esp32/chip-debug-report.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ static void printPartitionsInfo(void) {
193193
case ESP_PARTITION_SUBTYPE_DATA_ESPHTTPD: chip_report_printf("ESPHTTPD"); break;
194194
case ESP_PARTITION_SUBTYPE_DATA_FAT: chip_report_printf("FAT"); break;
195195
case ESP_PARTITION_SUBTYPE_DATA_SPIFFS: chip_report_printf("SPIFFS"); break;
196+
case ESP_PARTITION_SUBTYPE_DATA_LITTLEFS: chip_report_printf("LITTLEFS"); break;
196197
default: chip_report_printf("0x%02X", partition->subtype); break;
197198
}
198199
}

Diff for: docs/en/migration_guides/2.x_to_3.0.rst

+6-2
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,13 @@ Changes in APIs
189189
Functional changes
190190
******************
191191

192+
* Default pins for some SoCs have been changed to avoid conflicts with other peripherals:
193+
* ESP32's UART1 RX and TX pins are now GPIO26 and GPIO27, respectively;
194+
* ESP32's UART2 RX and TX pins are now GPIO4 and GPIO25, respectively;
195+
* ESP32-S2's UART1 RX and TX pins are now GPIO4 and GPIO5, respectively.
192196
* It is now possible to detach UART0 pins by calling ``end()`` with no previous call of ``begin()``.
193197
* It is now possible to call ``setPins()`` before ``begin()`` or in any order.
194-
* ``setPins(``) will detach any previous pins that have been changed.
198+
* ``setPins()`` will detach any previous pins that have been changed.
195199
* ``begin(baud, rx, tx)`` will detach any previous attached pins.
196200
* ``setPins()`` or ``begin(baud, rx, tx)`` when called at first, will detach console RX0/TX0, attached in boot.
197201
* Any pin set as -1 in ``begin()`` or ``setPins()`` won't be changed nor detached.
@@ -206,4 +210,4 @@ Functional changes
206210

207211
* In Arduino (and other frameworks) the method named ``flush()`` is intended to send out the transmit buffer content. ``WiFiClient`` and ``WiFiUDP`` method ``flush()`` won't clear the receive buffer anymore. A new method called ``clear()`` is now used for that. Currently ``flush()`` does nothing in ``WiFiClient``, ``WiFiClientSecure`` and ``WiFiUDP``.
208212
* ``WiFiServer`` has functions ``accept()`` and ``available()`` with the same functionality. In Arduino, ``available()`` should work differently so it is now deprecated.
209-
* ``WiFiServer`` had unimplemented write functions inherited from ``Print`` class. These are now removed. Also unimplemented method ``stopAll()`` is removed. The methods were unimplemented because WiFiServer doesn't manage connected WiFiClient objects for print-to-all-clients functionality.
213+
* ``WiFiServer`` had unimplemented write functions inherited from ``Print`` class. These are now removed. Also unimplemented method ``stopAll()`` is removed. The methods were unimplemented because ``WiFiServer`` doesn't manage connected ``WiFiClient`` objects for print-to-all-clients functionality.

Diff for: tests/touch/touch.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ uint8_t TOUCH_GPIOS[] = { 4, 2, 15, 13, 12, 14, 27, 33, 32 };
2525

2626
#define NO_TOUCH_GPIO 25
2727

28-
#define RELEASED_VALUE 80 //80+ read value to pass test
28+
#define RELEASED_VALUE 75 //75+ read value to pass test
2929
#define PRESSED_VALUE 20 //20- read value to pass test
3030
#define INTERRUPT_THRESHOLD 40
3131

0 commit comments

Comments
 (0)