ayoy
diff --git a/‎esp32/bootloader/bootloader.c
Lines changed: 8 additions & 2 deletions b/‎esp32/bootloader/bootloader.c
Lines changed: 8 additions & 2 deletions
diff --git a/‎esp32/frozen/MQTTMsgHandler.py
Lines changed: 0 additions & 5 deletions b/‎esp32/frozen/MQTTMsgHandler.py
Lines changed: 0 additions & 5 deletions
diff --git a/‎esp32/lib/libbt.a
0 Bytes b/‎esp32/lib/libbt.a
0 Bytes
diff --git a/‎esp32/lib/libcxx.a
0 Bytes b/‎esp32/lib/libcxx.a
0 Bytes
diff --git a/‎esp32/lib/libdriver.a
64 Bytes b/‎esp32/lib/libdriver.a
64 Bytes
diff --git a/‎esp32/lib/libesp32.a
8 Bytes b/‎esp32/lib/libesp32.a
8 Bytes
diff --git a/‎esp32/lib/libesp_adc_cal.a
0 Bytes b/‎esp32/lib/libesp_adc_cal.a
0 Bytes
diff --git a/‎esp32/lib/libexpat.a
0 Bytes b/‎esp32/lib/libexpat.a
0 Bytes
diff --git a/‎esp32/lib/libfreertos.a
512 Bytes b/‎esp32/lib/libfreertos.a
512 Bytes
diff --git a/‎esp32/lib/libheap.a
0 Bytes b/‎esp32/lib/libheap.a
0 Bytes
diff --git a/‎esp32/lib/libjsmn.a
0 Bytes b/‎esp32/lib/libjsmn.a
0 Bytes
diff --git a/‎esp32/lib/libjson.a
0 Bytes b/‎esp32/lib/libjson.a
0 Bytes
diff --git a/‎esp32/lib/liblog.a
0 Bytes b/‎esp32/lib/liblog.a
0 Bytes
diff --git a/‎esp32/lib/liblwip.a
0 Bytes b/‎esp32/lib/liblwip.a
0 Bytes
diff --git a/‎esp32/lib/libmbedtls.a
0 Bytes b/‎esp32/lib/libmbedtls.a
0 Bytes
diff --git a/‎esp32/lib/libmicro-ecc.a
0 Bytes b/‎esp32/lib/libmicro-ecc.a
0 Bytes
diff --git a/‎esp32/lib/libnewlib.a
0 Bytes b/‎esp32/lib/libnewlib.a
0 Bytes
diff --git a/‎esp32/lib/libnghttp.a
0 Bytes b/‎esp32/lib/libnghttp.a
0 Bytes
diff --git a/‎esp32/lib/libnvs_flash.a
0 Bytes b/‎esp32/lib/libnvs_flash.a
0 Bytes
diff --git a/‎esp32/lib/libopenssl.a
0 Bytes b/‎esp32/lib/libopenssl.a
0 Bytes
diff --git a/‎esp32/lib/libpthread.a
0 Bytes b/‎esp32/lib/libpthread.a
0 Bytes
diff --git a/‎esp32/lib/libsdmmc.a
0 Bytes b/‎esp32/lib/libsdmmc.a
0 Bytes
diff --git a/‎esp32/lib/libsoc.a
56 Bytes b/‎esp32/lib/libsoc.a
56 Bytes
diff --git a/‎esp32/lib/libspi_flash.a
0 Bytes b/‎esp32/lib/libspi_flash.a
0 Bytes
diff --git a/‎esp32/lib/libtcpip_adapter.a
0 Bytes b/‎esp32/lib/libtcpip_adapter.a
0 Bytes
diff --git a/‎esp32/lib/libvfs.a
0 Bytes b/‎esp32/lib/libvfs.a
0 Bytes
diff --git a/‎esp32/lib/libwpa_supplicant.a
0 Bytes b/‎esp32/lib/libwpa_supplicant.a
0 Bytes
diff --git a/‎esp32/lib/libxtensa-debug-module.a
0 Bytes b/‎esp32/lib/libxtensa-debug-module.a
0 Bytes
diff --git a/‎esp32/main.c
Lines changed: 5 additions & 2 deletions b/‎esp32/main.c
Lines changed: 5 additions & 2 deletions
diff --git a/‎esp32/mods/machuart.c
Lines changed: 13 additions & 8 deletions b/‎esp32/mods/machuart.c
Lines changed: 13 additions & 8 deletions
diff --git a/‎esp32/pycom_version.h
Lines changed: 1 addition & 1 deletion b/‎esp32/pycom_version.h
Lines changed: 1 addition & 1 deletion
@@ -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
 
@@ -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
 
