Skip to content

Commit 35d7687

Browse files
authored
Merge branch 'espressif:master' into master
2 parents 019a212 + 1847723 commit 35d7687

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Diff for: cores/esp32/io_pin_remap.h

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber);
7676

7777
// cores/esp32/esp32-hal-rmt.h
7878
#define rmtInit(pin, channel_direction, memsize, frequency_Hz) rmtInit(digitalPinToGPIONumber(pin), channel_direction, memsize, frequency_Hz)
79+
#define rmtSetEOT(pin, EOT_Level) rmtSetEOT(digitalPinToGPIONumber(pin), EOT_Level)
7980
#define rmtWrite(pin, data, num_rmt_symbols, timeout_ms) rmtWrite(digitalPinToGPIONumber(pin), data, num_rmt_symbols, timeout_ms)
8081
#define rmtWriteAsync(pin, data, num_rmt_symbols) rmtWriteAsync(digitalPinToGPIONumber(pin), data, num_rmt_symbols)
8182
#define rmtWriteLooping(pin, data, num_rmt_symbols) rmtWriteLooping(digitalPinToGPIONumber(pin), data, num_rmt_symbols)

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

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ Removed APIs
9090
New APIs
9191
********
9292

93+
* ``rmtSetEOT``
9394
* ``rmtWriteAsync``
9495
* ``rmtTransmitCompleted``
9596
* ``rmtSetRxMinThreshold``

Diff for: libraries/WebServer/src/Parsing.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,12 @@ bool WebServer::_parseForm(WiFiClient& client, String boundary, uint32_t len){
368368
argType = FPSTR(mimeTable[txt].mimeType);
369369
line = client.readStringUntil('\r');
370370
client.readStringUntil('\n');
371-
if (line.length() > 12 && line.substring(0, 12).equalsIgnoreCase(FPSTR(Content_Type))){
372-
argType = line.substring(line.indexOf(':')+2);
373-
//skip next line
374-
client.readStringUntil('\r');
371+
while (line.length() > 0) {
372+
if (line.length() > 12 && line.substring(0, 12).equalsIgnoreCase(FPSTR(Content_Type))){
373+
argType = line.substring(line.indexOf(':')+2);
374+
}
375+
//skip over any other headers
376+
line = client.readStringUntil('\r');
375377
client.readStringUntil('\n');
376378
}
377379
log_v("PostArg Type: %s", argType.c_str());

0 commit comments

Comments
 (0)