joeybab3
diff --git a/‎cores/esp32/esp32-hal-uart.c
Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-uart.c
+9-31Lines changed: 9 additions & 31 deletions b/‎cores/esp32/esp32-hal-uart.c
Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-uart.c
+9-31Lines changed: 9 additions & 31 deletions
diff --git a/‎libraries/Update/src/Updater.cpp
Copy file name to clipboardExpand all lines: libraries/Update/src/Updater.cpp
+1-1Lines changed: 1 addition & 1 deletion b/‎libraries/Update/src/Updater.cpp
Copy file name to clipboardExpand all lines: libraries/Update/src/Updater.cpp
+1-1Lines changed: 1 addition & 1 deletion
@@ -56,9 +56,8 @@ static uart_t _uart_bus_array[3] = {
     {(volatile uart_dev_t *)(DR_REG_UART2_BASE), 2, NULL}
 };
 #else
-static BaseType_t _pxHigherPriorityTaskWoken_ = pdFALSE;
-#define UART_MUTEX_LOCK()    do {} while (xSemaphoreTakeFromISR(uart->lock, &_pxHigherPriorityTaskWoken_) != pdPASS)
-#define UART_MUTEX_UNLOCK()  xSemaphoreGiveFromISR(uart->lock, &_pxHigherPriorityTaskWoken_)
+#define UART_MUTEX_LOCK()    do {} while (xSemaphoreTake(uart->lock, portMAX_DELAY) != pdPASS)
+#define UART_MUTEX_UNLOCK()  xSemaphoreGive(uart->lock)
 
 static uart_t _uart_bus_array[3] = {
     {(volatile uart_dev_t *)(DR_REG_UART_BASE), NULL, 0, NULL},
@@ -378,10 +377,9 @@ int log_printf(const char *format, ...)
     if(s_uart_debug_nr < 0){
         return 0;
     }
-    char loc_buf[64];
+    static char loc_buf[64];
     char * temp = loc_buf;
-    int len, i;
-    void (* put_char)(char) = NULL;
+    int len;
     va_list arg;
     va_list copy;
     va_start(arg, format);
@@ -394,37 +392,17 @@ int log_printf(const char *format, ...)
             return 0;
         }
     }
-
-    switch(s_uart_debug_nr) {
-    case 0:
-        put_char = &uart0_write_char;
-        break;
-    case 1:
-        put_char = &uart1_write_char;
-        break;
-    case 2:
-        put_char = &uart2_write_char;
-        break;
-    default:
-        return 0;
-    }
     vsnprintf(temp, len+1, format, arg);
 #if !CONFIG_DISABLE_HAL_LOCKS
     if(_uart_bus_array[s_uart_debug_nr].lock){
-        while (xSemaphoreTakeFromISR(_uart_bus_array[s_uart_debug_nr].lock, &_pxHigherPriorityTaskWoken_) != pdPASS);
-        for(i=0;i<len;i++){
-            put_char(temp[i]);
-        }
-        xSemaphoreGiveFromISR(_uart_bus_array[s_uart_debug_nr].lock, &_pxHigherPriorityTaskWoken_);
+        while (xSemaphoreTake(_uart_bus_array[s_uart_debug_nr].lock, portMAX_DELAY) != pdPASS);
+        ets_printf("%s", temp);
+        xSemaphoreGive(_uart_bus_array[s_uart_debug_nr].lock);
     } else {
-        for(i=0;i<len;i++){
-            put_char(temp[i]);
-        }
+        ets_printf("%s", temp);
     }
 #else
-    for(i=0;i<len;i++){
-        put_char(temp[i]);
-    }
+    ets_printf("%s", temp);
 #endif
     va_end(arg);
     if(len > 64){
 
@@ -209,7 +209,7 @@ bool UpdateClass::_verifyHeader(uint8_t data) {
 
 bool UpdateClass::_verifyEnd() {
     if(_command == U_FLASH) {
-        if(!_enablePartition(_partition) || !_partitionIsBootable(_partition)) {
+        if(!_enablePartition || !_partitionIsBootable(_partition)) {
             _abort(UPDATE_ERROR_READ);
             return false;
         }
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ bool UpdateClass::_verifyHeader(uint8_t data) {`
`209`	`209`
`210`	`210`	`bool UpdateClass::_verifyEnd() {`
`211`	`211`	`if(_command == U_FLASH) {`
`212`		`- if(!_enablePartition(_partition) \|\| !_partitionIsBootable(_partition)) {`
	`212`	`+ if(!_enablePartition \|\| !_partitionIsBootable(_partition)) {`
`213`	`213`	`_abort(UPDATE_ERROR_READ);`
`214`	`214`	`return false;`
`215`	`215`	`}`