Skip to content

Commit b778fad

Browse files
LeeLeahy2LeeLeahy2
authored
Merge branch 'master' into fix-issue-10318
2 parents 3c94d73 + 4e9eb35 commit b778fad

File tree

31 files changed

+438
-150
lines changed

31 files changed

+438
-150
lines changed

Diff for: ‎.pre-commit-config.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ repos:
2525
args: [--fix=lf]
2626
- id: trailing-whitespace
2727
args: [--markdown-linebreak-ext=md]
28+
- id: pretty-format-json
29+
args: [--autofix]
30+
types_or: [json]
31+
exclude: |
32+
(?x)(
33+
diagram\..*\.json$|
34+
package\.json$|
35+
^package\/.*$
36+
)
2837
- repo: https://github.com/codespell-project/codespell
2938
rev: "v2.3.0"
3039
hooks:

Diff for: ‎cores/esp32/esp32-hal-i2c.c

+12-4
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ bool i2cIsInit(uint8_t i2c_num) {
7171
}
7272

7373
esp_err_t i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t frequency) {
74+
esp_err_t ret = ESP_OK;
7475
if (i2c_num >= SOC_I2C_NUM) {
7576
return ESP_ERR_INVALID_ARG;
7677
}
@@ -90,7 +91,8 @@ esp_err_t i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t frequency) {
9091
#endif
9192
if (bus[i2c_num].initialized) {
9293
log_e("bus is already initialized");
93-
return ESP_FAIL;
94+
ret = ESP_FAIL;
95+
goto init_fail;
9496
}
9597

9698
if (!frequency) {
@@ -103,7 +105,8 @@ esp_err_t i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t frequency) {
103105
perimanSetBusDeinit(ESP32_BUS_TYPE_I2C_MASTER_SCL, i2cDetachBus);
104106

105107
if (!perimanClearPinBus(sda) || !perimanClearPinBus(scl)) {
106-
return false;
108+
ret = ESP_FAIL;
109+
goto init_fail;
107110
}
108111

109112
log_i("Initializing I2C Master: sda=%d scl=%d freq=%d", sda, scl, frequency);
@@ -117,7 +120,7 @@ esp_err_t i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t frequency) {
117120
conf.master.clk_speed = frequency;
118121
conf.clk_flags = I2C_SCLK_SRC_FLAG_FOR_NOMAL; //Any one clock source that is available for the specified frequency may be chosen
119122

120-
esp_err_t ret = i2c_param_config((i2c_port_t)i2c_num, &conf);
123+
ret = i2c_param_config((i2c_port_t)i2c_num, &conf);
121124
if (ret != ESP_OK) {
122125
log_e("i2c_param_config failed");
123126
} else {
@@ -133,11 +136,16 @@ esp_err_t i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t frequency) {
133136
i2c_set_timeout((i2c_port_t)i2c_num, I2C_LL_MAX_TIMEOUT);
134137
if (!perimanSetPinBus(sda, ESP32_BUS_TYPE_I2C_MASTER_SDA, (void *)(i2c_num + 1), i2c_num, -1)
135138
|| !perimanSetPinBus(scl, ESP32_BUS_TYPE_I2C_MASTER_SCL, (void *)(i2c_num + 1), i2c_num, -1)) {
139+
#if !CONFIG_DISABLE_HAL_LOCKS
140+
//release lock so that i2cDetachBus can execute i2cDeinit
141+
xSemaphoreGive(bus[i2c_num].lock);
142+
#endif
136143
i2cDetachBus((void *)(i2c_num + 1));
137-
return false;
144+
return ESP_FAIL;
138145
}
139146
}
140147
}
148+
init_fail:
141149
#if !CONFIG_DISABLE_HAL_LOCKS
142150
//release lock
143151
xSemaphoreGive(bus[i2c_num].lock);

Diff for: ‎docs/en/contributing.rst

+288-22
Large diffs are not rendered by default.

Diff for: ‎docs/en/guides/docs_contributing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ If everything is ok, you will see some output logs similar to this one:
104104
dumping object inventory... done
105105
build succeeded.
106106
107-
The HTML pages are in `_build/en/generic/html`.
107+
The HTML pages are in ``_build/en/generic/html``.
108108

109109
Sections
110110
--------

Diff for: ‎libraries/ESP32/examples/FreeRTOS/BasicMultiThreading/BasicMultiThreading.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// Please read file README.md in the folder containing this example.
88

99
#if CONFIG_FREERTOS_UNICORE
10-
#define ARDUINO_RUNNING_CORE 0
10+
#define TASK_RUNNING_CORE 0
1111
#else
12-
#define ARDUINO_RUNNING_CORE 1
12+
#define TASK_RUNNING_CORE 1
1313
#endif
1414

1515
#define ANALOG_INPUT_PIN A0
@@ -51,7 +51,7 @@ void setup() {
5151
,
5252
&analog_read_task_handle // With task handle we will be able to manipulate with this task.
5353
,
54-
ARDUINO_RUNNING_CORE // Core on which the task will run
54+
TASK_RUNNING_CORE // Core on which the task will run
5555
);
5656

5757
Serial.printf("Basic Multi Threading Arduino Example\n");

Diff for: ‎libraries/ESP32/examples/HWCDC_Events/ci.json

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{
2+
"fqbn": {
3+
"esp32s3": [
4+
"espressif:esp32:esp32s3:USBMode=hwcdc,PartitionScheme=huge_app,FlashMode=dio"
5+
]
6+
},
27
"targets": {
38
"esp32": false,
49
"esp32s2": false

Diff for: ‎libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#ifndef ESP32_ARDUINO_NO_RGB_BUILTIN
1111

1212
// add the file "build_opt.h" to your Arduino project folder with "-DESP32_ARDUINO_NO_RGB_BUILTIN" to use the RMT Legacy driver
13-
#error "ESP32_ARDUINO_NO_RGB_BUILTIN is not defined, this example is intended to demonstrate the RMT Legacy driver.
13+
#error "ESP32_ARDUINO_NO_RGB_BUILTIN is not defined, this example is intended to demonstrate the RMT Legacy driver."
1414
#error "Please add the file 'build_opt.h' with '-DESP32_ARDUINO_NO_RGB_BUILTIN' to your Arduino project folder."
1515
#error "Another way to disable the RGB_BUILTIN is to define it in the platformio.ini file, for instance: '-D ESP32_ARDUINO_NO_RGB_BUILTIN'"
1616

Diff for: ‎libraries/ESP_SR/examples/Basic/ci.json

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{
2+
"fqbn": {
3+
"esp32s3": [
4+
"espressif:esp32:esp32s3:USBMode=default,PartitionScheme=esp_sr_16,FlashSize=16M,FlashMode=dio"
5+
]
6+
},
27
"targets": {
38
"esp32": false,
49
"esp32c3": false,

Diff for: ‎libraries/Insights/examples/DiagnosticsSmokeTest/DiagnosticsSmokeTest.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static void smoke_test() {
3636
Insights.event(TAG, "[count][%d]", count);
3737
} else {
3838
log_e("[count][%d] [crash_count][%" PRIu32 "] [excvaddr][0x0f] Crashing...", count, s_reset_count);
39-
*(int *)0x0F = 0x10;
39+
abort();
4040
}
4141
}
4242

Diff for: ‎libraries/OpenThread/examples/COAP/coap_lamp/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}

Diff for: ‎libraries/OpenThread/examples/COAP/coap_switch/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}

Diff for: ‎libraries/OpenThread/examples/SimpleCLI/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}

Diff for: ‎libraries/OpenThread/examples/SimpleNode/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}

