Added temperature display to DS18B20 and several small other fixes

Author: eagle00789

probe.py

@@ -45,7 +45,6 @@
     print e
     #sys.exit()
 
-
 def main():
         """
         Main routine for MiniProbe (Python)

sensors/ds18b20.py

@@ -53,6 +53,23 @@ def get_sensordef():
             "help": "Returns the temperature measured by an attached DS18B20 temperature sensor on pin 4",
             "tag": "mpds18b20sensor",
             "groups": [
+               {
+               "name":"Group",
+               "caption":"Temperature settings",
+               "fields":[
+                  {
+                       "type":"radio",
+                       "name":"celfar",
+                       "caption":"Choose between Celsius or Fahrenheit display",
+                       "help":"Choose wether you want to return the value in Celsius or Fahrenheit",
+                       "options":{
+                                               "C":"Celsius",
+                                               "F":"Fahrenheit"
+                                               },
+                       "default":"C"
+                  },
+                        ]
+               }
 		      ]
         }
         return sensordefinition
@@ -62,7 +79,7 @@ def get_data(data):
         temperature = DS18B20()
         logging.info("Running sensor: %s" % temperature.get_kind())
         try:
-            temp = temperature.read_temp()
+            temp = temperature.read_temp(data)
         except Exception as e:
             logging.error("Ooops Something went wrong with '%s' sensor %s. Error: %s" % (temperature.get_kind(),
                                                                                          data['sensorid'], e))
@@ -86,7 +103,7 @@ def get_data(data):
         return data
 
     @staticmethod
-    def read_temp():
+    def read_temp(config):
 	data = []
 	sens = []
         chandata = []
@@ -101,16 +118,20 @@ def read_temp():
             equals_pos = lines[1].find('t=')
             if equals_pos != -1:
                 temp_string = lines[1][equals_pos+2:]
-                logging.debug("DS18B20 Debug message: Temperature from file: %s" % temp_string)
+                logging.debug("DS18B20 Debug message: Temperature from file: %s %s" % temp_string, config['celfar'])
                 temp_c = float(temp_string) / 1000.0
-                logging.debug("DS18B20 Debug message: Temperature after calculations:: %s" % temp_c)
-                data.append(temp_c)
+		temp_f = temp_c * 9.0 / 5.0 + 32.0
+                logging.debug("DS18B20 Debug message: Temperature after calculations:: %s" % temp_c, config['celfar'])
+		if config['celfar'] == "C":
+                    data.append(temp_c)
+		else:
+		    data.append(temp_f)
             temp.close()
         for i in range(len(data)):
 	    chandata.append({"name": "Sensor: " + sens[i],
 			    "mode": "float",
 			    "unit": "Custom",
-			    "customunit": "C",
+			    "customunit": config['celfar'],
                             "LimitMode": 1,
                             "LimitMaxError": 40,
                             "LimitMaxWarning": 35,

sensors/probehealth.py

@@ -58,6 +58,7 @@ def get_data(data):
             mem = probehealth.read_memory('/proc/meminfo')
             cpu = probehealth.read_cpu('/proc/loadavg')
             temperature = probehealth.read_temp()
+            disk = probehealth.read_disk()
             logging.info("Running sensor: %s" % probehealth.get_kind())
         except Exception as e:
             logging.error("Ooops Something went wrong with '%s' sensor %s. Error: %s" % (probehealth.get_kind(),
@@ -76,6 +77,8 @@ def get_data(data):
 	    probedata.append(element)
         for element in cpu:
             probedata.append(element)
+	for element in disk:
+	    probedata.append(element)
         data = {
             "sensorid": int(data['sensorid']),
             "message": "OK",
@@ -134,11 +137,42 @@ def read_cpu(self, path):
 
     def read_disk(self):
         disks = []
-        tmp = []
-        for line in os.popen("df -h"):
+        channel_list = []
+        for line in os.popen("df -k"):
             if line.startswith("/"):
-                tmp.append(line.rstrip())     
-        print disks
+                disks.append(line.rstrip().split())
+        for line in disks:
+            channel1 = {"name": "Total Bytes " + str(line[0]),
+                        "mode": "integer",
+                        "kind": "BytesDisk",
+                        "value": int(line[1]) * 1024}
+            channel2 = {"name": "Used Bytes" + str(line[0]),
+                        "mode": "integer",
+                        "kind": "BytesDisk",
+                        "value": int(line[2]) * 1024}
+            channel3 = {"name": "Free Bytes " + str(line[0]),
+                        "mode": "integer",
+                        "kind": "BytesDisk",
+                        "value": int(line[3]) * 1024}
+            total = float(line[2]) + float(line[3])
+            used = float(line[2]) / total
+            free = float(line[3]) / total
+
+            channel4 = {"name": "Free Space " + str(line[0]),
+                        "mode": "float",
+                        "kind": "Percent",
+                        "value": free * 100}
+            channel5 = {"name": "Used Space" + str(line[0]),
+                        "mode": "float",
+                        "kind": "Percent",
+                        "value": used * 100}
+            channel_list.append(channel1)
+            channel_list.append(channel2)
+            channel_list.append(channel3)
+            channel_list.append(channel4)
+            channel_list.append(channel5)
+        return channel_list
+
 
     def read_temp(self):
         data = []