Skip to content

Commit 75b29fd

Browse files
authored
Merge branch 'master' into release/v3.1.x
2 parents fa67115 + 683fea1 commit 75b29fd

File tree

90 files changed

+221
-193
lines changed

Some content is hidden

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

90 files changed

+221
-193
lines changed

.codespellrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
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,acount,totaly,pasttime
4+
ignore-words-list = ba,licence,ot,dout,als,exten
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 =
88
check-hidden =
9-
write-changes =

.pre-commit-config.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
exclude: |
22
(?x)(
33
^\.github\/|
4-
^tests\/performance\/coremark\/.*\.[ch]$
4+
^tests\/performance\/coremark\/.*\.[ch]$|
5+
^tests\/performance\/superpi\/.*\.(cpp|h)$|
6+
LICENSE\.md$
57
)
68
79
default_language_version:
@@ -24,11 +26,10 @@ repos:
2426
- id: trailing-whitespace
2527
args: [--markdown-linebreak-ext=md]
2628
- repo: https://github.com/codespell-project/codespell
27-
rev: "v2.2.4"
29+
rev: "v2.3.0"
2830
hooks:
2931
- id: codespell
3032
exclude: ^.*\.(svd|SVD)$
31-
stages: [manual]
3233
- repo: https://github.com/pre-commit/mirrors-clang-format
3334
rev: "v18.1.3"
3435
hooks:
@@ -64,8 +65,6 @@ repos:
6465
pass_filenames: false
6566
args: [sync]
6667
types_or: [markdown, rst]
67-
stages: [manual]
6868
- id: vale
6969
language_version: "1.21.6"
7070
types_or: [markdown, rst]
71-
stages: [manual]

.vale.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ StylesPath = .vale/styles
2323

2424

2525
# Specify the minimum alert severity that Vale will report.
26-
MinAlertLevel = suggestion # "suggestion", "warning", or "error"
26+
MinAlertLevel = error # "suggestion", "warning", or "error"
2727

2828

2929
# Specify vocabulary for special treatment.

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
We as members, contributors, and leaders pledge to make participation in our
66
community a harassment-free experience for everyone, regardless of age, body
77
size, visible or invisible disability, ethnicity, sex characteristics, gender
8-
identity and expression, level of experience, education, socio-economic status,
8+
identity and expression, level of experience, education, socioeconomic status,
99
nationality, personal appearance, race, religion, or sexual identity
1010
and orientation.
1111

cores/esp32/Arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ void initArduino(void);
179179
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
180180
unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
181181

182-
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
182+
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder); // codespell:ignore shiftin
183183
void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
184184

185185
#ifdef __cplusplus

cores/esp32/HWCDC.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ size_t HWCDC::write(const uint8_t *buffer, size_t size) {
443443
if (connected) {
444444
usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
445445
}
446-
// tracks CDC trasmission progress to avoid hanging if CDC is unplugged while still sending data
446+
// tracks CDC transmission progress to avoid hanging if CDC is unplugged while still sending data
447447
size_t last_toSend = to_send;
448448
uint32_t tries = tx_timeout_ms; // waits 1ms per sending data attempt, in case CDC is unplugged
449449
while (connected && to_send) {
@@ -479,7 +479,7 @@ size_t HWCDC::write(const uint8_t *buffer, size_t size) {
479479
}
480480
}
481481
}
482-
// CDC was diconnected while sending data ==> flush the TX buffer keeping the last data
482+
// CDC was disconnected while sending data ==> flush the TX buffer keeping the last data
483483
if (to_send && !usb_serial_jtag_ll_txfifo_writable()) {
484484
connected = false;
485485
flushTXBuffer(buffer + so_far, to_send);

cores/esp32/HardwareSerial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class HardwareSerial : public Stream {
228228

229229
// onReceive will setup a callback that will be called whenever an UART interruption occurs (UART_INTR_RXFIFO_FULL or UART_INTR_RXFIFO_TOUT)
230230
// UART_INTR_RXFIFO_FULL interrupt triggers at UART_FULL_THRESH_DEFAULT bytes received (defined as 120 bytes by default in IDF)
231-
// UART_INTR_RXFIFO_TOUT interrupt triggers at UART_TOUT_THRESH_DEFAULT symbols passed without any reception (defined as 10 symbos by default in IDF)
231+
// UART_INTR_RXFIFO_TOUT interrupt triggers at UART_TOUT_THRESH_DEFAULT symbols passed without any reception (defined as 10 symbols by default in IDF)
232232
// onlyOnTimeout parameter will define how onReceive will behave:
233233
// Default: true -- The callback will only be called when RX Timeout happens.
234234
// Whole stream of bytes will be ready for being read on the callback function at once.

cores/esp32/esp32-hal-uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct uart_struct_t {
4545
bool has_peek; // flag to indicate that there is a peek byte pending to be read
4646
uint8_t peek_byte; // peek byte that has been read but not consumed
4747
QueueHandle_t uart_event_queue; // export it by some uartGetEventQueue() function
48-
// configuration data:: Arduino API tipical data
48+
// configuration data:: Arduino API typical data
4949
int8_t _rxPin, _txPin, _ctsPin, _rtsPin; // UART GPIOs
5050
uint32_t _baudrate, _config; // UART baudrate and config
5151
// UART ESP32 specific data

cores/esp32/wiring_shift.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "esp32-hal.h"
2121
#include "wiring_private.h"
2222

23-
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder) {
23+
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder) { // codespell:ignore shiftin
2424
uint8_t value = 0;
2525
uint8_t i;
2626

docs/en/api/adc.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ analogReadResolution
5353
^^^^^^^^^^^^^^^^^^^^
5454

5555
This function is used to set the resolution of ``analogRead`` return value. Default is 12 bits (range from 0 to 4095)
56-
for all chips except ESP32S3 where default is 13 bits (range from 0 to 8191).
56+
for all chips except ESP32-S3 where default is 13 bits (range from 0 to 8191).
5757
When different resolution is set, the values read will be shifted to match the given resolution.
5858

5959
Range is 1 - 16 .The default value will be used, if this function is not used.
@@ -146,7 +146,7 @@ analogSetWidth
146146
.. note:: This function is only available for ESP32 chip.
147147

148148
This function is used to set the hardware sample bits and read resolution.
149-
Default is 12bit (0 - 4095).
149+
Default is 12 bits (0 - 4095).
150150
Range is 9 - 12.
151151

152152
.. code-block:: arduino
@@ -250,13 +250,13 @@ This function is used to set the attenuation for ADC continuous peripheral. For
250250
251251
void analogContinuousSetAtten(adc_attenuation_t attenuation);
252252
253-
* ``attenuation`` sets the attenuation (default is 11db).
253+
* ``attenuation`` sets the attenuation (default is 11 dB).
254254

255255
analogContinuousSetWidth
256256
^^^^^^^^^^^^^^^^^^^^^^^^
257257

258258
This function is used to set the hardware resolution bits.
259-
Default value for all chips is 12bit (0 - 4095).
259+
Default value for all chips is 12 bits (0 - 4095).
260260

261261
.. note:: This function will take effect only for ESP32 chip, as it allows to set resolution in range 9-12 bits.
262262

0 commit comments

Comments
 (0)