Diff for: ‎libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}

Diff for: ‎libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}

Diff for: ‎libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}

Diff for: ‎libraries/OpenThread/examples/ThreadScan/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}

Diff for: ‎libraries/OpenThread/examples/onReceive/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}

Diff for: ‎libraries/SD_MMC/examples/SD2USBMSC/ci.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"targets": {
33
"esp32": false,
4-
"esp32s2": false,
54
"esp32c3": false,
65
"esp32c6": false,
7-
"esp32h2": false
6+
"esp32h2": false,
7+
"esp32s2": false
88
}
99
}

Diff for: ‎libraries/USB/examples/MIDI/MidiInterface/MidiInterface.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void loop() {
5050
}
5151

5252
// USB MIDI 1.0 to MIDI Serial 1.0
53-
midiEventPacket_t midi_packet_in = {0};
53+
midiEventPacket_t midi_packet_in = {0, 0, 0, 0};
5454
// See Chapter 4: USB-MIDI Event Packets (page 16) of the spec.
5555
int8_t cin_to_midix_size[16] = {-1, -1, 2, 3, 3, 1, 2, 3, 3, 3, 3, 3, 2, 2, 3, 1};
5656

Diff for: ‎libraries/USB/examples/MIDI/ReceiveMidi/ReceiveMidi.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void setup() {
2828
}
2929

