Diff: main.cpp

Revision:

4:dc0214c23232

Parent:

3:a46c824a4b0a

Child:

5:a7b8bdbd38df

diff -r a46c824a4b0a -r dc0214c23232 main.cpp
--- a/main.cpp	Wed Jan 30 14:30:06 2019 +0000
+++ b/main.cpp	Wed Feb 13 14:20:33 2019 +0000
@@ -21,52 +21,35 @@
 
     while(1) {
         
-        pc.printf("monoxyde de carbonne: %.2f \r\n", co); //affichage en % du taux de monoxyde de carbonne
-        co = sensor.getGas(CO);
-        co = co / 10000;
-        
-         if(co <= 0.02){}
-       
-       else
-       { 
-       pc.printf("danger monoxyde de carbonne \r\n");
-       }
+         co = sensor.getGas(CO);
+          co = co / 10000;
+            pc.printf("monoxyde de carbonne: %.2f \r\n", co); //affichage en % du taux de monoxyde de carbonne
+             if(co >= 0.02) pc.printf("danger monoxyde de carbonne \r\n");
        
-        
+    
+    
         pc.printf("butane: %.2f \r\n", c4h10);//affichage en % du taux de butane
-        c4h10 = sensor.getGas(C4H10);
-        c4h10 = c4h10 / 10000;
-        
-          if(c4h10 <= 1.50){}
+         c4h10 = sensor.getGas(C4H10);
+          c4h10 = c4h10 / 10000;
+            pc.printf("butane: %.2f \r\n", c4h10);//affichage en % du taux de butane
+             if(c4h10 >= 1.50) pc.printf("danger butane \r\n");
        
-       else
-       { 
-       pc.printf("danger butane \r\n");
-       }
+    
         
         pc.printf("propane: %.2f \r\n", c3h8);//affichage en % du taux de propane
-       c3h8 = sensor.getGas(C3H8);
-       c3h8 = c3h8 / 10000;
-        
-            if(c3h8 <= 2.00){}
-       
-       else
-       { 
-       pc.printf("danger propane \r\n");
-       }
-       
+         c3h8 = sensor.getGas(C3H8);
+          c3h8 = c3h8 / 10000;
         
-        pc.printf("methane: %.2f \r\n", ch4);//affichage en % du taux de methane
-        ch4 = sensor.getGas(CH4);
-        ch4 = ch4 / 10000;
-        
-         if(ch4 <= 2.50){}
+            if(c3h8 >= 2.00) pc.printf("danger butane \r\n");
+       
        
-       else
-       { 
-       pc.printf("danger methane \r\n");
-       }
+ 
+        pc.printf("methane: %.2f \r\n", ch4);//affichage en % du taux de methane
+         ch4 = sensor.getGas(CH4);
+          ch4 = ch4 / 10000;
         
+            if(ch4 >= 2.50) pc.printf("danger methane \r\n");
+       
         
         
         pc.printf("\r\n");