From ea3ea196aa6e1e5b9fc17025f49d2e5d73f5a3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 5 Jan 2024 10:56:45 +0800 Subject: [PATCH] Battery (Linux): simplify temp detection --- src/detection/battery/battery_linux.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c index d37f174d5..fb6967dce 100644 --- a/src/detection/battery/battery_linux.c +++ b/src/detection/battery/battery_linux.c @@ -86,16 +86,10 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option result->temperature = FF_BATTERY_TEMP_UNSET; if (options->temp) { - const FFlist* tempsResult = ffDetectTemps(); - - FF_LIST_FOR_EACH(FFTempValue, value, *tempsResult) - { - if (ffStrbufEqualS(&value->deviceName, id)) - { - result->temperature = value->value; - break; - } - } + ffStrbufAppendS(dir, "/temp"); + if (ffReadFileBuffer(dir->chars, &tmpBuffer)) + options->temp = ffStrbufToDouble(&tmpBuffer) / 10; + ffStrbufSubstrBefore(dir, dirLength); } }