Skip to content

Commit 0e68c00

Browse files
Jason2866Jason2866
authored
Merge branch 'espressif:release/v3.0.x' into release/v3.0.x
2 parents 688d132 + 1436f8d commit 0e68c00

File tree

5 files changed

+51
-48
lines changed

5 files changed

+51
-48
lines changed

‎cores/esp32/esp32-hal-time.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,17 @@ static void setTimeZone(long offset, int daylight) {
5151
void configTime(long gmtOffset_sec, int daylightOffset_sec, const char *server1, const char *server2, const char *server3) {
5252
//tcpip_adapter_init(); // Should not hurt anything if already inited
5353
esp_netif_init();
54-
if (sntp_enabled()) {
55-
sntp_stop();
56-
}
5754

5855
#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
5956
if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) {
6057
LOCK_TCPIP_CORE();
6158
}
6259
#endif
6360

61+
if (sntp_enabled()) {
62+
sntp_stop();
63+
}
64+
6465
sntp_setoperatingmode(SNTP_OPMODE_POLL);
6566
sntp_setservername(0, (char *)server1);
6667
sntp_setservername(1, (char *)server2);
@@ -83,16 +84,17 @@ void configTime(long gmtOffset_sec, int daylightOffset_sec, const char *server1,
8384
void configTzTime(const char *tz, const char *server1, const char *server2, const char *server3) {
8485
//tcpip_adapter_init(); // Should not hurt anything if already inited
8586
esp_netif_init();
86-
if (sntp_enabled()) {
87-
sntp_stop();
88-
}
8987

9088
#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
9189
if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) {
9290
LOCK_TCPIP_CORE();
9391
}
9492
#endif
9593

94+
if (sntp_enabled()) {
95+
sntp_stop();
96+
}
97+
9698
sntp_setoperatingmode(SNTP_OPMODE_POLL);
9799
sntp_setservername(0, (char *)server1);
98100
sntp_setservername(1, (char *)server2);

‎libraries/ESP32/examples/Timer/RepeatTimer/RepeatTimer.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void setup() {
3333
Serial.begin(115200);
3434

3535
// Set BTN_STOP_ALARM to input mode
36-
pinMode(BTN_STOP_ALARM, INPUT);
36+
pinMode(BTN_STOP_ALARM, INPUT_PULLUP);
3737

3838
// Create semaphore to inform us when the timer has fired
3939
timerSemaphore = xSemaphoreCreateBinary();

‎libraries/Network/src/NetworkClient.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ class ESPLwIPClient : public Client {
3535

3636
class NetworkClient : public ESPLwIPClient {
3737
protected:
38-
std::shared_ptr<NetworkClientSocketHandle> clientSocketHandle;
39-
std::shared_ptr<NetworkClientRxBuffer> _rxBuffer;
40-
bool _connected;
41-
bool _sse;
38+
std::shared_ptr<NetworkClientSocketHandle> clientSocketHandle = nullptr;
39+
std::shared_ptr<NetworkClientRxBuffer> _rxBuffer = nullptr;
40+
bool _connected = false;
41+
bool _sse = false;
4242
int _timeout;
43-
int _lastWriteTimeout;
44-
int _lastReadTimeout;
43+
int _lastWriteTimeout = 0;
44+
int _lastReadTimeout = 0;
4545

4646
public:
4747
NetworkClient *next;

‎libraries/WebServer/src/Parsing.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ bool WebServer::_parseRequest(NetworkClient &client) {
187187
_currentRaw->status = RAW_WRITE;
188188

189189
while (_currentRaw->totalSize < _clientContentLength) {
190-
_currentRaw->currentSize = client.readBytes(_currentRaw->buf, HTTP_RAW_BUFLEN);
190+
size_t read_len = std::min(_clientContentLength - _currentRaw->totalSize, (size_t)HTTP_RAW_BUFLEN);
191+
_currentRaw->currentSize = client.readBytes(_currentRaw->buf, read_len);
191192
_currentRaw->totalSize += _currentRaw->currentSize;
192193
if (_currentRaw->currentSize == 0) {
193194
_currentRaw->status = RAW_ABORTED;

‎package/package_esp32_index.template.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{
4343
"packager": "esp32",
4444
"name": "esp32-arduino-libs",
45-
"version": "idf-release_v5.1-9439479f"
45+
"version": "idf-release_v5.1-77a3025a-v3"
4646
},
4747
{
4848
"packager": "esp32",
@@ -105,63 +105,63 @@
105105
"tools": [
106106
{
107107
"name": "esp32-arduino-libs",
108-
"version": "idf-release_v5.1-9439479f",
108+
"version": "idf-release_v5.1-77a3025a-v3",
109109
"systems": [
110110
{
111111
"host": "i686-mingw32",
112-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
113-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
114-
"checksum": "SHA-256:f9db39bdd827ff449691ac8913b3f459ee3e73353db853547b9ccc3906335a64",
115-
"size": "305294843"
112+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
113+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
114+
"checksum": "SHA-256:b8f8e4026846c8a12bde236e6080b9624b7e348b249fc417bfe043129121d101",
115+
"size": "306759798"
116116
},
117117
{
118118
"host": "x86_64-mingw32",
119-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
120-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
121-
"checksum": "SHA-256:f9db39bdd827ff449691ac8913b3f459ee3e73353db853547b9ccc3906335a64",
122-
"size": "305294843"
119+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
120+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
121+
"checksum": "SHA-256:b8f8e4026846c8a12bde236e6080b9624b7e348b249fc417bfe043129121d101",
122+
"size": "306759798"
123123
},
124124
{
125125
"host": "arm64-apple-darwin",
126-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
127-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
128-
"checksum": "SHA-256:f9db39bdd827ff449691ac8913b3f459ee3e73353db853547b9ccc3906335a64",
129-
"size": "305294843"
126+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
127+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
128+
"checksum": "SHA-256:b8f8e4026846c8a12bde236e6080b9624b7e348b249fc417bfe043129121d101",
129+
"size": "306759798"
130130
},
131131
{
132132
"host": "x86_64-apple-darwin",
133-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
134-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
135-
"checksum": "SHA-256:f9db39bdd827ff449691ac8913b3f459ee3e73353db853547b9ccc3906335a64",
136-
"size": "305294843"
133+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
134+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
135+
"checksum": "SHA-256:b8f8e4026846c8a12bde236e6080b9624b7e348b249fc417bfe043129121d101",
136+
"size": "306759798"
137137
},
138138
{
139139
"host": "x86_64-pc-linux-gnu",
140-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
141-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
142-
"checksum": "SHA-256:f9db39bdd827ff449691ac8913b3f459ee3e73353db853547b9ccc3906335a64",
143-
"size": "305294843"
140+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
141+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
142+
"checksum": "SHA-256:b8f8e4026846c8a12bde236e6080b9624b7e348b249fc417bfe043129121d101",
143+
"size": "306759798"
144144
},
145145
{
146146
"host": "i686-pc-linux-gnu",
147-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
148-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
149-
"checksum": "SHA-256:f9db39bdd827ff449691ac8913b3f459ee3e73353db853547b9ccc3906335a64",
150-
"size": "305294843"
147+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
148+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
149+
"checksum": "SHA-256:b8f8e4026846c8a12bde236e6080b9624b7e348b249fc417bfe043129121d101",
150+
"size": "306759798"
151151
},
152152
{
153153
"host": "aarch64-linux-gnu",
154-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
155-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
156-
"checksum": "SHA-256:f9db39bdd827ff449691ac8913b3f459ee3e73353db853547b9ccc3906335a64",
157-
"size": "305294843"
154+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
155+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
156+
"checksum": "SHA-256:b8f8e4026846c8a12bde236e6080b9624b7e348b249fc417bfe043129121d101",
157+
"size": "306759798"
158158
},
159159
{
160160
"host": "arm-linux-gnueabihf",
161-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
162-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-9439479f.zip",
163-
"checksum": "SHA-256:f9db39bdd827ff449691ac8913b3f459ee3e73353db853547b9ccc3906335a64",
164-
"size": "305294843"
161+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
162+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-77a3025a-v3.zip",
163+
"checksum": "SHA-256:b8f8e4026846c8a12bde236e6080b9624b7e348b249fc417bfe043129121d101",
164+
"size": "306759798"
165165
}
166166
]
167167
},

0 commit comments

Comments
 (0)