DS18B20 fahrenheit display fix

Author: eagle00789

probe_installer.py

@@ -128,7 +128,7 @@ def add_sensor_to_load_list(sensors):
     f.write("# Announce modules available in this package\n")
     f.write("# Just extend this list for your modules and they will be automatically imported during runtime and\n")
     f.write("# are announced to the PRTG Core\n")
-    f.write("__all__ = [\"Ping\", \"HTTP\", \"Port\", \"SNMPCustom\", \"CPULoad\", \"Memory\", \"Diskspace\", \"SNMPTraffic\", \"DS18B20\", \"CPUTemp\"]\n")
+    f.write("__all__ = [\"Ping\", \"HTTP\", \"Port\", \"SNMPCustom\", \"CPULoad\", \"Memory\", \"Diskspace\", \"SNMPTraffic\", \"DS18B20\", \"CPUTemp\", \"Probehealth\"]\n")
     f.write("DS18B20_sensors = [" + str(sensors) + "]\n")
     f.close()
 

sensors/__init__.py

@@ -21,5 +21,5 @@
 # Announce modules available in this package
 # Just extend this list for your modules and they will be automatically imported during runtime and
 # are announced to the PRTG Core
-__all__ = ["Ping", "HTTP", "Port", "SNMPCustom", "CPULoad", "Memory", "Diskspace", "SNMPTraffic", "DS18B20", "CPUTemp", "Probehealth"]
+__all__ = ["Ping", "HTTP", "Port", "SNMPCustom", "CPULoad", "Memory", "Diskspace", "SNMPTraffic", "DS18B20", "CPUTemp"]
 DS18B20_sensors = ["000006ad5c3f"]

sensors/cputemp.py

@@ -49,6 +49,23 @@ def get_sensordef():
             "help": "Returns the CPU temperature",
             "tag": "mpcputempsensor",
             "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
@@ -58,7 +75,7 @@ def get_data(data):
         temperature = CPUTemp()
         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))
@@ -82,7 +99,7 @@ def get_data(data):
         return data
 
     @staticmethod
-    def read_temp():
+    def read_temp(config):
 	data = []
         chandata = []
         temp = open("/sys/class/thermal/thermal_zone0/temp", "r")
@@ -91,13 +108,18 @@ def read_temp():
         temp_string = lines[0]
         logging.debug("CPUTemp Debug message: Temperature from file: %s" % temp_string)
         temp_c = float(temp_string) / 1000.0
+        temp_f = temp_c * 9.0 / 5.0 + 32.0
         logging.debug("CPUTemp Debug message: Temperature after calculations:: %s" % temp_c)
-        data.append(temp_c)
+        if config['celfar'] == "C":
+            data.append(temp_c)
+        else:
+            data.append(temp_f)
+#        data.append(temp_c)
         for i in range(len(data)):
             chandata.append({"name": "CPU Temperature",
 	                     "mode": "float",
 	                     "unit": "Custom",
-		             "customunit": "C",
+		             "customunit": config['celfar'],
                              "LimitMode": 1,
                              "LimitMaxError": 40,
                              "LimitMaxWarning": 35,

sensors/ds18b20.py

@@ -118,14 +118,15 @@ def read_temp(config):
             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 %s" % temp_string, config['celfar'])
+                logging.debug("DS18B20 Debug message: Temperature from file: %s" % temp_string)
                 temp_c = float(temp_string) / 1000.0
-		temp_f = temp_c * 9.0 / 5.0 + 32.0
-                logging.debug("DS18B20 Debug message: Temperature after calculations:: %s" % temp_c, config['celfar'])
+		temp_f = 1.8 * temp_c + 32.0
 		if config['celfar'] == "C":
                     data.append(temp_c)
+                    logging.debug("DS18B20 Debug message: Temperature after calculations:: %s %s" % (temp_c, config['celfar']))
 		else:
 		    data.append(temp_f)
+                    logging.debug("DS18B20 Debug message: Temperature after calculations:: %s %s" % (temp_f, config['celfar']))
             temp.close()
         for i in range(len(data)):
 	    chandata.append({"name": "Sensor: " + sens[i],