mirror of
				https://github.com/esphome/esphome.git
				synced 2025-11-04 09:01:49 +00:00 
			
		
		
		
	Merge branch 'integration' into memory_api
This commit is contained in:
		@@ -35,9 +35,12 @@ const LogString *Logger::get_uart_selection_() {
 | 
			
		||||
      return LOG_STR("UART0");
 | 
			
		||||
    case UART_SELECTION_UART1:
 | 
			
		||||
      return LOG_STR("UART1");
 | 
			
		||||
#ifdef USE_LOGGER_USB_CDC
 | 
			
		||||
    case UART_SELECTION_USB_CDC:
 | 
			
		||||
    default:
 | 
			
		||||
      return LOG_STR("USB_CDC");
 | 
			
		||||
#endif
 | 
			
		||||
    default:
 | 
			
		||||
      return LOG_STR("UNKNOWN");
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -83,9 +83,12 @@ const LogString *Logger::get_uart_selection_() {
 | 
			
		||||
      return LOG_STR("UART0");
 | 
			
		||||
    case UART_SELECTION_UART1:
 | 
			
		||||
      return LOG_STR("UART1");
 | 
			
		||||
#ifdef USE_LOGGER_USB_CDC
 | 
			
		||||
    case UART_SELECTION_USB_CDC:
 | 
			
		||||
    default:
 | 
			
		||||
      return LOG_STR("USB_CDC");
 | 
			
		||||
#endif
 | 
			
		||||
    default:
 | 
			
		||||
      return LOG_STR("UNKNOWN");
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user