Adjusted thermal monitor.

  - Thermal monitor can handle more thermal zones now

darcs-hash:20071222231039-f49a6-0a8a2f7d575f7e82adbd9b3ee261d046e616dc07.gz

2 files changed, 8 insertions, 6 deletions

diff --git a/Plugins/Monitors.hs b/Plugins/Monitors.hs
index 553862b..5be6057 100644
--- a/Plugins/Monitors.hs
+++ b/Plugins/Monitors.hs
@@ -33,7 +33,7 @@ data Monitors = Weather Station Args Rate
               | Swap Args Rate
               | Cpu Args Rate
               | Battery Args Rate
-              | Thermal Args Rate
+              | Thermal Zone Args Rate
               | CpuFreq Args Rate
               | CoreTemp Args Rate
                 deriving (Show,Read,Eq)
@@ -42,25 +42,26 @@ type Args      = [String]
 type Program   = String
 type Alias     = String
 type Station   = String
+type Zone      = String
 type Interface = String
 type Rate      = Int
 
 instance Exec Monitors where
     alias (Weather s _ _) = s
     alias (Network i _ _) = i
+    alias (Thermal z _ _) = z
     alias (Memory    _ _) = "memory"
     alias (Swap      _ _) = "swap"
     alias (Cpu       _ _) = "cpu"
     alias (Battery   _ _) = "battery"
-    alias (Thermal   _ _) = "thermal"
     alias (CpuFreq   _ _) = "cpufreq"
     alias (CoreTemp  _ _) = "coretemp"
     start (Weather s a r) = runM (a ++ [s]) weatherConfig  runWeather  r
     start (Network i a r) = runM (a ++ [i]) netConfig      runNet      r
+    start (Thermal z a r) = runM (a ++ [z]) thermalConfig  runThermal  r
     start (Memory    a r) = runM a          memConfig      runMem      r
     start (Swap      a r) = runM a          swapConfig     runSwap     r
     start (Cpu       a r) = runM a          cpuConfig      runCpu      r
     start (Battery   a r) = runM a          battConfig     runBatt     r
-    start (Thermal   a r) = runM a          thermalConfig  runThermal  r
     start (CpuFreq   a r) = runM a          cpuFreqConfig  runCpuFreq  r
     start (CoreTemp  a r) = runM a          coreTempConfig runCoreTemp r
diff --git a/Plugins/Monitors/Thermal.hs b/Plugins/Monitors/Thermal.hs
index 2794a60..4814aa5 100644
--- a/Plugins/Monitors/Thermal.hs
+++ b/Plugins/Monitors/Thermal.hs
@@ -24,11 +24,12 @@ thermalConfig = mkMConfig
        ["temp"]       -- available replacements
 
 runThermal :: [String] -> Monitor String
-runThermal _ = do
-    let file = "/proc/acpi/thermal_zone/THM/temperature"
+runThermal args = do
+    let zone = head args
+        file = "/proc/acpi/thermal_zone/" ++ zone ++ "/temperature"
     exists <- io $ fileExist file
     case exists of
-         False  -> return "Thermal: N/A"
+         False  -> return $ "Thermal (" ++ zone ++ "): N/A"
          True   -> do number <- io $ B.readFile file
                                      >>= return . (read :: String -> Int)
                                                 . stringParser (1, 0)