3030
void loop() {
31-
midiEventPacket_t midi_packet_in = {0};
31+
midiEventPacket_t midi_packet_in = {0, 0, 0, 0};
3232

3333
if (MIDI.readPacket(&midi_packet_in)) {
3434
printDetails(midi_packet_in);

Diff for: ‎libraries/Update/examples/AWS_S3_OTA_Update/AWS_S3_OTA_Update.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,11 @@ void execOTA() {
178178
// Understand the partitions and
179179
// space availability
180180
Serial.println("Not enough space to begin OTA");
181-
client.flush();
181+
client.clear();
182182
}
183183
} else {
184184
Serial.println("There was no content in the response");
185-
client.flush();
185+
client.clear();
186186
}
187187
}
188188

Diff for: ‎libraries/WebServer/examples/HttpAuthCallbackInline/HttpAuthCallbackInline.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const char *password = "........";
99
WebServer server(80);
1010

1111
typedef struct credentials_t {
12-
char *username;
13-
char *password;
12+
const char *username;
13+
const char *password;
1414
} credentials_t;
1515

1616
credentials_t passwdfile[] = {{"admin", "esp32"}, {"fred", "41234123"}, {"charlie", "sdfsd"}, {"alice", "vambdnkuhj"}, {"bob", "svcdbjhws12"}, {NULL, NULL}};

Diff for: ‎libraries/WiFi/src/WiFiScan.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,11 @@ void WiFiScanClass::_scanDone() {
119119
esp_wifi_scan_get_ap_num(&(WiFiScanClass::_scanCount));
120120
if (WiFiScanClass::_scanCount) {
121121
WiFiScanClass::_scanResult = new wifi_ap_record_t[WiFiScanClass::_scanCount];
122-
if (!WiFiScanClass::_scanResult || esp_wifi_scan_get_ap_records(&(WiFiScanClass::_scanCount), (wifi_ap_record_t *)_scanResult) != ESP_OK) {
122+
if (!WiFiScanClass::_scanResult) {
123+
WiFiScanClass::_scanCount = 0;
124+
} else if (esp_wifi_scan_get_ap_records(&(WiFiScanClass::_scanCount), (wifi_ap_record_t *)_scanResult) != ESP_OK) {
125+
delete[] reinterpret_cast<wifi_ap_record_t *>(WiFiScanClass::_scanResult);
126+
WiFiScanClass::_scanResult = 0;
123127
WiFiScanClass::_scanCount = 0;
124128
}
125129
}

Diff for: ‎tests/performance/psramspeed/ci.json

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"qemu": false,
44
"wokwi": false
55
},
6-
76
"targets": {
87
"esp32c3": false,
98
"esp32c6": false,

Diff for: ‎tests/performance/ramspeed/ci.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
{
2-
"platform": {
3-
"qemu": false,
4-
"wokwi": false
5-
},
6-
72
"fqbn": {
83
"esp32": [
94
"espressif:esp32:esp32:PSRAM=disabled,PartitionScheme=huge_app"
@@ -14,5 +9,9 @@
149
"esp32s3": [
1510
"espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app"
1611
]
12+
},
13+
"platform": {
14+
"qemu": false,
15+
"wokwi": false
1716
}
1817
}

0 commit comments

Comments
 (0)