sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-05 21:02:20 +01:00
Code Issues Releases Wiki Activity

simplify if/def

Browse Source
This commit is contained in:
Tomasz Duda
2024-02-03 01:32:35 +01:00
parent 4851d68a46
commit 252e324390
2 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
esphome/components/logger/logger.h
View File

@@ -34,18 +34,13 @@ enum UARTSelection {
#ifdef USE_LIBRETINY #ifdef USE_LIBRETINY
UART_SELECTION_DEFAULT = 0, UART_SELECTION_DEFAULT = 0,
UART_SELECTION_UART0, UART_SELECTION_UART0,
UART_SELECTION_UART1,
UART_SELECTION_UART2,
#else #else
UART_SELECTION_UART0 = 0, UART_SELECTION_UART0 = 0,
#endif
UART_SELECTION_UART1, UART_SELECTION_UART1,
#if defined(USE_ESP32) #if defined(USE_LIBRETINY) && defined(USE_ESP32_VARIANT_ESP32)
#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32C6) && \
!defined(USE_ESP32_VARIANT_ESP32S2) && !defined(USE_ESP32_VARIANT_ESP32S3) && !defined(USE_ESP32_VARIANT_ESP32H2)
UART_SELECTION_UART2, UART_SELECTION_UART2,
#endif // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32C6 && !USE_ESP32_VARIANT_ESP32S2 && #endif
// !USE_ESP32_VARIANT_ESP32S3 && !USE_ESP32_VARIANT_ESP32H2
#endif // USE_ESP32
#ifdef USE_USB_CDC #ifdef USE_USB_CDC
UART_SELECTION_USB_CDC, UART_SELECTION_USB_CDC,
#endif #endif
@@ -55,8 +50,6 @@ enum UARTSelection {
#ifdef USE_ESP8266 #ifdef USE_ESP8266
UART_SELECTION_UART0_SWAP, UART_SELECTION_UART0_SWAP,
#endif // USE_ESP8266 #endif // USE_ESP8266
#endif // USE_LIBRETINY
}; };
#endif // USE_ESP32 || USE_ESP8266 || USE_RP2040 || USE_LIBRETINY #endif // USE_ESP32 || USE_ESP8266 || USE_RP2040 || USE_LIBRETINY

23
esphome/components/logger/logger_esp32.cpp
View File

@@ -8,8 +8,7 @@
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
#include <driver/uart.h> #include <driver/uart.h>
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3) || \ #ifdef USE_USB_SERIAL_JTAG
defined(USE_ESP32_VARIANT_ESP32H2)
#include <driver/usb_serial_jtag.h> #include <driver/usb_serial_jtag.h>
#include <esp_vfs_dev.h> #include <esp_vfs_dev.h>
#include <esp_vfs_usb_serial_jtag.h> #include <esp_vfs_usb_serial_jtag.h>
@@ -33,8 +32,7 @@ static const char *const TAG = "logger";
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3) || \ #ifdef USE_USB_SERIAL_JTAG
defined(USE_ESP32_VARIANT_ESP32H2)
static void init_usb_serial_jtag_() { static void init_usb_serial_jtag_() {
setvbuf(stdin, NULL, _IONBF, 0); // Disable buffering on stdin setvbuf(stdin, NULL, _IONBF, 0); // Disable buffering on stdin
@@ -98,8 +96,7 @@ void Logger::pre_setup() {
this->hw_serial_ = &Serial1; this->hw_serial_ = &Serial1;
Serial1.begin(this->baud_rate_); Serial1.begin(this->baud_rate_);
break; break;
#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32C6) && \ #ifdef USE_ESP32_VARIANT_ESP32
!defined(USE_ESP32_VARIANT_ESP32S2) && !defined(USE_ESP32_VARIANT_ESP32S3)
case UART_SELECTION_UART2: case UART_SELECTION_UART2:
this->hw_serial_ = &Serial2; this->hw_serial_ = &Serial2;
Serial2.begin(this->baud_rate_); Serial2.begin(this->baud_rate_);
@@ -127,18 +124,16 @@ void Logger::pre_setup() {
case UART_SELECTION_UART1: case UART_SELECTION_UART1:
this->uart_num_ = UART_NUM_1; this->uart_num_ = UART_NUM_1;
break; break;
#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32C6) && \ #ifdef USE_ESP32_VARIANT_ESP32
!defined(USE_ESP32_VARIANT_ESP32S2) && !defined(USE_ESP32_VARIANT_ESP32S3) && !defined(USE_ESP32_VARIANT_ESP32H2)
case UART_SELECTION_UART2: case UART_SELECTION_UART2:
this->uart_num_ = UART_NUM_2; this->uart_num_ = UART_NUM_2;
break; break;
#endif // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32S2 && !USE_ESP32_VARIANT_ESP32S3 && #endif
// !USE_ESP32_VARIANT_ESP32H2
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) #if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
case UART_SELECTION_USB_CDC: case UART_SELECTION_USB_CDC:
this->uart_num_ = -1; this->uart_num_ = -1;
break; break;
#endif // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3 #endif
#ifdef USE_USB_SERIAL_JTAG #ifdef USE_USB_SERIAL_JTAG
case UART_SELECTION_USB_SERIAL_JTAG: case UART_SELECTION_USB_SERIAL_JTAG:
this->uart_num_ = -1; this->uart_num_ = -1;
@@ -165,11 +160,9 @@ void Logger::pre_setup() {
const char *const UART_SELECTIONS[] = { const char *const UART_SELECTIONS[] = {
"UART0", "UART1", "UART0", "UART1",
#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32C6) && \ #ifdef USE_ESP32_VARIANT_ESP32
!defined(USE_ESP32_VARIANT_ESP32S2) && !defined(USE_ESP32_VARIANT_ESP32S3) && !defined(USE_ESP32_VARIANT_ESP32H2)
"UART2", "UART2",
#endif // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARINT_ESP32C6 && !USE_ESP32_VARIANT_ESP32S2 && #endif
// !USE_ESP32_VARIANT_ESP32S3 && !USE_ESP32_VARIANT_ESP32H2
#ifdef USE_USB_CDC #ifdef USE_USB_CDC
"USB_CDC", "USB_CDC",
#endif #endif