diff --git a/components/platform/dht.c b/components/platform/dht.c
index 050fdc33..e41ca5e4 100644
--- a/components/platform/dht.c
+++ b/components/platform/dht.c
@@ -93,7 +93,7 @@ static int dht_init( uint8_t gpio_num )
     if (rmt_config( &rmt_rx ) == ESP_OK) {
       if (rmt_driver_install( rmt_rx.channel, 512, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_SHARED ) == ESP_OK) {
 
-        rmt_get_ringbuf_handler( dht_rmt.channel, &dht_rmt.rb );
+        rmt_get_ringbuf_handle( dht_rmt.channel, &dht_rmt.rb );
 
         dht_rmt.gpio = gpio_num;
 
diff --git a/components/platform/onewire.c b/components/platform/onewire.c
index cb2d1bcf..e47eb58d 100644
--- a/components/platform/onewire.c
+++ b/components/platform/onewire.c
@@ -141,7 +141,7 @@ static int onewire_rmt_init( uint8_t gpio_num )
           if (rmt_config( &rmt_rx ) == ESP_OK) {
             if (rmt_driver_install( rmt_rx.channel, 512, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_SHARED ) == ESP_OK) {
 
-              rmt_get_ringbuf_handler( ow_rmt.rx, &ow_rmt.rb );
+              rmt_get_ringbuf_handle( ow_rmt.rx, &ow_rmt.rb );
 
               // don't set ow_rmt.gpio here
               // -1 forces a full pin set procedure in first call to onewire_rmt_attach_pin()
diff --git a/components/platform/platform.c b/components/platform/platform.c
index 58b341ea..48046da8 100644
--- a/components/platform/platform.c
+++ b/components/platform/platform.c
@@ -421,7 +421,7 @@ uint8_t platform_adc_setup( uint8_t adc, uint8_t channel, uint8_t atten ) {
 
 int platform_adc_read( uint8_t adc, uint8_t channel ) {
   int value = -1;
-  if (adc == 1) value = adc1_get_voltage( channel );
+  if (adc == 1) value = adc1_get_raw( channel );
   return value;
 }
 
diff --git a/components/platform/ws2812.c b/components/platform/ws2812.c
index 8ece4214..e48c6426 100644
--- a/components/platform/ws2812.c
+++ b/components/platform/ws2812.c
@@ -225,7 +225,7 @@ int platform_ws2812_send( void )
   // wait for all channels to finish
   for (rmt_channel_t channel = 0; channel < RMT_CHANNEL_MAX; channel++) {
     if (ws2812_chains[channel].valid) {
-      rmt_wait_tx_done( channel );
+      rmt_wait_tx_done( channel, portMAX_DELAY );
     }
   }
 
diff --git a/sdk/esp32-esp-idf b/sdk/esp32-esp-idf
index 3a1de7db..9a26296a 160000
--- a/sdk/esp32-esp-idf
+++ b/sdk/esp32-esp-idf
@@ -1 +1 @@
-Subproject commit 3a1de7dba3565424a12f795b71af45dc3c2072fc
+Subproject commit 9a26296a0e88a4c3ae27e9c848be970946fff87e
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
index 25498277..432806e9 100644
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -1,6 +1,13 @@
+# Don't warn about undefined variables
+CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=n
+
 # Empirical value to prevent a firmware crash due to stack overflow.
 CONFIG_MAIN_TASK_STACK_SIZE=8192
 
 # Enable address reuse for sockets in TIME_WAIT
 # see https://github.com/nodemcu/nodemcu-firmware/pull/1838
 CONFIG_LWIP_SO_REUSE=y
+
+# Decrease the duration of sockets in TIME_WAIT
+# see https://github.com/nodemcu/nodemcu-firmware/issues/1836
+CONFIG_TCP_MSL=5000