diff --git a/Makefile b/Makefile
index 455631c..8c9407c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 UNAME := $(shell uname)
 
-XTENSA_TOOLCHAIN := "xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz"
+XTENSA_TOOLCHAIN := "xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz"
 
 ifeq ($(UNAME), Darwin)
-XTENSA_TOOLCHAIN := "xtensa-esp32-elf-osx-1.22.0-80-g6c4433a-5.2.0.tar.gz"
+XTENSA_TOOLCHAIN := "xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz"
 endif
 
-ESP_IDF_VERSION := "v3.1.4"
+ESP_IDF_VERSION := "v3.3.5"
 
 fmt:
 	clang-format -i ./*.c ./*.h -style="{BasedOnStyle: Google, ColumnLimit: 120}"
diff --git a/test/sdkconfig b/test/sdkconfig
index 621c41d..3985407 100644
--- a/test/sdkconfig
+++ b/test/sdkconfig
@@ -2,6 +2,8 @@
 # Automatically generated file; DO NOT EDIT.
 # Espressif IoT Development Framework Configuration
 #
+CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 #
 # SDK tool configuration
@@ -10,6 +12,14 @@ CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
 CONFIG_PYTHON="python"
 CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y
 
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=
+CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+
 #
 # Bootloader config
 #
@@ -24,6 +34,10 @@ CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 CONFIG_BOOTLOADER_FACTORY_RESET=
 CONFIG_BOOTLOADER_APP_TEST=
+CONFIG_BOOTLOADER_WDT_ENABLE=y
+CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=
+CONFIG_BOOTLOADER_WDT_TIME_MS=9000
+CONFIG_APP_ROLLBACK_ENABLE=
 
 #
 # Security features
@@ -103,6 +117,7 @@ CONFIG_STACK_CHECK_STRONG=
 CONFIG_STACK_CHECK_ALL=
 CONFIG_STACK_CHECK=
 CONFIG_WARN_WRITE_STRINGS=
+CONFIG_DISABLE_GCC8_WARNINGS=
 
 #
 # Component config
@@ -121,8 +136,15 @@ CONFIG_AWS_IOT_SDK=
 # Bluetooth
 #
 CONFIG_BT_ENABLED=
+CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
+CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF=
+CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF=
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
 CONFIG_BT_RESERVE_DRAM=0
+CONFIG_BLE_MESH=
 
 #
 # Driver configurations
@@ -135,10 +157,27 @@ CONFIG_ADC_FORCE_XPD_FSM=
 CONFIG_ADC2_DISABLE_DAC=y
 
 #
-# SPI master configuration
+# SPI configuration
 #
 CONFIG_SPI_MASTER_IN_IRAM=
 CONFIG_SPI_MASTER_ISR_IN_IRAM=y
+CONFIG_SPI_SLAVE_IN_IRAM=
+CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
+
+#
+# CAN Configuration
+#
+CONFIG_CAN_ISR_IN_IRAM=
+
+#
+# eFuse Bit Manager
+#
+CONFIG_EFUSE_CUSTOM_TABLE=
+CONFIG_EFUSE_VIRTUAL=
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE=
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT=
+CONFIG_EFUSE_MAX_BLK_LEN=192
 
 #
 # esp-mqtt
@@ -152,6 +191,13 @@ CONFIG_ESP_MQTT_TLS_ENABLE=y
 #
 # ESP32-specific
 #
+CONFIG_IDF_TARGET_ESP32=y
+CONFIG_ESP32_REV_MIN_0=y
+CONFIG_ESP32_REV_MIN_1=
+CONFIG_ESP32_REV_MIN_2=
+CONFIG_ESP32_REV_MIN_3=
+CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_DPORT_WORKAROUND=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -161,12 +207,6 @@ CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
 CONFIG_ESP32_TRAX=
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
-CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
-CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=y
-CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=
-CONFIG_ESP32_ENABLE_COREDUMP=y
-CONFIG_ESP32_CORE_DUMP_UART_DELAY=0
-CONFIG_ESP32_CORE_DUMP_LOG_LEVEL=1
 CONFIG_TWO_UNIVERSAL_MAC_ADDRESS=
 CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -213,12 +253,15 @@ CONFIG_BROWNOUT_DET_LVL_SEL_5=
 CONFIG_BROWNOUT_DET_LVL_SEL_6=
 CONFIG_BROWNOUT_DET_LVL_SEL_7=
 CONFIG_BROWNOUT_DET_LVL=0
+CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC=
 CONFIG_ESP32_TIME_SYSCALL_USE_FRC1=
 CONFIG_ESP32_TIME_SYSCALL_USE_NONE=
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL=
+CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC=
+CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256=
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=0
 CONFIG_ESP32_XTAL_FREQ_40=
@@ -230,6 +273,7 @@ CONFIG_NO_BLOBS=
 CONFIG_ESP_TIMER_PROFILING=
 CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 
 #
 # Wi-Fi
@@ -249,8 +293,10 @@ CONFIG_ESP32_WIFI_NVS_ENABLED=y
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
 CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
-CONFIG_ESP32_WIFI_IRAM_OPT=y
 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
+CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
+CONFIG_ESP32_WIFI_IRAM_OPT=y
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
 
 #
 # PHY
@@ -272,10 +318,40 @@ CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
 CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
 CONFIG_ADC_CAL_LUT_ENABLE=y
 
+#
+# Event Loop Library
+#
+CONFIG_EVENT_LOOP_PROFILING=
+
 #
 # ESP HTTP client
 #
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
+CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=
+
+#
+# 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=
+
+#
+# ESP HTTPS OTA
+#
+CONFIG_OTA_ALLOW_HTTP=
+
+#
+# Core dump
+#
+CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
+CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=y
+CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=
+CONFIG_ESP32_ENABLE_COREDUMP=y
+CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM=64
+CONFIG_ESP32_CORE_DUMP_UART_DELAY=0
 
 #
 # Ethernet
@@ -283,6 +359,7 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
 CONFIG_DMA_RX_BUF_NUM=10
 CONFIG_DMA_TX_BUF_NUM=10
 CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE=
+CONFIG_EMAC_CHECK_LINK_PERIOD_MS=2000
 CONFIG_EMAC_TASK_PRIORITY=20
 CONFIG_EMAC_TASK_STACK_SIZE=3072
 
@@ -319,10 +396,27 @@ CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
 
+#
+# Modbus configuration
+#
+CONFIG_MB_QUEUE_LENGTH=20
+CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048
+CONFIG_MB_SERIAL_BUF_SIZE=256
+CONFIG_MB_SERIAL_TASK_PRIO=10
+CONFIG_MB_CONTROLLER_SLAVE_ID_SUPPORT=
+CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20
+CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
+CONFIG_MB_CONTROLLER_STACK_SIZE=4096
+CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
+CONFIG_MB_TIMER_PORT_ENABLED=y
+CONFIG_MB_TIMER_GROUP=0
+CONFIG_MB_TIMER_INDEX=0
+
 #
 # FreeRTOS
 #
 CONFIG_FREERTOS_UNICORE=
+CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
 CONFIG_FREERTOS_CORETIMER_0=y
 CONFIG_FREERTOS_CORETIMER_1=
 CONFIG_FREERTOS_HZ=1000
@@ -348,6 +442,9 @@ CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
 CONFIG_FREERTOS_USE_TRACE_FACILITY=
 CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=
 CONFIG_FREERTOS_DEBUG_INTERNALS=
+CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
+CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
+CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=
 
 #
 # Heap memory debugging
@@ -378,20 +475,25 @@ CONFIG_LOG_COLORS=y
 # LWIP
 #
 CONFIG_L2_TO_L3_COPY=
+CONFIG_ETHARP_SUPPORT_VLAN=
 CONFIG_LWIP_IRAM_OPTIMIZATION=
 CONFIG_LWIP_MAX_SOCKETS=10
+CONFIG_LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS=y
 CONFIG_USE_ONLY_LWIP_SELECT=
+CONFIG_LWIP_SO_LINGER=
 CONFIG_LWIP_SO_REUSE=
 CONFIG_LWIP_SO_RCVBUF=y
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
-CONFIG_LWIP_IP_FRAG=
-CONFIG_LWIP_IP_REASSEMBLY=
+CONFIG_LWIP_IP4_FRAG=y
+CONFIG_LWIP_IP6_FRAG=y
+CONFIG_LWIP_IP4_REASSEMBLY=
+CONFIG_LWIP_IP6_REASSEMBLY=
 CONFIG_LWIP_STATS=
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
 CONFIG_ESP_GRATUITOUS_ARP=y
 CONFIG_GARP_TMR_INTERVAL=60
 CONFIG_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
+CONFIG_LWIP_DHCP_RESTORE_LAST_IP=
 
 #
 # DHCP server
@@ -399,14 +501,17 @@ CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 CONFIG_LWIP_DHCPS_LEASE_UNIT=60
 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 CONFIG_LWIP_AUTOIP=
+CONFIG_LWIP_IPV6_AUTOCONFIG=
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 
 #
 # TCP
 #
+CONFIG_LWIP_TCP_ISN_HOOK=y
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
+CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
 CONFIG_TCP_MAXRTX=12
 CONFIG_TCP_SYNMAXRTX=6
 CONFIG_TCP_MSS=1436
@@ -419,6 +524,7 @@ CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES=
 CONFIG_TCP_OVERSIZE_MSS=y
 CONFIG_TCP_OVERSIZE_QUARTER_MSS=
 CONFIG_TCP_OVERSIZE_DISABLE=
+CONFIG_LWIP_TCP_RTO_TIME=1500
 
 #
 # UDP
@@ -426,6 +532,12 @@ CONFIG_TCP_OVERSIZE_DISABLE=
 CONFIG_LWIP_MAX_UDP_PCBS=16
 CONFIG_UDP_RECVMBOX_SIZE=6
 CONFIG_TCPIP_TASK_STACK_SIZE=2560
+CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
+CONFIG_TCPIP_TASK_AFFINITY_CPU0=
+CONFIG_TCPIP_TASK_AFFINITY_CPU1=
+CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
+CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
+CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
 CONFIG_PPP_SUPPORT=
 
 #
@@ -439,11 +551,24 @@ CONFIG_LWIP_BROADCAST_PING=
 #
 CONFIG_LWIP_MAX_RAW_PCBS=16
 
+#
+# SNTP
+#
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+CONFIG_LWIP_ESP_LWIP_ASSERT=y
+
 #
 # mbedTLS
 #
+CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
+CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=
+CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
+CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
 CONFIG_MBEDTLS_DEBUG=
+CONFIG_MBEDTLS_ECP_RESTARTABLE=
+CONFIG_MBEDTLS_CMAC_C=
 CONFIG_MBEDTLS_HARDWARE_AES=y
 CONFIG_MBEDTLS_HARDWARE_MPI=
 CONFIG_MBEDTLS_HARDWARE_SHA=
@@ -516,10 +641,25 @@ CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
 CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_SERVICES=10
+
+#
+# ESP-MQTT Configurations
+#
+CONFIG_MQTT_PROTOCOL_311=y
+CONFIG_MQTT_TRANSPORT_SSL=y
+CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
+CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
+CONFIG_MQTT_USE_CUSTOM_CONFIG=
+CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED=
+CONFIG_MQTT_CUSTOM_OUTBOX=
+
 #
 # NVS
 #
-CONFIG_MP_BLOB_SUPPORT=
 
 #
 # OpenSSL
@@ -533,6 +673,12 @@ CONFIG_OPENSSL_ASSERT_EXIT=
 #
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
+CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
+CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0=
+CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=
+CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
+CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 #
 # SPI Flash driver
@@ -543,6 +689,9 @@ CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS=
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED=
+CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
+CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20
+CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=1
 
 #
 # SPIFFS Configuration
@@ -576,14 +725,25 @@ CONFIG_SPIFFS_CHECK_DBG=
 CONFIG_SPIFFS_TEST_VISUALISATION=
 
 #
-# tcpip adapter
+# TCP/IP Adapter
 #
 CONFIG_IP_LOST_TIMER_INTERVAL=120
+CONFIG_TCPIP_LWIP=y
+
+#
+# Unity unit testing library
+#
+CONFIG_UNITY_ENABLE_FLOAT=y
+CONFIG_UNITY_ENABLE_DOUBLE=y
+CONFIG_UNITY_ENABLE_COLOR=
+CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
+CONFIG_UNITY_ENABLE_FIXTURE=
 
 #
 # Virtual file system
 #
 CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+CONFIG_SUPPORT_TERMIOS=y
 
 #
 # Wear Levelling
@@ -591,3 +751,14 @@ CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
 CONFIG_WL_SECTOR_SIZE_512=
 CONFIG_WL_SECTOR_SIZE_4096=y
 CONFIG_WL_SECTOR_SIZE=4096
+
+#
+# Wi-Fi Provisioning Manager
+#
+CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
+
+#
+# Supplicant
+#
+CONFIG_WPA_WPS_WARS=
+CONFIG_WPA_DEBUG_PRINT=