Diff: main.cpp

Revision:

1:c853b1d7158e

Parent:

0:db1b024e8486

Child:

2:a0c5943abc7d

diff -r db1b024e8486 -r c853b1d7158e main.cpp
--- a/main.cpp	Thu Mar 06 04:16:25 2014 +0000
+++ b/main.cpp	Thu Mar 13 02:42:52 2014 +0000
@@ -1,28 +1,41 @@
 #include "mbed.h"
 Serial pc(USBTX, USBRX); // tx, rx
+//                G   F   A   B   E    D   C  
+BusOut display1(PTD4,PTA12,PTA4,PTA5,PTC8,PTC9,PTA13);
+//                G   F   A   B   E    D   C  
+BusOut display2(PTD4,PTA12,PTA4,PTA5,PTC8,PTC9,PTA13);
 
-DigitalOut myled(LED1);
 AnalogIn readv(PTB0);
 AnalogIn readr(PTB1);
-DigitalIn bot(PTD4);
-DigitalIn bot2(PTA12);
-DigitalOut led1(PTO7);
+DigitalIn bot(PTE29);
+DigitalIn bot2(PTE23);
+DigitalOut led1(PTC7);
 float volt[10];
 float res[10];
 int n;
 Timer tiempo_volt;
 Timer tiempo_res;
+
 int modo=0;
 int prom_v=0;
 int prom_r=0;
 int i;
+int entero;
+int decimal;
+void desplegar_ero(int entero);
+void desplegar_do(int decimal);
 int main() {
-    tiempo_volt.start();
-    tiempo_res.start();
+    
+    //tiempo_volt.start();
+    //tiempo_res.start();
     while(1) {
         
+        led1=1;
+       wait(0.2);
+       led1=0;
+       wait(0.2);
         if(tiempo_volt.read_ms()>200){
-            for(i=1;i==9; i--){
+            for(i=1;i<=9; i--){
                 n=i-1;
                 volt[n]=volt[i];
             }
@@ -40,32 +53,106 @@
                 res[n]=res[i];
             }
             n=0;
-            volt[9]=readr;
+            res[9]=readr;
             tiempo_res.reset();
             if(prom_r!=10){
                 prom_r++;
             }
         }
         
-        if(bot==1){
+        if(bot==0){
             modo=!modo;
             led1=modo;
         }
         
-        if(bot2==1){
+        if(bot2==0){
             int prom = 0;
             if(modo==1){
-                for(i=0;i==9;i++){
+                for(i=0;i<=9;i++){
                  prom = prom + volt[i];
                 }
             prom=prom/prom_v;
             }else{
                 for(i=0;i==9;i++){
-                 prom = prom + volt[i];
+                 prom = prom + res[i];
                 }
             prom=prom/prom_r;
             }
         pc.printf("%f \n ",&prom);
+        entero = (int)prom/10;
+        decimal = prom%10;
+        desplegar_ero(entero);
+        desplegar_do(decimal);
         }
+        
     }
 }
+
+void desplegar_ero(int entero){
+        switch(entero){
+            case 0: 
+                dis_1 = 63;
+                break;
+            case 1: 
+                dis_1 = 9;
+                break;
+            case 2: 
+                dis_1 = 94;
+                break;
+            case 3: 
+                dis_1 = 91;
+                break;
+            case 4: 
+                dis_1 = 105;
+                break;
+            case 5: 
+                dis_1 = 115;
+                break;
+            case 6: 
+                dis_1 = 119;
+                break;
+            case 7:
+                dis_1 = 25;
+                break;
+            case 8:
+                dis_1 = 127;
+                break;
+            case 9:
+                dis_1 = 123;
+                break;
+            }
+    }
+    void desplegar_do(int decimal){
+        switch(decimal){
+            case 0: 
+                dis_1 = 63;
+                break;
+            case 1: 
+                dis_1 = 9;
+                break;
+            case 2: 
+                dis_1 = 94;
+                break;
+            case 3: 
+                dis_1 = 91;
+                break;
+            case 4: 
+                dis_1 = 105;
+                break;
+            case 5: 
+                dis_1 = 115;
+                break;
+            case 6: 
+                dis_1 = 119;
+                break;
+            case 7:
+                dis_1 = 25;
+                break;
+            case 8:
+                dis_1 = 127;
+                break;
+            case 9:
+                dis_1 = 123;
+                break;
+        }
+    }
\ No newline at end of file