Diff: main.cpp

Revision:

1:c283bc6f3938

Parent:

0:2fc99d74f745

Child:

2:cc6e3a56f7e6

--- a/main.cpp	Thu Apr 11 23:59:29 2019 +0000
+++ b/main.cpp	Fri Apr 12 19:48:28 2019 +0000
@@ -67,6 +67,7 @@
         if(num_arm2 == MAX_PROBES){
             break;
             }
+        }
     
     //arm3
     while(DS1820::unassignedProbe(TAIL_DATA_PIN)){
@@ -75,21 +76,22 @@
         if(num_tail == MAX_PROBES){
             break;
             }
+        }
     for(int i = 0; i < num_arm1; i++){
         fullName = probe1[1]->whoAmI();
         //print 64-bit ID as a hexadecimal number
         fprintf(out1,"%llX\t", fullName);
-    
+    }
     for(int i = 0; i < num_arm2; i++){
         fullName = probe2[1]->whoAmI();
         //print 64-bit ID as a hexadecimal number
         fprintf(out2,"%llX\t", fullName);
-        
+    }  
     for(int i = 0; i < num_tail; i++){
         fullName = probeTail[1]->whoAmI();
         //print 64-bit ID as a hexadecimal number
         fprintf(out3,"%llX\t", fullName);
-
+    }
     fprintf(out1,"\r\n");
     fprintf(out2,"\r\n");
     fprintf(out3,"\r\n");
@@ -103,18 +105,19 @@
     fprintf(out3, "Found %d device(s)\r\n", num_tail);
     for(int i = 0; i < num_arm1; i++){//reads out the ID numbers to each file and numbers them
         fullName = probe1[1]->whoAmI();
-        fprintf(out1, "\tID%d = \r\n", i, fullName);
+        fprintf(out1, "\tID%d = ", i);
+        fprintf(out1, "%11X\r\n", fullName);
         }
     for(int i = 0; i < num_arm2; i++){
         fullName = probe2[1]->whoAmI();
-        fprintf(out2, "\tID%d = \r\n", i, fullName);
+        fprintf(out2, "\tID%d = ", i);
+        fprintf(out2, "%11X\r\n", fullName);
         }
     for(int i = 0; i < num_tail; i++){
         fullName = probeTail[1]->whoAmI();
-        fprintf(out3, "\tID%d = \r\n", i, fullName);
+        fprintf(out3, "\tID%d = ", i);
+        fprintf(out3, "%11X\r\n", fullName);
         }
-    
-        
 //timers
     t.start();
     sampleTime.attach(&triggerCollection, 10);//receive data every 10 seconds
@@ -133,17 +136,20 @@
             fprintf(out1, "%3.1f/t", t.read());
             //get temp from sensors
             for(int i = 0; i < num_arm1; i++){
-                fprintf(out1, "Sensor %d = &3.1f/t", i, probe1[i]->temperature());
+                fprintf(out1, "Sensor %d = ", i);
+                fprintf(out1, "%3.1f/t", probe1[i]->temperature());
                 fprintf(out1, "r/n");
                 }
 
             for(int i = 0; i < num_arm2; i++){
-                fprintf(out2, "Sensor %d = &3.1f/t", i, probe2[i]->temperature());
-                fprintf(out2, "r/n");
+                fprintf(out2, "Sensor %d = ", i);
+                fprintf(out2, "%3.1f/t", probe2[i]->temperature());
+                fprintf(out2, "r/n");  
                 }
                 
             for(int i = 0; i < num_tail; i++){
-                fprintf(out3, "Sensor %d = &3.1f/t", i, probeTail[i]->temperature());
+                fprintf(out3, "Sensor %d = ", i);
+                fprintf(out3, "%3.1f/t", probeTail[i]->temperature());
                 fprintf(out3, "r/n");
                 
                 }
@@ -171,9 +177,9 @@
     led1 = 1;//turn on LED to let user know its safe to remove SD card
     }
 
-void triggerSave(){
+void triggerSave();{
     timeToSave = true;
     }
-void triggerCollection(){
+void triggerCollection();{
     timeToRead = true;
     }