Diff: main.cpp

Revision:

1:a1f7cc753866

Parent:

0:34e2166ac5cd

--- a/main.cpp	Thu Oct 03 12:03:16 2013 +0000
+++ b/main.cpp	Fri Oct 04 22:15:50 2013 +0000
@@ -1,23 +1,33 @@
+#include <vector>
+
 #include "mbed.h"
+#include <FunctionPointer.h>
 
-DigitalOut myled(LED1);
+DigitalOut led1(LED1);
+DigitalOut led2(LED2);
+DigitalOut led3(LED3);
+DigitalOut led4(LED4);
+
+#include "pump.h"
+#include "peristaltics.h"
+#include "flow_controlled.h"
 
 
-DigitalOut Pump_Peri_1_Activate(p5);
-DigitalOut Pump_Peri_2_Activate(p6);
-DigitalOut Pump_Peri_3_Activate(p7);
-
-DigitalOut Pump_Water_Enable(p17);
-DigitalOut Pump_Water_Raw_Activate(p18);
-DigitalOut Pump_Water_Recycled_Activate(p19);
-DigitalIn Flow_Meter_Pulse(p20);
-
-
-int main() {
-    while(1) {
-        myled = 1;
-        wait(0.2);
-        myled = 0;
-        wait(0.2);
-    }
+int 
+main() {
+    Peristaltics *peri = new Peristaltics(1);
+    Flow_Controlled *flowed = new Flow_Controlled(1);
+    
+    wait(3);
+    
+    
+    peri->nutrient_a(1);
+    peri->nutrient_b(2);
+    led4 = 1;
+    wait(5);
+    led4 = 0;
+    
+    
+    delete peri, flowed;
+    
 }