diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 5eb06c3..b4e1667 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,3 +1,3 @@ -idf_component_register(SRCS "main.c" "font.c" "display.c" "text.c" "wlan.c" "https.c" +idf_component_register(SRCS "main.c" "font.c" "display.c" "text.c" "wlan.c" "https.c" "cJSON/cJSON.c" REQUIRES esp_driver_gpio esp_wifi nvs_flash esp_timer esp-tls INCLUDE_DIRS "") diff --git a/main/cJSON b/main/cJSON new file mode 160000 index 0000000..cb8693b --- /dev/null +++ b/main/cJSON @@ -0,0 +1 @@ +Subproject commit cb8693b058ba302f4829ec6d03f609ac6f848546 diff --git a/main/https.c b/main/https.c index 0cd81c1..c3eba6a 100644 --- a/main/https.c +++ b/main/https.c @@ -1,5 +1,8 @@ #include "esp_tls.h" #include "esp_log.h" +#include +#include +#include #include #include "freertos/FreeRTOS.h" @@ -7,27 +10,36 @@ static const char *TAG = "https"; -#define WEB_SERVER "bsvg.efa.de" +//#define WEB_SERVER "bsvg.efa.de" +//#define WEB_PORT "443" +//#define WEB_URL "/bsvagstd/XML_DM_REQUEST?outputFormat=JSON&stateless=1&locationServerActive=1&type_dm=stop&name_dm=\"Freiastr,Braunschweig\"&mode=direct&ptOptionsActive=1&useRealtime=0" +#define WEB_SERVER "mustbehax.de" #define WEB_PORT "443" -#define WEB_URL "/bsvagstd/XML_DM_REQUEST?outputFormat=JSON&stateless=1&locationServerActive=1&type_dm=stop&name_dm=\"Freiastr,Braunschweig\"&mode=direct&ptOptionsActive=1&useRealtime=1" +#define WEB_URL "/web/reduced.json" -static const char HOWSMYSSL_REQUEST[] = "GET " WEB_URL " HTTP/1.1\r\n" +static const char REQUEST[] = "GET " WEB_URL " HTTP/1.1\r\n" "Host: "WEB_SERVER"\r\n" "User-Agent: esp-idf/1.0 esp32\r\n" "\r\n"; -static void https_get_request(esp_tls_cfg_t cfg, const char *WEB_SERVER_URL, const char *REQUEST) +esp_err_t https_get_request_using_crt_bundle(char* buf, size_t bufsize) { - char buf[47000]; + memset(buf, 0, bufsize); + ESP_LOGI(TAG, "https_request using crt bundle"); + esp_tls_cfg_t cfg = { + .crt_bundle_attach = esp_crt_bundle_attach, + }; + //https_get_request(cfg, "https://"WEB_SERVER""WEB_URL, HOWSMYSSL_REQUEST); + //char buf[47000]; int ret, len; esp_tls_t *tls = esp_tls_init(); if (!tls) { ESP_LOGE(TAG, "Failed to allocate esp_tls handle!"); - goto exit; + return -1; } - if (esp_tls_conn_http_new_sync(WEB_SERVER_URL, &cfg, tls) == 1) { + if (esp_tls_conn_http_new_sync("https://"WEB_SERVER""WEB_URL, &cfg, tls) == 1) { ESP_LOGI(TAG, "Connection established..."); } else { ESP_LOGE(TAG, "Connection failed..."); @@ -39,7 +51,8 @@ static void https_get_request(esp_tls_cfg_t cfg, const char *WEB_SERVER_URL, con if (ret == ESP_OK) { ESP_LOGE(TAG, "TLS error = -0x%x, TLS flags = -0x%x", esp_tls_code, esp_tls_flags); } - goto cleanup; + esp_tls_conn_destroy(tls); + return -2; } #ifdef CONFIG_EXAMPLE_CLIENT_SESSION_TICKETS @@ -60,15 +73,20 @@ static void https_get_request(esp_tls_cfg_t cfg, const char *WEB_SERVER_URL, con written_bytes += ret; } else if (ret != ESP_TLS_ERR_SSL_WANT_READ && ret != ESP_TLS_ERR_SSL_WANT_WRITE) { ESP_LOGE(TAG, "esp_tls_conn_write returned: [0x%02X](%s)", ret, esp_err_to_name(ret)); - goto cleanup; + esp_tls_conn_destroy(tls); + return -3; } } while (written_bytes < strlen(REQUEST)); + uint32_t write_offset = 0; + memset(buf, 0x00, bufsize); ESP_LOGI(TAG, "Reading HTTP response..."); do { - len = sizeof(buf) - 1; - memset(buf, 0x00, sizeof(buf)); - ret = esp_tls_conn_read(tls, (char *)buf, len); + len = bufsize - write_offset - 1; + if(len > 6000) + len = 6000; + + ret = esp_tls_conn_read(tls, &buf[write_offset], len); if (ret == ESP_TLS_ERR_SSL_WANT_WRITE || ret == ESP_TLS_ERR_SSL_WANT_READ) { continue; @@ -79,30 +97,27 @@ static void https_get_request(esp_tls_cfg_t cfg, const char *WEB_SERVER_URL, con ESP_LOGI(TAG, "connection closed"); break; } - + write_offset += ret; len = ret; - ESP_LOGD(TAG, "%d bytes read", len); - /* Print response directly to stdout as it is read */ - for (int i = 0; i < len; i++) { - putchar(buf[i]); - } - putchar('\n'); // JSON output doesn't have a newline at end + ESP_LOGI(TAG, "%d bytes read", len); + + if(!strstr(buf, "departureList")){ + ESP_LOGI(TAG,"tossing ... strstr: %ld", (uint32_t)strstr(buf, "departureList")); + write_offset=0; + }else + ESP_LOGI(TAG,"keeping ... strstr: %ld", (uint32_t)strstr(buf, "departureList")); + } while (1); -cleanup: esp_tls_conn_destroy(tls); -exit: - for (int countdown = 10; countdown >= 0; countdown--) { - ESP_LOGI(TAG, "%d...", countdown); - vTaskDelay(1000 / portTICK_PERIOD_MS); - } -} + return 0; + + ///* Print response directly to stdout as it is read */ + //for (int i = 0; i < sizeof(buf); i++) { + // putchar(buf[i]); + // if(i%100 == 0) + // vTaskDelay(1); + //} + //putchar('\n'); // JSON output doesn't have a newline at end -void https_get_request_using_crt_bundle(void) -{ - ESP_LOGI(TAG, "https_request using crt bundle"); - esp_tls_cfg_t cfg = { - .crt_bundle_attach = esp_crt_bundle_attach, - }; - https_get_request(cfg, "https://"WEB_SERVER""WEB_URL, HOWSMYSSL_REQUEST); } diff --git a/main/https.h b/main/https.h index 0fe1a4c..8da4568 100644 --- a/main/https.h +++ b/main/https.h @@ -1 +1,4 @@ -void https_get_request_using_crt_bundle(void); +#include +#include "esp_err.h" + +esp_err_t https_get_request_using_crt_bundle(char* buf, size_t bufsize); diff --git a/main/main.c b/main/main.c index b833b53..4324810 100644 --- a/main/main.c +++ b/main/main.c @@ -6,7 +6,9 @@ software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ +#include #include +#include #include #include "sdkconfig.h" #include "freertos/FreeRTOS.h" @@ -20,6 +22,9 @@ #include "wlan.h" #include "https.h" +#include "cJSON/cJSON.h" +#include "esp_heap_caps.h" + #ifdef CONFIG_IDF_TARGET_ESP32 #define CHIP_NAME "ESP32" #endif @@ -28,37 +33,117 @@ #define CHIP_NAME "ESP32-S2 Beta" #endif + const esp_timer_create_args_t periodic_timer_args = { .callback = &display_cycle, }; +uint8_t buf_ok = 0; +char bsvg_buf[33000]; +static void https_request_task(void *pvparameters){ + while(https_get_request_using_crt_bundle(bsvg_buf, sizeof(bsvg_buf)) != 0){ + ESP_LOGE("bsvg", "Failed to get data from server. Retrying..."); + vTaskDelay(1); + } + buf_ok = 1; + vTaskDelete(NULL); +} + +uint8_t json_ok = 0; +cJSON *departureList; +static void json_parse_task(void *pvparameters){ + //uint16_t start_ptr = 0; + //while(buf[start_ptr] != '{' && start_ptr < sizeof(buf)) + // start_ptr++; + char *start = strstr(bsvg_buf, "\"departureList\"") + 17; + ESP_LOGI("bsvg", "start at %ld: \"%.10s\"", (uint32_t)start, start); + departureList = cJSON_Parse(start); + printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) ); + + json_ok = 1; + vTaskDelete(NULL); +} + void app_main(void) { printf("Hello world!\n"); + printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) ); + ESP_LOGI("bsvg", "display init"); display_init(); + printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) ); esp_timer_handle_t periodic_timer; ESP_ERROR_CHECK(esp_timer_create(&periodic_timer_args, &periodic_timer)); ESP_ERROR_CHECK(esp_timer_start_periodic(periodic_timer, 500)); - put_line(fb, 1, "MauMau", 1, 1); + put_line(fb, 1, "Moin", 1, 1); wlan_init(); put_line(fb, 2, "wifi", 1, 1); - ////xTaskCreate(&http_get_task, "http_get_task", 4096, NULL, 5, NULL); - //char buf[RCV_BUFSIZE]; - //bzero(buf, RCV_BUFSIZE); - //http_request(buf); - //for(uint32_t i=0; itype); + ESP_LOGI("bsvg", "child: %ld", (uint32_t)departureList->child); + if(cJSON_IsArray(departureList)){ + ESP_LOGI("bsvg", "is Array"); + const cJSON *departure = NULL; + cJSON_ArrayForEach(departure, departureList){ + cJSON *number = cJSON_GetObjectItemCaseSensitive(cJSON_GetObjectItemCaseSensitive(departure, "servingLine"), "number");; + if(number == NULL) + ESP_LOGI("bsvg", "cant get number"); + else if(cJSON_IsNumber(number)) + ESP_LOGI("bsvg", "number (int): %d\n", number->valueint); + else if(cJSON_IsString(number)) + ESP_LOGI("bsvg", "number (str): %.3s\n", number->valuestring); + else + ESP_LOGI("bsvg", "cant get number value"); + } + } + } + for (;;) { vTaskDelay(1); diff --git a/sdkconfig b/sdkconfig index 588fad3..49ec186 100644 --- a/sdkconfig +++ b/sdkconfig @@ -929,20 +929,20 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # CONFIG_ESP_WIFI_ENABLED=y CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10 -CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32 +CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=4 # CONFIG_ESP_WIFI_STATIC_TX_BUFFER is not set CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1 -CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32 +CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=4 CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y # CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0 -CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5 +CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=1 # CONFIG_ESP_WIFI_CSI_ENABLED is not set CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y -CONFIG_ESP_WIFI_TX_BA_WIN=6 +CONFIG_ESP_WIFI_TX_BA_WIN=4 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y -CONFIG_ESP_WIFI_RX_BA_WIN=6 +CONFIG_ESP_WIFI_RX_BA_WIN=4 CONFIG_ESP_WIFI_NVS_ENABLED=y # CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0 is not set CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y @@ -951,9 +951,7 @@ CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32 CONFIG_ESP_WIFI_IRAM_OPT=y # CONFIG_ESP_WIFI_EXTRA_IRAM_OPT is not set CONFIG_ESP_WIFI_RX_IRAM_OPT=y -CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y -CONFIG_ESP_WIFI_ENABLE_SAE_PK=y -CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y +# CONFIG_ESP_WIFI_ENABLE_WPA3_SAE is not set CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y @@ -980,7 +978,7 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y # CONFIG_ESP_WIFI_DEBUG_PRINT is not set # CONFIG_ESP_WIFI_TESTING_OPTIONS is not set -CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y +# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set # end of Wi-Fi # @@ -1691,7 +1689,7 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y # end of Wi-Fi Provisioning Manager # end of Component config -# CONFIG_IDF_EXPERIMENTAL_FEATURES is not set +CONFIG_IDF_EXPERIMENTAL_FEATURES=y # Deprecated options for backward compatibility # CONFIG_APP_BUILD_TYPE_ELF_RAM is not set @@ -1818,18 +1816,18 @@ CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_TIMER_TASK_STACK_SIZE=3584 CONFIG_ESP32_WIFI_ENABLED=y CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32 +CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=4 # CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 -CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32 +CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=4 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y -CONFIG_ESP32_WIFI_TX_BA_WIN=6 +CONFIG_ESP32_WIFI_TX_BA_WIN=4 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y -CONFIG_ESP32_WIFI_RX_BA_WIN=6 -CONFIG_ESP32_WIFI_RX_BA_WIN=6 +CONFIG_ESP32_WIFI_RX_BA_WIN=4 +CONFIG_ESP32_WIFI_RX_BA_WIN=4 CONFIG_ESP32_WIFI_NVS_ENABLED=y # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 is not set CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=y @@ -1837,7 +1835,7 @@ CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 CONFIG_ESP32_WIFI_IRAM_OPT=y CONFIG_ESP32_WIFI_RX_IRAM_OPT=y -CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y +# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y CONFIG_WPA_MBEDTLS_CRYPTO=y CONFIG_WPA_MBEDTLS_TLS_CLIENT=y diff --git a/sdkconfig.old b/sdkconfig.old index 0c90fbc..1a38cde 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -615,7 +615,7 @@ CONFIG_ETH_DMA_RX_BUFFER_NUM=10 CONFIG_ETH_DMA_TX_BUFFER_NUM=10 # CONFIG_ETH_IRAM_OPTIMIZATION is not set CONFIG_ETH_USE_SPI_ETHERNET=y -CONFIG_ETH_SPI_ETHERNET_DM9051=y +# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set # CONFIG_ETH_SPI_ETHERNET_W5500 is not set # CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL is not set # CONFIG_ETH_USE_OPENETH is not set @@ -789,7 +789,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 -CONFIG_ESP_PHY_REDUCE_TX_POWER=y +# CONFIG_ESP_PHY_REDUCE_TX_POWER is not set CONFIG_ESP_PHY_RF_CAL_PARTIAL=y # CONFIG_ESP_PHY_RF_CAL_NONE is not set # CONFIG_ESP_PHY_RF_CAL_FULL is not set @@ -854,7 +854,7 @@ CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584 +CONFIG_ESP_MAIN_TASK_STACK_SIZE=50000 CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y # CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set @@ -866,11 +866,17 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y CONFIG_ESP_CONSOLE_UART=y CONFIG_ESP_CONSOLE_UART_NUM=0 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 -# CONFIG_ESP_INT_WDT is not set +CONFIG_ESP_INT_WDT=y +CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 +CONFIG_ESP_INT_WDT_CHECK_CPU1=y CONFIG_ESP_TASK_WDT_EN=y -# CONFIG_ESP_TASK_WDT_INIT is not set +CONFIG_ESP_TASK_WDT_INIT=y +# CONFIG_ESP_TASK_WDT_PANIC is not set +CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 +CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y +CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y # CONFIG_ESP_PANIC_HANDLER_IRAM is not set -CONFIG_ESP_DEBUG_STUBS_ENABLE=y +# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set CONFIG_ESP_DEBUG_OCDAWARE=y # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y @@ -923,31 +929,29 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # CONFIG_ESP_WIFI_ENABLED=y CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10 -CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32 +CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=4 # CONFIG_ESP_WIFI_STATIC_TX_BUFFER is not set CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1 -CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32 +CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=4 CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y # CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0 -CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5 +CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=1 # CONFIG_ESP_WIFI_CSI_ENABLED is not set CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y CONFIG_ESP_WIFI_TX_BA_WIN=6 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP_WIFI_RX_BA_WIN=6 CONFIG_ESP_WIFI_NVS_ENABLED=y -CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y -# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1 is not set +# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0 is not set +CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN=752 CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32 CONFIG_ESP_WIFI_IRAM_OPT=y # CONFIG_ESP_WIFI_EXTRA_IRAM_OPT is not set CONFIG_ESP_WIFI_RX_IRAM_OPT=y -CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y -CONFIG_ESP_WIFI_ENABLE_SAE_PK=y -CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y +# CONFIG_ESP_WIFI_ENABLE_WPA3_SAE is not set CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y @@ -974,7 +978,7 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y # CONFIG_ESP_WIFI_DEBUG_PRINT is not set # CONFIG_ESP_WIFI_TESTING_OPTIONS is not set -CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y +# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set # end of Wi-Fi # @@ -1208,13 +1212,13 @@ CONFIG_LWIP_MAX_ACTIVE_TCP=16 CONFIG_LWIP_MAX_LISTENING_TCP=16 CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y CONFIG_LWIP_TCP_MAXRTX=12 -CONFIG_LWIP_TCP_SYNMAXRTX=6 +CONFIG_LWIP_TCP_SYNMAXRTX=12 CONFIG_LWIP_TCP_MSS=1440 CONFIG_LWIP_TCP_TMR_INTERVAL=250 CONFIG_LWIP_TCP_MSL=60000 CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000 -CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744 -CONFIG_LWIP_TCP_WND_DEFAULT=5744 +CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5760 +CONFIG_LWIP_TCP_WND_DEFAULT=5760 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6 @@ -1311,6 +1315,7 @@ CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096 +# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set # CONFIG_MBEDTLS_DEBUG is not set # @@ -1322,13 +1327,6 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096 # CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y CONFIG_MBEDTLS_PKCS7_C=y - -# -# DTLS-based configurations -# -# CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID is not set -# CONFIG_MBEDTLS_SSL_DTLS_SRTP is not set -# end of DTLS-based configurations # end of mbedTLS v3.x related # @@ -1367,10 +1365,7 @@ CONFIG_MBEDTLS_TLS_ENABLED=y # # TLS Key Exchange Methods # -CONFIG_MBEDTLS_PSK_MODES=y -CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK=y -CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK=y +# CONFIG_MBEDTLS_PSK_MODES is not set CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y @@ -1382,7 +1377,7 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y CONFIG_MBEDTLS_SSL_RENEGOTIATION=y CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y # CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set -CONFIG_MBEDTLS_SSL_PROTO_DTLS=y +# CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set CONFIG_MBEDTLS_SSL_ALPN=y CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y @@ -1694,4 +1689,4 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y # end of Wi-Fi Provisioning Manager # end of Component config -# CONFIG_IDF_EXPERIMENTAL_FEATURES is not set +CONFIG_IDF_EXPERIMENTAL_FEATURES=y