From 602cef87600437a6812b399e0a443bf68847fa95 Mon Sep 17 00:00:00 2001 From: CS Adnan Date: Mon, 25 Oct 2021 00:17:54 +0600 Subject: [PATCH 1/2] add support for AMD Ryzen 5000 temp sensor --- src/linux/btop_collect.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/linux/btop_collect.cpp b/src/linux/btop_collect.cpp index 2a5a31d..dee61e6 100644 --- a/src/linux/btop_collect.cpp +++ b/src/linux/btop_collect.cpp @@ -317,6 +317,11 @@ namespace Cpu { cpu_sensor = name; break; } + if (s_contains(str_to_lower(name), "k10temp")) { + Logger::warning("Using k10temp sensors for AMD."); + cpu_sensor = name; + break; + } } if (cpu_sensor.empty()) { cpu_sensor = found_sensors.begin()->first; From 73a0ad73c0c59c8dc942b92917ae0af3f32b131e Mon Sep 17 00:00:00 2001 From: CS Adnan Date: Tue, 26 Oct 2021 11:26:52 +0600 Subject: [PATCH 2/2] remove log warning + extra if for k10temp --- src/linux/btop_collect.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/linux/btop_collect.cpp b/src/linux/btop_collect.cpp index dee61e6..761e7e4 100644 --- a/src/linux/btop_collect.cpp +++ b/src/linux/btop_collect.cpp @@ -313,12 +313,7 @@ namespace Cpu { if (not got_coretemp or core_sensors.empty()) cpu_temp_only = true; if (cpu_sensor.empty() and not found_sensors.empty()) { for (const auto& [name, sensor] : found_sensors) { - if (s_contains(str_to_lower(name), "cpu")) { - cpu_sensor = name; - break; - } - if (s_contains(str_to_lower(name), "k10temp")) { - Logger::warning("Using k10temp sensors for AMD."); + if (s_contains(str_to_lower(name), "cpu") or s_contains(str_to_lower(name), "k10temp")) { cpu_sensor = name; break; }