Merge branch 'header-fetch-fix-2' into 'master'

Fix slow API calls and failing to connect to API

See merge request !10

.gitlab-ci.yml

@@ -21,7 +21,7 @@ build_tests:
 build_esp32_application:
   stage: build
   script:
-    - echo $WEBSERVER_ROOT_CERT | base64 -d -w 0 > main/doorcode_root_cert.cert
+    - mv main/doorcode_root_cert.cert.prod main/doorcode_root_cert.cert
     - cp main/include/config.h.example main/include/config.h
     - /opt/esp/entrypoint.sh bash
     - idf.py build

main/doorcode_root_cert.cert.local

------BEGIN CERTIFICATE-----
-MIIB6jCCAZECFDb5sh03iLzvv3lh9hGvPShVD+XxMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRYwFAYDVQQHDA1Db2xsZWdl
-IFBsYWNlMQwwCgYDVQQKDANXV1UxHTAbBgNVBAsMFGVsb2NrIFJPT1QgQ0EgSVNT
-VUVSMQ4wDAYDVQQDDAVlbG9jazAgFw0yMDA2MjcyMzIyNTFaGA8yMDcwMDYxNTIz
-MjI1MVowdzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24xFjAUBgNV
-BAcMDUNvbGxlZ2UgUGxhY2UxDDAKBgNVBAoMA1dXVTEdMBsGA1UECwwUZWxvY2sg
-Uk9PVCBDQSBJU1NVRVIxDjAMBgNVBAMMBWVsb2NrMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEAhPkFYRa4nWox26JCB8ClUg/PORZvkkzGMV4/yKZNWPSRtqS8QKD
-09dRt55MVj5W4AmRkRHwqbXTAvujt7eovzAKBggqhkjOPQQDAgNHADBEAiBjDRHN
-wmkwISOF2AE3cAgyMiUlXPA+WAZKHgbxKX1MUwIgdW47WeuGJ53939yX1vOiYDky
-GLh8/I3sv/uEnA0TIFI=
------END CERTIFICATE-----

main/doorcode_root_cert.cert.prod

+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn0CFFXlCyRWA31vhnSPHOUNTDz3auCAMA0GCSqGSIb3DQEBCwUAMIGF
+MQswCQYDVQQGEwJVUzETMBEGA1UECAwKV2FzaGluZ3RvbjEWMBQGA1UEBwwNQ29s
+bGVnZSBQbGFjZTEMMAoGA1UECgwDV1dVMSQwIgYDVQQLDBsxOTIuMTY4LjAuMTMg
+Uk9PVCBDQSBJU1NVRVIxFTATBgNVBAMMDDE5Mi4xNjguMC4xMzAgFw0yMDEwMDgw
+NjU4MjNaGA8yMDcwMDkyNjA2NTgyM1owgYUxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
+DApXYXNoaW5ndG9uMRYwFAYDVQQHDA1Db2xsZWdlIFBsYWNlMQwwCgYDVQQKDANX
+V1UxJDAiBgNVBAsMGzE5Mi4xNjguMC4xMyBST09UIENBIElTU1VFUjEVMBMGA1UE
+AwwMMTkyLjE2OC4wLjEzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+t55SyIy/1C+rwolf2mqaJzBaVTaLMWk0NjVImfsJOdKIHYE1hpJUe1UNNbQYeRPr
+QElf3BletQl1B3PEaJwBbg6AzPWwVD+DDS0CqmD6URmq20M1bWYEYgJMrwpqpY33
+wm0BJsTd62+emhIhGoym5DZJ59g7+jnoHsxchXNsGOi6qddxtnm5sr4ezZvFOoc+
+ALsElo6YE8OuumQ3jSsWTESFJxRsWvZ2ppcIJRHdAAwdhyUCokyVJdzyk3L/Dk9l
+LZye64OhV1BYB0I2rVp2iBPZ/gxSliL0Tiut8XkIsMNN7JJNA4AFL8nwo52v9eli
+usV2Ma3x6xLj+KiNh7KZ7wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBeJv5EWaVL
+4ZEVDx+yNAZ/PqWzpi6B8XRoGBpAsk83mJ429NmfAD5G74rmDwPZ9FHWCWHK6Cpy
+3MO75nepmk6qVYccuEW1bs/itO8NbADeJRIqzpVDP8F0dWefmUGo5bV2oAVhLdLI
+QfPXMNyHyaQUp8gFh1xzCXyPU5jrmcFLw8L29aRlOfGYdmKq/tYbULjdYtysrigl
+IZFQrM+oXpKEDKq+Fqax27O9RrgmIIrxpAU0/KxASbKgpCkW+T2UZTjOjms8NpdO
+EH7zjGq59lewpAyG5trG/OAVzmi4sIKiRwXQwdHjcGXwjio+isDbu0s2HI5nCZSh
+MlKGC4g2E4bP
+-----END CERTIFICATE-----

