Skip to content

Commit 5d0c4b3

Browse files
authored
Merge branch 'master' into release/v3.3.x
2 parents 42ae242 + c110ca8 commit 5d0c4b3

File tree

7 files changed

+25
-20
lines changed

7 files changed

+25
-20
lines changed

.codespellrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[codespell]
22
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/spell-check/.codespellrc
33
# In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here:
4-
ignore-words-list = ba,licence,ot,dout,als,exten
4+
ignore-words-list = ba,licence,ot,dout,als,exten,emac
55
skip = ./.git,./.licenses,__pycache__,.clang-format,.codespellrc,.editorconfig,.flake8,.prettierignore,.yamllint.yml,.gitignore,boards.txt,platform.txt,programmers.txt
66
builtin = clear,informal,en-GB_to_en-US
77
check-filenames =

.github/ISSUE_TEMPLATE/Feature-request.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ body:
55
- type: markdown
66
attributes:
77
value: |
8+
* Please note that we can only process feature requests reported in English to ensure effective communication and support. Feature requests written in other languages will be closed, with a request to rewrite them in English.
89
* We welcome any ideas or feature requests! It is helpful if you can explain exactly why the feature would be useful.
910
* There are usually some outstanding feature requests in the [existing issues list](https://github.com/espressif/arduino-esp32/issues?q=is%3Aopen+is%3Aissue+label%3A%22Type%3A+Feature+request%22), feel free to add comments to them.
1011
* If you would like to contribute, please read the [contributions guide](https://docs.espressif.com/projects/arduino-esp32/en/latest/contributing.html).

.github/ISSUE_TEMPLATE/Issue-report.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ body:
55
- type: markdown
66
attributes:
77
value: |
8+
* Please note that we can only process issues reported in English to ensure effective communication and support. Issues written in other languages will be closed, with a request to rewrite them in English.
89
* Before reporting a new issue please check and search in [List of existing issues](https://github.com/espressif/arduino-esp32/issues?q=is%3Aissue)
910
* Please check [Online Documentation](https://docs.espressif.com/projects/arduino-esp32/en/latest/index.html)
1011
* Take a look on [Troubleshooting guide](https://docs.espressif.com/projects/arduino-esp32/en/latest/troubleshooting.html)

.pre-commit-config.yaml

+17-17
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ default_language_version:
1212

1313
repos:
1414
- repo: https://github.com/pre-commit/pre-commit-hooks
15-
rev: "v5.0.0"
15+
rev: "cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b" # v5.0.0
1616
hooks:
1717
# Generic checks
1818
- id: check-case-conflict
@@ -39,31 +39,24 @@ repos:
3939
^package\/.*$
4040
)
4141
42-
- repo: https://github.com/codespell-project/codespell
43-
rev: "v2.3.0"
44-
hooks:
45-
# Spell checking
46-
- id: codespell
47-
exclude: ^.*\.(svd|SVD)$
48-
4942
- repo: https://github.com/pre-commit/mirrors-clang-format
50-
rev: "v18.1.3"
43+
rev: "f6446549e5e97ec9665b9b03e75b87b445857f9a" # v18.1.3
5144
hooks:
5245
# C/C++ formatting
5346
- id: clang-format
5447
types_or: [c, c++]
5548
exclude: ^.*\/build_opt\.h$
5649

5750
- repo: https://github.com/psf/black-pre-commit-mirror
58-
rev: "24.10.0"
51+
rev: "a4920527036bb9a3f3e6055d595849d67d0da066" # 25.1.0
5952
hooks:
6053
# Python formatting
6154
- id: black
6255
types_or: [python]
6356
args: [--line-length=120] #From the arduino code style. Add as argument rather than creating a new config file.
6457

6558
- repo: https://github.com/PyCQA/flake8
66-
rev: "7.1.1"
59+
rev: "16f5f28a384f0781bebb37a08aa45e65b9526c50" # 7.2.0
6760
hooks:
6861
# Python linting
6962
- id: flake8
@@ -74,37 +67,44 @@ repos:
7467
- flake8-simplify
7568

7669
- repo: https://github.com/pre-commit/mirrors-prettier
77-
rev: "v3.1.0"
70+
rev: "ffb6a759a979008c0e6dff86e39f4745a2d9eac4" # v3.1.0
7871
hooks:
7972
# YAML formatting
8073
- id: prettier
8174
types_or: [yaml]
8275

76+
- repo: https://github.com/codespell-project/codespell
77+
rev: "63c8f8312b7559622c0d82815639671ae42132ac" # v2.4.1
78+
hooks:
79+
# Spell checking
80+
- id: codespell
81+
exclude: ^.*\.(svd|SVD)$
82+
8383
- repo: https://github.com/shellcheck-py/shellcheck-py
84-
rev: "v0.10.0.1"
84+
rev: "a23f6b85d0fdd5bb9d564e2579e678033debbdff" # v0.10.0.1
8585
hooks:
8686
# Bash linting
8787
- id: shellcheck
8888
types: [shell]
8989

9090
- repo: https://github.com/openstack/bashate
91-
rev: "2.1.1"
91+
rev: "fbd7c2534c2701351c603ff700ddf08202430a31" # 2.1.1
9292
hooks:
9393
# Bash formatting
9494
- id: bashate
9595
types: [shell]
9696
args: ["-i", "E006"] # Ignore E006: Line too long
9797

9898
- repo: https://github.com/errata-ai/vale
99-
rev: "v3.9.1"
99+
rev: "dc4c47923788a413fb5677de6e3370d514aecb78" # v3.11.2
100100
hooks:
101101
# Sync vale styles and lint markdown and reStructuredText
102102
- id: vale
103103
name: vale-sync
104-
language_version: "1.21.6"
104+
language_version: "1.23.2"
105105
pass_filenames: false
106106
args: [sync]
107107
types_or: [markdown, rst]
108108
- id: vale
109-
language_version: "1.21.6"
109+
language_version: "1.23.2"
110110
types_or: [markdown, rst]

cores/esp32/esp32-hal-gpio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ extern int ARDUINO_ISR_ATTR __digitalRead(uint8_t pin) {
185185
#endif // RGB_BUILTIN
186186
// This work when the pin is set as GPIO and in INPUT mode. For all other pin functions, it may return inconsistent response
187187
if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) == NULL) {
188-
log_w("IO %i is not set as GPIO. digitalRead() may return an inconsistent value.");
188+
log_w("IO %i is not set as GPIO. digitalRead() may return an inconsistent value.", pin);
189189
}
190190
return gpio_get_level((gpio_num_t)pin);
191191
}

docs/en/contributing.rst

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ Before Contributing
1515

1616
Before sending us a Pull Request, please consider this:
1717

18+
* All contributions must be written in English to ensure effective communication and support.
19+
Pull Requests written in other languages will be closed, with a request to rewrite them in English.
20+
1821
* Is the contribution entirely your own work, or is it already licensed under an LGPL 2.1 compatible Open Source License?
1922
If not, cannot accept it.
2023

libraries/USB/src/keyboardLayout/KeyboardLayout.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
only in Keyboard.cpp and the keyboard layout files. Layout files map
66
ASCII character codes to keyboard scan codes (technically, to USB HID
77
Usage codes), possibly altered by the SHIFT or ALT_GR modifiers.
8-
Non-ACSII characters (anything outside the 7-bit range NUL..DEL) are
8+
Non-ASCII characters (anything outside the 7-bit range NUL..DEL) are
99
not supported.
1010
1111
== Creating your own layout ==

0 commit comments

Comments
 (0)