Diff: main.cpp

Revision:

1:b52588ac9aae

Parent:

0:a521da10b15a

Child:

2:cff64a27ae9d

--- a/main.cpp	Wed Jul 29 21:17:14 2015 +0000
+++ b/main.cpp	Wed Aug 12 14:15:29 2015 +0000
@@ -1,36 +1,48 @@
 #include "mbed.h"
 
-
 DigitalIn sensorPin1(p5);
-// variables:   
-int counter = 0; // counter for the number of products passing through 
+DigitalIn sensorPin2(p6);
+DigitalIn sensorPin3(p7);
+    //variables
 int sensorState1 = 0;    // current state of the sensor   
 int lastSensorState1 = 0;  // previous state of the sensor 
+int sensorState2 = 0;
+int lastSensorState2 = 0;
+int sensorState3 = 0;
+int lastSensorState3 = 0;
 
 // initialize serial communication:   
 Serial pc(USBTX, USBRX);
 
-DigitalOut myled(LED1);
-
-
-
-int main() {
-    while(1)
-    {
-        sensorState1 = sensorPin1; // read the pushbutton input pin:   
+void Go_and_check(sensorPin(n)) {
+    sensorState(n) = sensorPin(n); // read the sensor input pin:   
                  
-        if (sensorState1 != lastSensorState1) // compare the buttonState to its previous state
+        if (sensorState(n) != lastSensorState(n) // compare the sensorState to its previous state
         {
             // if the state has changed, check to see if it is a change from high to low or low to high             
-            if (sensorState1 == 1){ // if the current state is HIGH then increment the counter   
-                counter++;
-                pc.printf("%f",counter);
+            if (sensorState(n) == 1){ // if the current state is HIGH then increment the counter
+                return 1;
             }
             
-            else { // if the current state is LOW then the button       
-                pc.printf("%f",counter);
+            else { // if the current state is LOW then ignore      
+                return 0;
             }
         }
-        lastSensorState1 = sensorState1;
+        lastSensorState(n) = sensorState(n);
+}
+
+int main() {
+    // variables:   
+int outputs = 0; // counter for the number of products passing through 
+int inputs = 0; //counter for the number of products entering station
+int rejects = 0; //counter for products ejected from lines between stations
+
+    while(1)
+    {
+        outputs += Go_and_check(sensorPin1);
+        inputs += Go_and_check(sensorPin2);
+        rejects = previous_outputs - inputs;
+        
     }
 }
+