main/include/config.h.example

@@ -48,8 +48,10 @@
 
 #define MIN_CODE_LENGTH 4
 
-// 15 minutes
-#define STATUS_MAX_NO_CONTACT_TIME_MS (1000 * 60 * 15)
+// Set to 1 minute instead of something like 15 minutes to keep the SSL connection alive
+// so it can be reused as much as possible, as it takes around 2 seconds with RSA 2048 keys
+// and a whopping 5 seconds with ECDSA keys :(
+#define STATUS_MAX_NO_CONTACT_TIME_MS (1000 * 60)
 
 // How often to update the keypad state
 #define KEYPAD_SCAN_PERIOD_MS 50

main/src/connectors/esp32/esp_http.c

@@ -166,16 +166,22 @@ int door_http_get(door_http_client_handle_t client, const char* path, door_http_
 	esp_http_client_set_url(handle, path);
 	esp_http_client_set_method(handle, HTTP_METHOD_GET);
 
-	esp_err_t err = esp_http_client_perform(handle);
-	if (err != ESP_OK)
-	{
-		ESP_LOGE(TAG, "Error perform http request %s", esp_err_to_name(err));
-		return DOOR_HTTP_ERR_FAIL;
-	}
+	// Bug in the framework, have to retry until it works
+	// https://github.com/espressif/esp-idf/issues/2684
+	for (int tries = 0; tries < 3; ++tries) {
+		esp_err_t err = esp_http_client_perform(handle);
 
-	int status_code = esp_http_client_get_status_code(handle);
-	ESP_LOGI(TAG, "Status code from GET call: %d", status_code);
-	return status_code;
+		if (err == ESP_OK)
+		{
+			int status_code = esp_http_client_get_status_code(handle);
+			ESP_LOGI(TAG, "Status code from GET call: %d", status_code);
+			return status_code;
+		}
+
+		ESP_LOGE(TAG, "Error perform http request %s. Retrying...", esp_err_to_name(err));
+		esp_http_client_close(handle);
+	}
+	return DOOR_HTTP_ERR_FAIL;
 }
 
 int door_http_post(
@@ -197,15 +203,23 @@ int door_http_post(
 	esp_http_client_set_url(handle, path);
 	esp_http_client_set_method(handle, HTTP_METHOD_POST);
 	esp_http_client_set_post_field(client, data, strlen(data));
-	esp_err_t err = esp_http_client_perform(handle);
-	if (err != ESP_OK)
-	{
-		ESP_LOGE(TAG, "Error perform http request %s", esp_err_to_name(err));
-		return DOOR_HTTP_ERR_FAIL;
+
+	// Bug in the framework, have to retry until it works
+	// https://github.com/espressif/esp-idf/issues/2684
+	for (int tries = 0; tries < 3; ++tries) {
+		esp_err_t err = esp_http_client_perform(handle);
+
+		if (err == ESP_OK)
+		{
+			int status_code = esp_http_client_get_status_code(handle);
+			ESP_LOGI(TAG, "Status code from POST call: %d", status_code);
+			return status_code;
+		}
+
+		ESP_LOGE(TAG, "Error perform http request %s. Retrying...", esp_err_to_name(err));
+		esp_http_client_close(handle);
 	}
-	int status_code = esp_http_client_get_status_code(handle);
-	ESP_LOGI(TAG, "Status code from POST call: %d", status_code);
-	return status_code;
+	return DOOR_HTTP_ERR_FAIL;
 }
 
 static esp_err_t door_http_ota_update_validate_image_header(esp_app_desc_t* new_app_info)

sdkconfig

@@ -2,45 +2,18 @@
 # Automatically generated file. DO NOT EDIT.
 # Espressif IoT Development Framework (ESP-IDF) Project Configuration
 #
-CONFIG_IDF_CMAKE=y
-CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_TARGET_ESP32=y
+CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 #
 # SDK tool configuration
 #
 CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-"
-# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
-# end of SDK tool configuration
-
-#
-# Build type
-#
-CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
-# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
-CONFIG_APP_BUILD_GENERATE_BINARIES=y
-CONFIG_APP_BUILD_BOOTLOADER=y
-CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
-# end of Build type
-
-#
-# Application manager
-#
 CONFIG_APP_COMPILE_TIME_DATE=y
 # CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
 # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
-# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
 CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
-# end of Application manager
-
-#
-# Bootloader config
-#
-CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
-# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
-# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
-# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
@@ -57,29 +30,15 @@ CONFIG_BOOTLOADER_WDT_ENABLE=y
 CONFIG_BOOTLOADER_WDT_TIME_MS=9000
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 # CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK is not set
-# CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set
-CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
-# CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
-# end of Bootloader config
-
-#
-# Security features
-#
 CONFIG_SECURE_SIGNED_ON_UPDATE=y
 CONFIG_SECURE_SIGNED_APPS=y
 CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT=y
-CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME=y
 # CONFIG_SECURE_SIGNED_ON_BOOT_NO_SECURE_BOOT is not set
 CONFIG_SECURE_SIGNED_ON_UPDATE_NO_SECURE_BOOT=y
-# CONFIG_SECURE_BOOT is not set
+# CONFIG_SECURE_BOOT_ENABLED is not set
 # CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES is not set
 CONFIG_SECURE_BOOT_VERIFICATION_KEY="signature_verification_key.bin"
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
-# end of Security features
-
-#
-# Serial flasher config
-#
 CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
 # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
 # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
@@ -113,11 +72,6 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
 # CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set
 CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
-# end of Serial flasher config
-
-#
-# Partition Table
-#
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
 CONFIG_PARTITION_TABLE_TWO_OTA=y
 # CONFIG_PARTITION_TABLE_CUSTOM is not set
@@ -125,124 +79,48 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions_two_ota.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
-# end of Partition Table
-
-#
-# Example Configuration
-#
 CONFIG_ESP_WIFI_SSID="myssid"
 CONFIG_ESP_WIFI_PASSWORD="mypassword"
-# end of Example Configuration
-
-#
-# Compiler options
-#
-CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
-# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
-# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
-# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
+CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
+# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
 # CONFIG_COMPILER_CXX_EXCEPTIONS is not set
-# CONFIG_COMPILER_CXX_RTTI is not set
 CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
 # CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
 # CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
+# CONFIG_COMPILER_STACK_CHECK is not set
 # CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
 # CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set
-# end of Compiler options
-
-#
-# Component config
-#
-
-#
-# Application Level Tracing
-#
-# CONFIG_APPTRACE_DEST_TRAX is not set
-CONFIG_APPTRACE_DEST_NONE=y
-CONFIG_APPTRACE_LOCK_ENABLE=y
-# end of Application Level Tracing
-
-#
-# Bluetooth
-#
+# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
+CONFIG_ESP32_APPTRACE_DEST_NONE=y
+# CONFIG_ESP32_APPTRACE_ENABLE is not set
+CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
 # CONFIG_BT_ENABLED is not set
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
+# CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF is not set
 CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0
 CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0
 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
 CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1
 CONFIG_BT_RESERVE_DRAM=0
-# end of Bluetooth
-
-#
-# CoAP Configuration
-#
-CONFIG_COAP_MBEDTLS_PSK=y
-# CONFIG_COAP_MBEDTLS_PKI is not set
-# CONFIG_COAP_MBEDTLS_DEBUG is not set
-CONFIG_COAP_LOG_DEFAULT_LEVEL=0
-# end of CoAP Configuration
-
-#
-# Driver configurations
-#
-
-#
-# ADC configuration
-#
+# CONFIG_BLE_MESH is not set
 # CONFIG_ADC_FORCE_XPD_FSM is not set
 CONFIG_ADC_DISABLE_DAC=y
-# end of ADC configuration
-
-#
-# SPI configuration
-#
 # CONFIG_SPI_MASTER_IN_IRAM is not set
 CONFIG_SPI_MASTER_ISR_IN_IRAM=y
 # CONFIG_SPI_SLAVE_IN_IRAM is not set
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
-# end of SPI configuration
-
-#
-# UART configuration
-#
-# CONFIG_UART_ISR_IN_IRAM is not set
-# end of UART configuration
-
-#
-# RTCIO configuration
-#
-# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set
-# end of RTCIO configuration
-# end of Driver configurations
-
-#
-# eFuse Bit Manager
-#
 # CONFIG_EFUSE_CUSTOM_TABLE is not set
 # CONFIG_EFUSE_VIRTUAL is not set
 # CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set
 CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
 # CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set
 CONFIG_EFUSE_MAX_BLK_LEN=192
-# end of eFuse Bit Manager
-
-#
-# ESP-TLS
-#
-CONFIG_ESP_TLS_USING_MBEDTLS=y
 # CONFIG_ESP_TLS_SERVER is not set
-# CONFIG_ESP_TLS_PSK_VERIFICATION is not set
-# end of ESP-TLS
-
-#
-# ESP32-specific
-#
 CONFIG_ESP32_REV_MIN_0=y
 # CONFIG_ESP32_REV_MIN_1 is not set
 # CONFIG_ESP32_REV_MIN_2 is not set
@@ -254,6 +132,8 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_240 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160
 # CONFIG_ESP32_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32_MEMMAP_TRACEMEM is not set
+# CONFIG_ESP32_MEMMAP_TRACEMEM_TWOBANKS is not set
 # CONFIG_ESP32_TRAX is not set
 CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
 # CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set
@@ -261,7 +141,12 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
 # CONFIG_ESP32_ULP_COPROC_ENABLED is not set
 CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
+# CONFIG_ESP32_PANIC_PRINT_HALT is not set
+CONFIG_ESP32_PANIC_PRINT_REBOOT=y
+# CONFIG_ESP32_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP32_PANIC_GDBSTUB is not set
 CONFIG_ESP32_DEBUG_OCDAWARE=y
+CONFIG_ESP32_DEBUG_STUBS_ENABLE=y
 CONFIG_ESP32_BROWNOUT_DET=y
 CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y
 # CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set
@@ -282,6 +167,7 @@ CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y
 # CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set
 # CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
+CONFIG_ESP32_RTC_XTAL_CAL_RETRY=1
 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP32_XTAL_FREQ_40=y
 # CONFIG_ESP32_XTAL_FREQ_26 is not set
@@ -292,38 +178,21 @@ CONFIG_ESP32_XTAL_FREQ=40
 # CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
 # CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set
 CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
-# end of ESP32-specific
-
-#
-# Power Management
-#
 # CONFIG_PM_ENABLE is not set
-# end of Power Management
-
-#
-# ADC-Calibration
-#
 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
 CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
 CONFIG_ADC_CAL_LUT_ENABLE=y
-# end of ADC-Calibration
-
-#
-# Common ESP-related
-#
+# CONFIG_ESP_TIMER_PROFILING is not set
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584
 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
-CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y
-CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
+CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
 CONFIG_ESP_CONSOLE_UART_DEFAULT=y
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_UART_NONE is not set
 CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_UART_TX_GPIO=1
-CONFIG_ESP_CONSOLE_UART_RX_GPIO=3
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
@@ -333,94 +202,20 @@ CONFIG_ESP_TASK_WDT=y
 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_MAC_ADDR_UNIVERSE_WIFI_STA=y
-CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
-CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y
-CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y
-# end of Common ESP-related
-
-#
-# Ethernet
-#
 # CONFIG_ETH_USE_ESP32_EMAC is not set
 # CONFIG_ETH_USE_SPI_ETHERNET is not set
-# CONFIG_ETH_USE_OPENETH is not set
-# end of Ethernet
-
-#
-# Event Loop Library
-#
 # CONFIG_ESP_EVENT_LOOP_PROFILING is not set
 CONFIG_ESP_EVENT_POST_FROM_ISR=y
 CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
-# end of Event Loop Library
-
-#
-# GDB Stub
-#
-# end of GDB Stub
-
-#
-# ESP HTTP client
-#
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
 # CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set
-# end of ESP HTTP client
-
-#
-# HTTP Server
-#
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
 CONFIG_HTTPD_MAX_URI_LEN=512
 CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
 CONFIG_HTTPD_PURGE_BUF_LEN=32
 # CONFIG_HTTPD_LOG_PURGE_DATA is not set
-# CONFIG_HTTPD_WS_SUPPORT is not set
-# end of HTTP Server
-
-#
-# ESP HTTPS OTA
-#
 # CONFIG_OTA_ALLOW_HTTP is not set
-# end of ESP HTTPS OTA
-
-#
-# ESP HTTPS server
-#
 # CONFIG_ESP_HTTPS_SERVER_ENABLE is not set
-# end of ESP HTTPS server
-
-#
-# ESP NETIF Adapter
-#
-CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
-CONFIG_ESP_NETIF_TCPIP_LWIP=y
-# CONFIG_ESP_NETIF_LOOPBACK is not set
-# CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER is not set
-# end of ESP NETIF Adapter
-
-#
-# ESP System Settings
-#
-# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set
-CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
-# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
-# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
-# end of ESP System Settings
-
-#
-# High resolution timer (esp_timer)
-#
-# CONFIG_ESP_TIMER_PROFILING is not set
-CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
-# CONFIG_ESP_TIMER_IMPL_FRC2 is not set
-CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
-# end of High resolution timer (esp_timer)
-
-#
-# Wi-Fi
-#
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
 # CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
@@ -441,28 +236,14 @@ 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 is not set
-# end of Wi-Fi
-
-#
-# PHY
-#
 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
 CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
-# end of PHY
-
-#
-# Core dump
-#
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
 CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
-# end of Core dump
-
-#
-# FAT Filesystem support
-#
+# CONFIG_ESP32_ENABLE_COREDUMP is not set
 # CONFIG_FATFS_CODEPAGE_DYNAMIC is not set
 CONFIG_FATFS_CODEPAGE_437=y
 # CONFIG_FATFS_CODEPAGE_720 is not set
@@ -492,20 +273,11 @@ CONFIG_FATFS_LFN_NONE=y
 CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
-# end of FAT Filesystem support
-
-#
-# Modbus configuration
-#
-CONFIG_FMB_COMM_MODE_RTU_EN=y
-CONFIG_FMB_COMM_MODE_ASCII_EN=y
 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150
 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
 CONFIG_FMB_QUEUE_LENGTH=20
 CONFIG_FMB_SERIAL_TASK_STACK_SIZE=2048
 CONFIG_FMB_SERIAL_BUF_SIZE=256
-CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8
-CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000
 CONFIG_FMB_SERIAL_TASK_PRIO=10
 # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
@@ -515,12 +287,6 @@ CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FMB_TIMER_GROUP=0
 CONFIG_FMB_TIMER_INDEX=0
-# CONFIG_FMB_TIMER_ISR_IN_IRAM is not set
-# end of Modbus configuration
-
-#
-# FreeRTOS
-#
 # CONFIG_FREERTOS_UNICORE is not set
 CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
 CONFIG_FREERTOS_CORETIMER_0=y
@@ -548,39 +314,17 @@ CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
 # CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
 # CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
+# CONFIG_FREERTOS_DEBUG_INTERNALS is not set
 CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
 CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
-CONFIG_FREERTOS_DEBUG_OCDAWARE=y
-# CONFIG_FREERTOS_FPU_IN_ISR is not set
-# end of FreeRTOS
-
-#
-# Heap memory debugging
-#
 CONFIG_HEAP_POISONING_DISABLED=y
 # CONFIG_HEAP_POISONING_LIGHT is not set
 # CONFIG_HEAP_POISONING_COMPREHENSIVE is not set
 CONFIG_HEAP_TRACING_OFF=y
 # CONFIG_HEAP_TRACING_STANDALONE is not set
 # CONFIG_HEAP_TRACING_TOHOST is not set
-# end of Heap memory debugging
-
-#
-# jsmn
-#
-# CONFIG_JSMN_PARENT_LINKS is not set
-# CONFIG_JSMN_STRICT is not set
-# end of jsmn
-
-#
-# libsodium
-#
-# end of libsodium
-
-#
-# Log output
-#
+# CONFIG_HEAP_TRACING is not set
 # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
 # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
 # CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
@@ -589,15 +333,7 @@ CONFIG_LOG_DEFAULT_LEVEL_INFO=y
 # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
 CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_LOG_COLORS=y
-CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
-# CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
-# end of Log output
-
-#
-# LWIP
-#
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
-CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
 CONFIG_LWIP_TIMERS_ONDEMAND=y
@@ -606,7 +342,6 @@ CONFIG_LWIP_MAX_SOCKETS=10
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 # CONFIG_LWIP_SO_RCVBUF is not set
-# CONFIG_LWIP_NETBUF_RECVINFO is not set
 CONFIG_LWIP_IP_FRAG=y
 # CONFIG_LWIP_IP_REASSEMBLY is not set
 # CONFIG_LWIP_STATS is not set
@@ -616,80 +351,39 @@ CONFIG_LWIP_GARP_TMR_INTERVAL=60
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
-
-#
-# DHCP server
-#
 CONFIG_LWIP_DHCPS_LEASE_UNIT=60
 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
-# end of DHCP server
-
 # CONFIG_LWIP_AUTOIP is not set
 # CONFIG_LWIP_IPV6_AUTOCONFIG is not set
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
-
-#
-# TCP
-#
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
 CONFIG_LWIP_TCP_MAXRTX=12
 CONFIG_LWIP_TCP_SYNMAXRTX=6
 CONFIG_LWIP_TCP_MSS=1440
-CONFIG_LWIP_TCP_TMR_INTERVAL=250
 CONFIG_LWIP_TCP_MSL=60000
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744