Diff: main.cpp

Revision:

5:46e4682f9c42

Parent:

3:f483abe4bc57

Child:

6:ba8f89d2098b

--- a/main.cpp	Fri Jan 13 18:30:37 2017 +0000
+++ b/main.cpp	Thu Nov 23 08:19:49 2017 +0000
@@ -1,49 +1,20 @@
-#define MULTIPLE_PROBES
-#define DATA_PIN        A0
-
-
-#ifdef MULTIPLE_PROBES
 
 #include "mbed.h"
 #include "DS1820.h"
+ 
+DS1820 probeInt(A0);
+DS1820 probeExt(A1);
+Timer t;
+int main() {
+     probeInt.unassignedProbe(A0);
+     
+     probeExt.unassignedProbe(A1);
+     
+     while(1) {
+         probeInt.convertTemperature(true, DS1820::all_devices);         //Start temperature conversion, wait until ready
+         printf("TempInt value=%f\r\n", probeInt.temperature());     
 
-#define MAX_PROBES      16
- 
-DS1820* probe[MAX_PROBES];
- 
-int main() {  
-    // Initialize the probe array to DS1820 objects
-    int num_devices = 0;
-    while(DS1820::unassignedProbe(DATA_PIN)) {
-        probe[num_devices] = new DS1820(DATA_PIN);
-        num_devices++;
-        if (num_devices == MAX_PROBES)
-            break;
-    }
-    
-    printf("Found %d device(s)\r\n\n", num_devices);
-    while(1) {
-        probe[0]->convertTemperature(true, DS1820::all_devices);         //Start temperature conversion, wait until ready
-        for (int i = 0; i<num_devices; i++)
-            printf("Device %d returns %3.1foC\r\n", i, probe[i]->temperature());
-        printf("\r\n");
-        wait(1);
-    }
-    
-}
-
-#else
-#include "mbed.h"
-#include "DS1820.h"
- 
-DS1820 probe(DATA_PIN);
- 
-int main() {
-    while(1) {
-        probe.convertTemperature(true, DS1820::all_devices);         //Start temperature conversion, wait until ready
-        printf("It is %3.1foC\r\n", probe.temperature());
-        wait(1);
-    }
-}
-
-#endif
\ No newline at end of file
+         probeExt.convertTemperature(true, DS1820::all_devices);         //Start temperature conversion, wait until ready             
+         printf("TempRoom value=%f\r\n", probeExt.temperature());
+     }
+}
\ No newline at end of file