From f2b7dee8bd9a83a03cb10c68ec769179bbe5bf18 Mon Sep 17 00:00:00 2001 From: Tony Date: Sat, 16 May 2026 10:25:20 +0800 Subject: [PATCH] fix(gateway): improve TP-UART configuration logging and handling for ETS device states Signed-off-by: Tony --- components/gateway_knx/src/gateway_knx.cpp | 18 +++++++----------- knx | 2 +- tpuart | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/components/gateway_knx/src/gateway_knx.cpp b/components/gateway_knx/src/gateway_knx.cpp index d2966b4..8333981 100644 --- a/components/gateway_knx/src/gateway_knx.cpp +++ b/components/gateway_knx/src/gateway_knx.cpp @@ -2922,17 +2922,13 @@ bool GatewayKnxTpIpRouter::configureTpUart() { std::to_string(config_.tp_uart.uart_port) + " tx=" + UartPinDescription(config_.tp_uart.tx_pin, tp_uart_tx_pin_) + " rx=" + UartPinDescription(config_.tp_uart.rx_pin, tp_uart_rx_pin_); - if (ets_device_ != nullptr && !ets_device_->configured()) { - ESP_LOGW(kTag, - "%s; continuing KNXnet/IP in commissioning-only IP mode so ETS can program the " - "device", - last_error_.c_str()); - tp_uart_port_ = -1; - tp_uart_online_ = false; - return true; - } - ESP_LOGE(kTag, "%s", last_error_.c_str()); - return false; + const bool configured = ets_device_ != nullptr && ets_device_->configured(); + ESP_LOGW(kTag, + "%s; continuing KNXnet/IP in %s IP mode while TP-UART stays offline", + last_error_.c_str(), configured ? "configured" : "commissioning-only"); + tp_uart_port_ = -1; + tp_uart_online_ = false; + return true; } const TickType_t startup_elapsed_ticks = xTaskGetTickCount() - startup_begin_tick; if (startup_elapsed_ticks > 0) { diff --git a/knx b/knx index c39e8cf..51bb6cd 160000 --- a/knx +++ b/knx @@ -1 +1 @@ -Subproject commit c39e8cfc55e7de3519e0198cb5cce3c9b174d284 +Subproject commit 51bb6cdf6a92e93ae38190a15f0e9a288fb9d1d9 diff --git a/tpuart b/tpuart index 0dd32a4..7510e61 160000 --- a/tpuart +++ b/tpuart @@ -1 +1 @@ -Subproject commit 0dd32a4246cb6a7a254239377aac03072a6bf571 +Subproject commit 7510e616f970942d11ca60a9873e45069f4c28d0