esp32: Update with master up to version 1.10.2.b1.

Author: Daniel Campora

esp32/bootloader/bootloader.c

@@ -851,6 +851,13 @@ static void IRAM_ATTR flash_gpio_configure()
 
 static void clock_configure(void)
 {
+    // ROM bootloader may have put a lot of text into UART0 FIFO.
+    // Wait for it to be printed.
+    // This is not needed on power on reset, when ROM bootloader is running at
+    // 40 MHz. But in case of TG WDT reset, CPU may still be running at >80 MHZ,
+    // and will be done with the bootloader much earlier than UART FIFO is empty.
+    uart_tx_wait_idle(0);
+
     /* Set CPU to 80MHz. Keep other clocks unmodified. */
     rtc_cpu_freq_t cpu_freq = RTC_CPU_FREQ_80M;
 
@@ -892,8 +899,7 @@ static void uart_console_configure(void)
     uartAttach();
     ets_install_uart_printf();
 
-    // ROM bootloader may have put a lot of text into UART0 FIFO.
-    // Wait for it to be printed.
+    // Wait for UART FIFO to be empty.
     uart_tx_wait_idle(0);
 
 #if CONFIG_CONSOLE_UART_CUSTOM

esp32/frozen/MQTTMsgHandler.py

@@ -23,13 +23,8 @@ def __init__(self, receive_callback, connect_helper):
         self._poll = select.poll()
         self._output_queue=[]
         self._out_packet_mutex=_thread.allocate_lock()
-<<<<<<< HEAD
-	_thread.stack_size(5120)
-        _thread.start_new_thread(self._io_thread_func,())
-=======
         _thread.stack_size(8192)
         _thread.start_new_thread(self._io_thread_func, ())
->>>>>>> esp32: Update with master up to release 1.10.1.b1
         self._recv_callback = receive_callback
         self._connect_helper = connect_helper
         self._pingSent=False