Diff: DS18B20.cpp

Revision:

2:778929fc1520

Parent:

1:7bf2fdef45c9

--- a/DS18B20.cpp	Mon Jun 21 09:55:09 2021 +0000
+++ b/DS18B20.cpp	Tue Jun 22 12:34:28 2021 +0000
@@ -20,14 +20,15 @@
 } ScratchPad_t;
 
 
-DigitalOut conversionInProgress(LED4);  // conversion in progress
-DigitalOut resetFailure(LED1);          // for error reporting
+DigitalOut conversionInProgress(D1);  // conversion in progress
+DigitalOut resetFailure(D2);          // for error reporting
 extern DigitalInOut sensor;     // sensor pin
 
 static void inError() {
     while (1) {
         resetFailure = !resetFailure;
-        wait(0.2);
+        ThisThread::sleep_for(200ms);
+        //wait(0.2);
     }
 }
 
@@ -76,11 +77,13 @@
 }
 
 // temperature is store as 7.4 fixed point format (assuming 12 bit conversion)
-void displayTemperature(Serial& s) {
+float displayTemperature() {
     DoConversion();
     uint32_t temp = GetTemperature();
     float f = (temp & 0x0F) * 0.0625;    // calculate .4 part
     f += (temp >> 4);    // add 7.0 part to it
-    s.printf("Temp is %2.1fC\n\r", f);    // display in 2.1 format
+    //printf("Temp is %2.1fC\n\r", f);    // display in 2.1 format
+    printf("Temp is %d C\n\r", (int)(f*10));    // display in 2.1 format
+    return f;
 }