From 14246d2c62e4e2dc3301bc0498330b1db0d7a3b9 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Mon, 17 Nov 2025 17:58:10 +0100 Subject: [PATCH] switch from std fmt to fmt lib --- CMakeLists.txt | 2 +- libs/modbus.cpp | 2 +- libs/mqtt_client.cpp | 2 +- services/floorheat_svc/temperature_controller.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e78aa7..fb3d683 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ set(BOOST_ROOT /usr/local/boost-1.89) find_package(Boost 1.89 REQUIRED COMPONENTS json mqtt5) # spdlog -set(SPDLOG_USE_STD_FORMAT ON) +set(SPDLOG_USE_STD_FORMAT OFF) FetchContent_Declare( spdlog GIT_REPOSITORY https://github.com/gabime/spdlog diff --git a/libs/modbus.cpp b/libs/modbus.cpp index f238dae..e3f2c24 100644 --- a/libs/modbus.cpp +++ b/libs/modbus.cpp @@ -67,7 +67,7 @@ awaitable_expected< void > ranczo::ModbusTcpContext::wait_between_commands() { // Jeśli timer ma expiry w przyszłości – czekamy if(expiry > now) { boost::system::error_code ec; - spdlog::trace("Timer waits {%f.02}us to expire time between ", + spdlog::trace("Timer waits {:.2f}us to expire time between ", std::chrono::duration_cast< std::chrono::duration< double, std::micro > >(expiry - now).count()); co_await delay_timer_.async_wait(asio::redirect_error(asio::use_awaitable, ec)); diff --git a/libs/mqtt_client.cpp b/libs/mqtt_client.cpp index f434c67..1a3efee 100644 --- a/libs/mqtt_client.cpp +++ b/libs/mqtt_client.cpp @@ -152,7 +152,7 @@ struct AsyncMqttClient::AsyncMqttClientImpl { if(ec) { spdlog::error("MQTT subscribe error: {}", ec.message()); for(int i{}; i < sub_codes.size(); i++) - spdlog::error("MQTT subscribe suberror[{}]: {}", sub_codes[i].message()); + spdlog::error("MQTT subscribe suberror[{}]: {}", i, sub_codes[i].message()); co_return std::unexpected{ec}; } diff --git a/services/floorheat_svc/temperature_controller.cpp b/services/floorheat_svc/temperature_controller.cpp index 26d4bf4..0460a16 100644 --- a/services/floorheat_svc/temperature_controller.cpp +++ b/services/floorheat_svc/temperature_controller.cpp @@ -697,7 +697,7 @@ struct RelayThermostat::Impl : private boost::noncopyable { } awaitable_expected< void > handle_command(const commands::SlopeWindowChange & cmd) { - spdlog::info("Heater slope window update {}ns for {}/{}", cmd.window, _room, _zone); + spdlog::info("Heater slope window update {}ns for {}/{}", cmd.window.count(), _room, _zone); _slopeWindow = cmd.window; co_return _void{}; }