Diff: main.cpp

Revision:

2:dd5a887a6990

Parent:

1:f6c866aedc5e

--- a/main.cpp	Wed Apr 17 16:23:27 2019 +0000
+++ b/main.cpp	Wed Apr 17 16:26:10 2019 +0000
@@ -1,4 +1,4 @@
-#include "mbed.h" 
+#include "mbed.h"
 #include <stdio.h>
 #include "Servo.h"
 
@@ -11,14 +11,14 @@
 //VALFILTER is the value read in at the filtered photoresistor
 //VAL is the value read in at the regular photoresistor
 
-int main() {
+int main()
+{
     myservo.write(0);
-    
+
     float valfilter[50],val[50],voltfilter[50],volt[50];
     int countfilter = 0;
     int countnorm = 0;
-    for(int i=0;i<50;i++)
-    {
+    for(int i=0; i<50; i++) {
         valfilter[i]= ldrfilter.read();
         val[i]= ldr.read();
         voltfilter[i]=(valfilter[i]*3.6);
@@ -26,24 +26,23 @@
         printf("Filter: %f %f     NoFilter: %f %f\r\n",voltfilter[i],valfilter[i],volt[i],val[i]);
         //myLED=0;
         //output = 1;
-            if (valfilter[i] > .82 && valfilter[i] < .87){
-                countfilter = countfilter + 1;
-            }
-            if (val[i] > .7 && val[i] <= .85){
-                countnorm = countnorm + 1;
-            }
-    printf("Filter Count: %i     NoFilter: %i  \r\n", countfilter, countnorm);       
-    }  
+        if (valfilter[i] > .82 && valfilter[i] < .87) {
+            countfilter = countfilter + 1;
+        }
+        if (val[i] > .7 && val[i] <= .85) {
+            countnorm = countnorm + 1;
+        }
+        printf("Filter Count: %i     NoFilter: %i  \r\n", countfilter, countnorm);
+    }
 
-    if (countfilter >= 45 && countnorm >= 40){
+    if (countfilter >= 45 && countnorm >= 40) {
         printf("MY SERVO SHOULD HAVE MOVED ITS FULL RANGE!!!");
         myservo.write(1);
         //output.write(1);
         //wait(500);
-        //output = 1; 
+        //output = 1;
         //wait(500);
-    }   
-    else{
+    } else {
         //output.write(0);
         myservo.write(0);
         printf("MY SERVO SHOULD NOT MOVE, ONLY POSITION TO 0");
@@ -51,7 +50,7 @@
         //output = 0;
         //wait(500);
     }
-    
+
 }
 
 
@@ -65,7 +64,7 @@
 
 bool soundOn ()
 {
-    float amp; 
+    float amp;
     amp = (mic1.read())*3.3;
     printf("Sound: %f\n", amp);
     if(amp > 1.2)
@@ -80,14 +79,14 @@
 bool lightOn ()
 {
     float lchk;
-    lchk = 3.3 - (light1.read()*3.3); 
+    lchk = 3.3 - (light1.read()*3.3);
     if(lchk > 1)
     {
         return true;
     }
-    else 
+    else
     {
-        return false; 
+        return false;
     }
 }