@@ -104,7 +104,10 @@ void app_main(void) {
     machine_init0();
 
     // initalize the non-volatile flash space
-    nvs_flash_init();
+    if (nvs_flash_init() == ESP_ERR_NVS_NO_FREE_PAGES) {
+        nvs_flash_erase();
+        nvs_flash_init();
+    }
 
     esp_chip_info_t chip_info;
     esp_chip_info(&chip_info);
@@ -148,5 +151,5 @@ void app_main(void) {
     // create the MicroPython task
     mpTaskHandle = 
     (TaskHandle_t)xTaskCreateStaticPinnedToCore(TASK_Micropython, "MicroPy", MICROPY_TASK_STACK_LEN, NULL,
-                                  MICROPY_TASK_PRIORITY, mpTaskStack, &mpTaskTCB, 0);
+                                                MICROPY_TASK_PRIORITY, mpTaskStack, &mpTaskTCB, 0);
 }
@@ -145,15 +145,19 @@ bool uart_tx_char(mach_uart_obj_t *self, int c) {
 
 bool uart_tx_strn(mach_uart_obj_t *self, const char *str, uint len) {
     bool ret = true;
+    uint32_t isrmask = 0;
+    pin_obj_t * pin = (pin_obj_t *)((mp_obj_t *)self->pins)[0];
 
     if (self->n_pins == 1) {
-        pin_obj_t * pin = (pin_obj_t *)((mp_obj_t *)self->pins)[0];
         // make it UART Tx
         pin->value = 1;
         pin_deassign(pin);
-        pin->mode = GPIO_MODE_OUTPUT;
         pin->af_out = mach_uart_pin_af[self->uart_id][0];
         gpio_matrix_out(pin->pin_number, pin->af_out, false, false);
+        // clear the Tx FIFO empty flag
+        self->uart_reg->int_clr.tx_done = 1;
+
+        isrmask = MICROPY_BEGIN_ATOMIC_SECTION();
     }
 
     for (const char *top = str + len; str < top; str++) {
@@ -164,15 +168,17 @@ bool uart_tx_strn(mach_uart_obj_t *self, const char *str, uint len) {
     }
 
     if (self->n_pins == 1) {
-        pin_obj_t * pin = (pin_obj_t *)((mp_obj_t *)self->pins)[0];
-
         // wait for the TX FIFO to be empty
-        uart_wait_tx_done(self->uart_id, portMAX_DELAY);
+        while (!self->uart_reg->int_raw.tx_done) {
+            ets_delay_us(1);
+        }
 
         // make it an input again
         pin_deassign(pin);
         pin->af_in = mach_uart_pin_af[self->uart_id][1];
-        pin_config(pin, pin->af_in, -1, GPIO_MODE_INPUT, MACHPIN_PULL_UP, 1);
+        gpio_matrix_in(pin->pin_number, pin->af_in, false);
+        MICROPY_END_ATOMIC_SECTION(isrmask);
+        self->uart_reg->int_clr.tx_done = 1;
     }
 
     return ret;
@@ -485,6 +491,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mach_uart_any_obj, mach_uart_any);
 
 STATIC mp_obj_t mach_uart_sendbreak(mp_obj_t self_in, mp_obj_t bits) {
     mach_uart_obj_t *self = self_in;
+    pin_obj_t * pin = (pin_obj_t *)((mp_obj_t *)self->pins)[0];
 
     uint32_t isrmask = MICROPY_BEGIN_ATOMIC_SECTION();
 
@@ -493,7 +500,6 @@ STATIC mp_obj_t mach_uart_sendbreak(mp_obj_t self_in, mp_obj_t bits) {
         uint32_t delay = (((mp_obj_get_int(bits) + 1) * 1000000) / self->config.baud_rate) & 0x7FFF;
 
         if (self->n_pins == 1) {
-            pin_obj_t * pin = (pin_obj_t *)((mp_obj_t *)self->pins)[0];
             // make it UART Tx
             pin->value = 1;
             pin_deassign(pin);
@@ -507,7 +513,6 @@ STATIC mp_obj_t mach_uart_sendbreak(mp_obj_t self_in, mp_obj_t bits) {
         WRITE_PERI_REG(UART_CONF0_REG(self->uart_id), READ_PERI_REG(UART_CONF0_REG(self->uart_id)) & (~UART_TXD_INV));
 
         if (self->n_pins == 1) {
-            pin_obj_t * pin = (pin_obj_t *)((mp_obj_t *)self->pins)[0];
             // make it an input again
             pin_deassign(pin);
             pin->af_in = mach_uart_pin_af[self->uart_id][1];
 
@@ -10,7 +10,7 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#define SW_VERSION_NUMBER                              "1.10.1.b1"
+#define SW_VERSION_NUMBER                              "1.10.2.b1"
 
 #define LORAWAN_VERSION_NUMBER                         "1.0.0"