Rob Dobson / RdGasUseMonitor

Monitor for central heating system (e.g. 2zones+hw) Supports up to 15 temp probes (DS18B20/DS18S20) 3 valve monitors Gas pulse meter recording Use stand-alone or with nodeEnergyServer See http://robdobson.com/2015/09/central-heating-monitor

Dependencies:   EthernetInterfacePlusHostname NTPClient Onewire RdWebServer SDFileSystem-RTOS mbed-rtos mbed-src

Diff: RdDS18B20.cpp

Revision:
21:ccf053bab795
Parent:
20:7933076df5af
--- a/RdDS18B20.cpp	Tue Oct 13 18:35:20 2015 +0000
+++ b/RdDS18B20.cpp	Fri Oct 16 08:37:30 2015 +0000
@@ -172,7 +172,8 @@
             if (rslt != ONEWIRE_OK)
             {
 #ifdef SHOW_18B20_DEBUGGING
-                _logger.LogDebug("Search returned %s", (rslt == ONEWIRE_SEARCH_INIT_FAIL) ? "InitFail" : ((rslt == ONEWIRE_SEARCH_NOT_FOUND) ? "NotFound" : "UnknownError"));
+//                _logger.LogDebug("Search returned %s", _oneWire.GetErrorStr(rslt));
+                _logger.LogDebug("Search returned %d", rslt);
 #endif
                 break;
             }
@@ -206,11 +207,11 @@
     switch (val)
     {
         case 0x10:
-            return("Chip = DS18S20\r\n");  // or old DS1820
+            return("Chip = DS18S20");  // or old DS1820
         case 0x28:
-            return("Chip = DS18B20\r\n");
+            return("Chip = DS18B20");
         case 0x22:
-            return("Chip = DS1822\r\n");
+            return("Chip = DS1822");
     } 
-    return("Chip NOT DS18x20 FAMILY\r\n");
+    return("Chip NOT DS18x20 FAMILY");
 }