Skip to content

Commit c02c8b6

Browse files
authored
Merge branch 'master' into idf-release/v3.2
2 parents b1917b2 + 91e095f commit c02c8b6

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

boards.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,15 @@ tinypico.build.boot=dio
334334
tinypico.build.partitions=default
335335
tinypico.build.defines=
336336

337+
tinypico.menu.PartitionScheme.default=Default
338+
tinypico.menu.PartitionScheme.default.build.partitions=default
339+
tinypico.menu.PartitionScheme.no_ota=No OTA (Large APP)
340+
tinypico.menu.PartitionScheme.no_ota.build.partitions=no_ota
341+
tinypico.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
342+
tinypico.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
343+
tinypico.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
344+
tinypico.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
345+
337346
tinypico.menu.UploadSpeed.921600=921600
338347
tinypico.menu.UploadSpeed.921600.upload.speed=921600
339348
tinypico.menu.UploadSpeed.115200=115200

libraries/WiFiClientSecure/src/ssl_client.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
#include "ssl_client.h"
2020
#include "WiFi.h"
2121

22+
#ifndef MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED
23+
# error "Please configure IDF framework to include mbedTLS -> Enable pre-shared-key ciphersuites and activate at least one cipher"
24+
#endif
2225

2326
const char *pers = "esp32-tls";
2427

0 commit comments

Comments
 (0)