Fix enable Update partition

Author: me-no-dev

cores/esp32/esp32-hal-uart.c

@@ -56,8 +56,9 @@ static uart_t _uart_bus_array[3] ={
 {(volatileuart_dev_t*)(DR_REG_UART2_BASE), 2, NULL}
 };
 #else
-#defineUART_MUTEX_LOCK() do{} while (xSemaphoreTake(uart->lock, portMAX_DELAY) != pdPASS)
-#defineUART_MUTEX_UNLOCK() xSemaphoreGive(uart->lock)
+staticBaseType_t_pxHigherPriorityTaskWoken_=pdFALSE;
+#defineUART_MUTEX_LOCK() do{} while (xSemaphoreTakeFromISR(uart->lock, &_pxHigherPriorityTaskWoken_) != pdPASS)
+#defineUART_MUTEX_UNLOCK() xSemaphoreGiveFromISR(uart->lock, &_pxHigherPriorityTaskWoken_)
 
 staticuart_t_uart_bus_array[3] ={
 {(volatileuart_dev_t*)(DR_REG_UART_BASE), NULL, 0, NULL},
@@ -377,9 +378,10 @@ int log_printf(const char *format, ...)
 if(s_uart_debug_nr<0){
 return0;
  }
-staticcharloc_buf[64];
+charloc_buf[64];
 char*temp=loc_buf;
-intlen;
+intlen, i;
+void (*put_char)(char) =NULL;
 va_listarg;
 va_listcopy;
 va_start(arg, format);
@@ -392,17 +394,37 @@ int log_printf(const char *format, ...)
 return0;
  }
  }
+
+switch(s_uart_debug_nr){
+case0:
+put_char=&uart0_write_char;
+break;
+case1:
+put_char=&uart1_write_char;
+break;
+case2:
+put_char=&uart2_write_char;
+break;
+default:
+return0;
+ }
 vsnprintf(temp, len+1, format, arg);
 #if !CONFIG_DISABLE_HAL_LOCKS
 if(_uart_bus_array[s_uart_debug_nr].lock){
-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);
+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_);
  } else{
-ets_printf("%s", temp);
+for(i=0;i<len;i++){
+put_char(temp[i]);
+ }
  }
 #else
-ets_printf("%s", temp);
+for(i=0;i<len;i++){
+put_char(temp[i]);
+ }
 #endif
 va_end(arg);
 if(len>64){

libraries/Update/src/Updater.cpp

@@ -209,7 +209,7 @@ bool UpdateClass::_verifyHeader(uint8_t data){
 
 boolUpdateClass::_verifyEnd(){
 if(_command == U_FLASH){
-if(!_enablePartition || !_partitionIsBootable(_partition)){
+if(!_enablePartition(_partition) || !_partitionIsBootable(_partition)){
 _abort(UPDATE_ERROR_READ);
 returnfalse;
  }