diff options
| -rw-r--r-- | src/Xmobar/Plugins/Monitors.hs | 5 | ||||
| -rw-r--r-- | src/Xmobar/Plugins/Monitors/K10Temp.hs | 43 | ||||
| -rw-r--r-- | xmobar.cabal | 1 |
3 files changed, 49 insertions, 0 deletions
diff --git a/src/Xmobar/Plugins/Monitors.hs b/src/Xmobar/Plugins/Monitors.hs index 594065c..13e5694 100644 --- a/src/Xmobar/Plugins/Monitors.hs +++ b/src/Xmobar/Plugins/Monitors.hs @@ -35,6 +35,7 @@ import Xmobar.Plugins.Monitors.ThermalZone import Xmobar.Plugins.Monitors.CpuFreq import Xmobar.Plugins.Monitors.CoreTemp import Xmobar.Plugins.Monitors.MultiCoreTemp +import Xmobar.Plugins.Monitors.K10Temp import Xmobar.Plugins.Monitors.Disk import Xmobar.Plugins.Monitors.Top import Xmobar.Plugins.Monitors.Uptime @@ -74,6 +75,7 @@ data Monitors = Network Interface Args Rate | CpuFreq Args Rate | CoreTemp Args Rate | MultiCoreTemp Args Rate + | K10Temp Slot Args Rate | TopProc Args Rate | TopMem Args Rate | Uptime Args Rate @@ -113,6 +115,7 @@ type ZoneNo = Int type Interface = String type Rate = Int type DiskSpec = [(String, String)] +type Slot = String instance Exec Monitors where #ifdef WEATHER @@ -136,6 +139,7 @@ instance Exec Monitors where alias (TopMem _ _) = "topmem" alias (CoreTemp _ _) = "coretemp" alias (MultiCoreTemp _ _) = "multicoretemp" + alias (K10Temp _ _ _) = "k10temp" alias DiskU {} = "disku" alias DiskIO {} = "diskio" alias (Uptime _ _) = "uptime" @@ -181,6 +185,7 @@ instance Exec Monitors where start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r start (MultiCoreTemp a r) = startMultiCoreTemp a r + start (K10Temp s a r) = runM (a ++ [s]) k10TempConfig runK10Temp r start (DiskU s a r) = runM a diskUConfig (runDiskU s) r start (DiskIO s a r) = startDiskIO s a r start (Uptime a r) = runM a uptimeConfig runUptime r diff --git a/src/Xmobar/Plugins/Monitors/K10Temp.hs b/src/Xmobar/Plugins/Monitors/K10Temp.hs new file mode 100644 index 0000000..ea2856d --- /dev/null +++ b/src/Xmobar/Plugins/Monitors/K10Temp.hs @@ -0,0 +1,43 @@ +----------------------------------------------------------------------------- +-- | +-- Module : Plugins.Monitors.CoreTemp +-- Copyright : (c) Juraj Hercek +-- License : BSD-style (see LICENSE) +-- +-- Maintainer : Juraj Hercek <juhe_haskell@hck.sk> +-- Stability : unstable +-- Portability : unportable +-- +-- A temperature monitor that works with AMD CPUs for Xmobar +-- +----------------------------------------------------------------------------- + +module Xmobar.Plugins.Monitors.K10Temp where + +import Xmobar.Plugins.Monitors.Common + +import Data.Char (isDigit) + +-- | +-- K10 temperature default configuration. Default template contains only the +-- die temperature, user should specify custom template in order to get more +-- ccd or IO die temperatures. +k10TempConfig :: IO MConfig +k10TempConfig = mkMConfig + "Temp: <Tdie>C" -- template + ["Tctl", "Tdie", "Tccd1", "Tccd2", "Tccd3" + ,"Tccd4", "Tccd5", "Tccd6", "Tccd7", "Tccd8" + ] -- available replacements + +-- | +-- Function retrieves monitor string holding the temperature +-- (or temperatures) +runK10Temp :: [String] -> Monitor String +runK10Temp args = do + dn <- getConfigValue decDigits + failureMessage <- getConfigValue naString + let slot = head args + path = ["/sys/bus/pci/drivers/k10temp/" ++ slot ++ "/hwmon/hwmon", "/temp", "_input"] + divisor = 1e3 :: Double + show' = showDigits (max 0 dn) + checkedDataRetrieval failureMessage [path] Nothing (/divisor) show' diff --git a/xmobar.cabal b/xmobar.cabal index 87916f5..959d499 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -149,6 +149,7 @@ library Xmobar.Plugins.Monitors.Common.Parsers, Xmobar.Plugins.Monitors.Common.Files, Xmobar.Plugins.Monitors.CoreTemp, + Xmobar.Plugins.Monitors.K10Temp, Xmobar.Plugins.Monitors.CpuFreq, Xmobar.Plugins.Monitors.Disk, Xmobar.Plugins.Monitors.Mem, |