From 0ae99f9b245b85cfa41e0b111b58d78428fb5e63 Mon Sep 17 00:00:00 2001 From: Jordan Zucker Date: Thu, 13 Feb 2025 15:00:48 -0800 Subject: [PATCH] Again --- esphome/components/prometheus/prometheus_handler.cpp | 10 +++++----- esphome/components/prometheus/prometheus_handler.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/esphome/components/prometheus/prometheus_handler.cpp b/esphome/components/prometheus/prometheus_handler.cpp index 19ddda4c46..6e74b83916 100644 --- a/esphome/components/prometheus/prometheus_handler.cpp +++ b/esphome/components/prometheus/prometheus_handler.cpp @@ -841,8 +841,8 @@ void PrometheusHandler::climate_type_(AsyncResponseStream *stream) { } void PrometheusHandler::climate_setting_row_(AsyncResponseStream *stream, climate::Climate *obj, std::string &area, - std::string &node, std::string &friendly_name, std::string &category, - std::string &climate_value) { + std::string &node, std::string &friendly_name, std::string &setting, + const LogString &setting_value) { stream->print(F("esphome_climate_setting{id=\"")); stream->print(relabel_id_(obj).c_str()); add_area_label_(stream, area); @@ -851,9 +851,9 @@ void PrometheusHandler::climate_setting_row_(AsyncResponseStream *stream, climat stream->print(F("\",name=\"")); stream->print(relabel_name_(obj).c_str()); stream->print(F("\",category=\"")); - stream->print(category.c_str()); + stream->print(setting.c_str()); stream->print(F("\",value=\"")); - stream->print(LOG_STR_ARG(climate::climate_mode_to_string(obj->mode))); + stream->print(LOG_STR_ARG(setting_value)); stream->print(F("\"} ")); stream->print(F("1.0")); stream->print(F("\n")); @@ -890,7 +890,7 @@ void PrometheusHandler::climate_row_(AsyncResponseStream *stream, climate::Clima stream->print(F("\"} 0\n")); // Data itself std::string climate_mode_category = "mode"; - auto climate_mode_value = LOG_STR_ARG(climate::climate_mode_to_string(obj->mode)); + auto climate_mode_value = climate::climate_mode_to_string(obj->mode); climate_setting_row_(stream, obj, area, node, friendly_name, climate_mode_category, climate_mode_value); // stream->print(F("esphome_climate_setting{id=\"")); // stream->print(relabel_id_(obj).c_str()); diff --git a/esphome/components/prometheus/prometheus_handler.h b/esphome/components/prometheus/prometheus_handler.h index 38f56046cb..8a1c29d6dc 100644 --- a/esphome/components/prometheus/prometheus_handler.h +++ b/esphome/components/prometheus/prometheus_handler.h @@ -176,7 +176,7 @@ class PrometheusHandler : public AsyncWebHandler, public Component { void climate_row_(AsyncResponseStream *stream, climate::Climate *obj, std::string &area, std::string &node, std::string &friendly_name); void climate_setting_row_(AsyncResponseStream *stream, climate::Climate *obj, std::string &area, std::string &node, - std::string &friendly_name, std::string &category, std::string &climate_value); + std::string &friendly_name, std::string &setting, const LogString &setting_value); void climate_value_row_(AsyncResponseStream *stream, climate::Climate *obj, std::string &area, std::string &node, std::string &friendly_name, std::string &category, std::string &climate_value); #endif