From 2301de667b530d3e7ed2cf3d92f85fe2efcfd54a Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Mon, 14 Nov 2016 17:56:29 +0100 Subject: [PATCH] fix(temperature): Calculate percentage value --- include/modules/temperature.hpp | 1 + src/modules/temperature.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/modules/temperature.hpp b/include/modules/temperature.hpp index a6bb0107..442a2c76 100644 --- a/include/modules/temperature.hpp +++ b/include/modules/temperature.hpp @@ -34,6 +34,7 @@ namespace modules { int m_zone = 0; int m_tempwarn = 0; int m_temp = 0; + int m_perc = 0; }; } diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp index 4b18ef8a..26a546c8 100644 --- a/src/modules/temperature.cpp +++ b/src/modules/temperature.cpp @@ -28,6 +28,7 @@ namespace modules { bool temperature_module::update() { m_temp = std::atoi(file_util::get_contents(m_path).c_str()) / 1000.0f + 0.5f; + m_perc = math_util::cap(math_util::percentage(m_temp, 0, m_tempwarn), 0, 100); const auto replace_tokens = [&](label_t& label) { label->reset_tokens(); @@ -55,7 +56,7 @@ namespace modules { else if (tag == TAG_LABEL_WARN) builder->node(m_label.at(temp_state::WARN)); else if (tag == TAG_RAMP) - builder->node(m_ramp->get_by_percentage(math_util::cap(m_temp, 0, m_tempwarn))); + builder->node(m_ramp->get_by_percentage(m_perc)); else return false; return true;