From 39866a88a60c68bc52765b88f973461b6a91f138 Mon Sep 17 00:00:00 2001 From: Ada Joule Date: Sat, 3 Feb 2018 16:07:03 +0700 Subject: Make CpuFreq use MHz unit when suffix is false --- src/Plugins/Monitors/CpuFreq.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Plugins/Monitors/CpuFreq.hs b/src/Plugins/Monitors/CpuFreq.hs index e6ce07d..b5ee461 100644 --- a/src/Plugins/Monitors/CpuFreq.hs +++ b/src/Plugins/Monitors/CpuFreq.hs @@ -35,8 +35,9 @@ runCpuFreq _ = do ddigits <- getConfigValue decDigits let path = ["/sys/devices/system/cpu/cpu", "/cpufreq/scaling_cur_freq"] divisor = 1e6 :: Double - fmt x | x < 1 = show (round (x * 1000) :: Integer) ++ + fmt x | x < 1 = mhzFmt x ++ if suffix then "MHz" else "" - | otherwise = showDigits ddigits x ++ if suffix then "GHz" else "" + | otherwise = if suffix then showDigits ddigits x ++ "GHz" else mhzFmt x + mhzFmt x = show (round (x * 1000) :: Integer) failureMessage <- getConfigValue naString checkedDataRetrieval failureMessage [path] Nothing (/divisor) fmt -- cgit v1.2.3