Diff: main.cpp

Revision:

3:0ef2ced1f02d

Parent:

2:a4524f94f189

Child:

4:5213bee8158e

--- a/main.cpp	Fri Apr 11 04:55:51 2014 +0000
+++ b/main.cpp	Sat Apr 12 20:07:15 2014 +0000
@@ -6,6 +6,28 @@
 #include "TextLCD.h"
 #include "pumps.h"
 #include "pumps_pindefs.h"
+#include "weight.h"
+#include "weight_pindefs.h"
+
+Serial pc(USBTX, USBRX); // tx, rx
+DigitalOut te1(PTD7);
+DigitalOut te2(PTD6);
+
+
+/*
+AnalogIn ain(p19);
+DigitalOut led(LED1);
+ 
+int main() {
+    while (1){
+        if(ain > 0.3) {
+            led = 1;
+        } else {
+            led = 0;
+        }
+    }
+}
+*/
 
 
 //TextLCD lcd(PTE29, PTE30, PTC12, PTD0, PTD5, PTA13, TextLCD::LCD20x2);   // rs, e, d4-d7 ok
@@ -19,12 +41,33 @@
 
 }
 int main(void)
-{
+{te1=1;
+te2=1;
     while(1) {
+        read_weight();
+        calc_weight();
+
+        
+        
+        
         //peltier_auto(20);
         //led_test();
-        //peltier(true,true,false,false,10);
+
+   // pc.printf("wait20");
+   /*
+    te2=1;
+    wait(1);
+     te1=0;
+    wait(10);
+        peltier(true,true,false,false,10);
+       te1=1;
+       wait(1);
+        te2=0;
         wait(10);
+            peltier(true,true,false,false,10);*/
+            
+    wait(1);
+      /*  wait(10);
         pumps(true,false,false,false);
         wait(2);
         pumps(false,true,true,false);
@@ -32,7 +75,7 @@
         pumps(false,false,false,true);
         wait(2);
         pumps(false,false,false,false);
-        wait(20);
+        wait(20);*/
 
     }